]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mrst-touchscreen' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 5 Sep 2010 19:20:24 +0000 (12:20 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 5 Sep 2010 19:20:24 +0000 (12:20 -0700)
commit067edb28c67e0bb9fb784184f88eb1782f92a9a1
tree1412deee46f6be19cf9b5a65a8d76ed4553866a8
parentcc7b70a3a331b62277a8943e08edd708edf676c7
parente0d80f43a0705689e8b1949c6aced1ff5700a438
Merge branch 'mrst-touchscreen' into next

Conflicts:
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile