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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge