Merge branch 'ps3' into for-next

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
index 3684750c976e2a407b59435b44b13fa597cd0fa8,333ed6c961c55425f1f32f107df0ce164109bc59..5a3690ff9bf2d579c8993ec23aa4b7bef6a95341
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -69,27 -69,8 +69,28 @@@ obj-$(CONFIG_HID_PRODIKEYS) += hid-prod
  obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
  obj-$(CONFIG_HID_PETALYNX)    += hid-petalynx.o
  obj-$(CONFIG_HID_PICOLCD)     += hid-picolcd.o
 +hid-picolcd-y                 += hid-picolcd_core.o
 +ifdef CONFIG_HID_PICOLCD_FB
 +hid-picolcd-y                 += hid-picolcd_fb.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_BACKLIGHT
 +hid-picolcd-y                 += hid-picolcd_backlight.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_LCD
 +hid-picolcd-y                 += hid-picolcd_lcd.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_LEDS
 +hid-picolcd-y                 += hid-picolcd_leds.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_CIR
 +hid-picolcd-y                 += hid-picolcd_cir.o
 +endif
 +ifdef CONFIG_DEBUG_FS
 +hid-picolcd-y                 += hid-picolcd_debugfs.o
 +endif
 +
  obj-$(CONFIG_HID_PRIMAX)      += hid-primax.o
+ obj-$(CONFIG_HID_PS3REMOTE)   += hid-ps3remote.o
  obj-$(CONFIG_HID_ROCCAT)      += hid-roccat.o hid-roccat-common.o \
        hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
        hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o \

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

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