Merge commit 'v2.6.32-rc5' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Nov 2009 06:10:07 +0000 (22:10 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Nov 2009 06:10:07 +0000 (22:10 -0800)
1  2 
drivers/input/input.c
drivers/input/keyboard/atkbd.c

Simple merge
Simple merge