Merge remote-tracking branch 'usb/usb-next'

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

diff --cc drivers/net/wireless/at76c50x-usb.c
Simple merge

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

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

diff --cc drivers/video/udlfb.c
Simple merge