Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 10:00:09 +0000 (19:00 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 10:00:09 +0000 (19:00 +0900)
commitcb3853cb26b0219580f15a287c304e1504db2c0c
treea666515dc97bb33415cd33ee734b3a3a00b4e961
parent455ae5620286c38db83e3318c44f03ffa8b168bb
parentac382e899a7daad63eeb34c51f59368c6e9c4e56
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