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)
commitbd072111e7319d90a7b8127f91c2806b9a6f279e
tree1686978814a2387ebfc16f9f5778a7f0caaf319b
parent24d01c0681bfbc10a99304c48a89ad213d2d7a4b
parent4be3bd7849165e7efa6b0b35a23d6a3598d97465
Merge commit 'v2.6.31-rc4' into next
drivers/input/misc/cobalt_btns.c