Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 25 Jul 2012 05:43:04 +0000 (22:43 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 25 Jul 2012 05:43:04 +0000 (22:43 -0700)
commit314820c9e892d8f41ba4db300ec96770d9c8294b
tree3d5c59a429239b180c77e57f998a78d3f2b79827
parente76b8ee25e034ab601b525abb95cea14aa167ed3
parent07b8481d4aff73d6f451f25e74ea10240ff5131e
Merge branch 'next' into for-linus
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/input/joystick/xpad.c
drivers/input/mouse/bcm5974.c