projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 516d798 a455e29)
Merge branch 'next' into for-linus
authorDmitry Torokhov <[email protected]>
Mon, 17 Dec 2012 06:04:14 +0000 (22:04 -0800)
committerDmitry Torokhov <[email protected]>
Mon, 17 Dec 2012 06:04:14 +0000 (22:04 -0800)
Prepare first set of updates for 3.8 merge window.

1  2 
drivers/input/matrix-keymap.c patch | diff1 | diff2 | blob | history
drivers/input/tablet/wacom_wac.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/matrix-keymap.c
Simple merge
diff --cc drivers/input/tablet/wacom_wac.c
Simple merge
John Crispins staging tree