Merge branch 'for-3.12/i2c-hid' into for-next

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/hid/hid-logitech-dj.c
Simple merge

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

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

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

diff --cc net/bluetooth/hidp/core.c
Simple merge