Merge branch 'next' into for-linus

diff --cc drivers/hid/hid-apple.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/input/joystick/xpad.c
Simple merge

diff --cc drivers/input/mouse/bcm5974.c
Simple merge