Merge commit 'v2.6.35-rc3' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 22 Jun 2010 18:32:04 +0000 (11:32 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 22 Jun 2010 18:32:04 +0000 (11:32 -0700)
1  2 
drivers/input/misc/pcf8574_keypad.c

Simple merge