]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge commit 'v2.6.39-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 23 Apr 2011 06:35:25 +0000 (23:35 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 23 Apr 2011 06:35:25 +0000 (23:35 -0700)
1  2 
drivers/input/touchscreen/Kconfig

Simple merge