From: Linus Torvalds Date: Wed, 21 May 2014 10:00:09 +0000 (+0900) Subject: Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... X-Git-Tag: v3.15-rc6~10 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=84e12d992a54bc64590989b50d292e510a7d73cd;p=karo-tx-linux.git Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver fixes from Greg KH: "Here are five staging driver fixes for 3.15-rc6 that resolve some reported issues. They are for the imx and rtl8723au drivers" * tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: rtl8723au: Do not reset wdev->iftype in netdev_close() staging: rtl8723au: Use correct pipe type for USB interrupts imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus' imx-drm: imx-drm-core: skip components whose parent device is disabled imx-drm: imx-drm-core: fix imx_drm_encoder_get_mux_id --- 84e12d992a54bc64590989b50d292e510a7d73cd