Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
authorDmitry Torokhov <dtor_core@ameritech.net>
Wed, 21 Dec 2005 04:03:50 +0000 (23:03 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Wed, 21 Dec 2005 04:03:50 +0000 (23:03 -0500)
commit041387d98460b3947587929ef3a4773b8c48538f
tree3330eebba3fa1aa7c13479e527f07b03d7fb53ed
parent56f0356321a876a1a356712f2486d6188a3b4992
parentb05948d9b7167e23af88cc65b9ffa4687eaf1f0d
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
drivers/input/misc/wistron_btns.c