Merge commit 'v2.6.30-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 9 May 2009 01:29:27 +0000 (18:29 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 9 May 2009 01:29:27 +0000 (18:29 -0700)
1  2 
drivers/input/keyboard/Kconfig

Simple merge