tree a666515dc97bb33415cd33ee734b3a3a00b4e961
parent 439c6109922c8faa920c9b8680d63937189d6915
parent bb4e506565cfc0a2f534dfda1fb7ca5c26f7a604
author Linus Torvalds <torvalds@linux-foundation.org> 1400666409 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1400666409 +0900
mergetag object bb4e506565cfc0a2f534dfda1fb7ca5c26f7a604
 type commit
 tag staging-3.15-rc6
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1400647508 +0900
 
 Staging driver fixes for 3.15-rc6
 
 Here are 5 staging driver fixes for 3.15-rc6 that resolve some reported
 issues.  They are for the imx and rtl8723au drivers.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iEYEABECAAYFAlN8L4AACgkQMUfUDdst+ymmPwCgg20LEhxW+bIDykpvzZ9Ju8XT
 bjMAnA+3NH0WLfLqcsRFHzHOCWyV5DiI
 =uWwd
 -----END PGP SIGNATURE-----

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