Merge remote-tracking branch 'driver-core/driver-core-next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Kconfig
Simple merge

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

diff --cc drivers/base/platform.c
Simple merge

diff --cc drivers/bluetooth/ath3k.c
Simple merge

diff --cc drivers/bluetooth/bfusb.c
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/edac/edac_mc_sysfs.c
Simple merge

diff --cc drivers/hid/usbhid/usbkbd.c
Simple merge

diff --cc drivers/input/misc/ati_remote2.c
Simple merge

diff --cc drivers/input/tablet/aiptek.c
Simple merge

diff --cc drivers/input/tablet/wacom_sys.c
Simple merge

diff --cc drivers/input/touchscreen/usbtouchscreen.c
Simple merge

diff --cc drivers/media/dvb/dvb-usb/af9015.c
Simple merge

diff --cc drivers/media/dvb/dvb-usb/anysee.c
Simple merge

diff --cc drivers/media/dvb/dvb-usb/dw2102.c
Simple merge

diff --cc drivers/media/dvb/dvb-usb/it913x.c
Simple merge

diff --cc drivers/media/dvb/dvb-usb/ttusb2.c
Simple merge

diff --cc drivers/media/rc/ati_remote.c
Simple merge

diff --cc drivers/media/rc/redrat3.c
Simple merge

diff --cc drivers/media/video/em28xx/em28xx-cards.c
Simple merge

diff --cc drivers/media/video/gspca/benq.c
Simple merge

diff --cc drivers/media/video/gspca/gl860/gl860.c
Simple merge

diff --cc drivers/media/video/gspca/konica.c
Simple merge

diff --cc drivers/media/video/gspca/mars.c
Simple merge

diff --cc drivers/media/video/gspca/nw80x.c
Simple merge

diff --cc drivers/media/video/gspca/ov519.c
Simple merge

diff --cc drivers/media/video/gspca/pac207.c
Simple merge

diff --cc drivers/media/video/gspca/se401.c
Simple merge

diff --cc drivers/media/video/gspca/sonixj.c
Simple merge

diff --cc drivers/media/video/gspca/spca561.c
Simple merge

diff --cc drivers/media/video/gspca/topro.c
Simple merge

diff --cc drivers/media/video/gspca/xirlink_cit.c
Simple merge

diff --cc drivers/media/video/gspca/zc3xx.c
Simple merge

diff --cc drivers/media/video/tm6000/tm6000-cards.c
Simple merge

diff --cc drivers/net/irda/stir4200.c
Simple merge

diff --cc drivers/net/usb/asix.c
Simple merge

diff --cc drivers/net/usb/cdc-phonet.c
Simple merge

diff --cc drivers/net/usb/cdc_ether.c
Simple merge

diff --cc drivers/net/usb/cdc_ncm.c
Simple merge

diff --cc drivers/net/usb/lg-vl600.c
Simple merge

diff --cc drivers/net/usb/smsc75xx.c
Simple merge

diff --cc drivers/net/usb/smsc95xx.c
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
Simple merge

diff --cc drivers/nfc/pn533.c
Simple merge

diff --cc drivers/staging/media/go7007/go7007-usb.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_imon.c
Simple merge

diff --cc drivers/usb/host/hwa-hc.c
Simple merge

diff --cc drivers/usb/misc/usbled.c
Simple merge

diff --cc drivers/usb/storage/ene_ub6250.c
Simple merge

diff --cc drivers/uwb/i1480/dfu/usb.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/i2c.h
Simple merge

diff --cc include/linux/platform_device.h
Simple merge

diff --cc kernel/time/clocksource.c
Simple merge

diff --cc lib/Makefile
Simple merge