Merge commit 'v2.6.31-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 Jul 2009 04:47:29 +0000 (21:47 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 Jul 2009 04:47:29 +0000 (21:47 -0700)
1  2 
drivers/input/misc/cobalt_btns.c

Simple merge