tree 93aaacfd0fd8125c64e02e0354bc672dfa9aff50
parent 73dc61cb386b0fdc488e8c6545817c1bbbb6e93e
parent 41c9e95d641acc096975e70239742929b5971afa
author Linus Torvalds <torvalds@linux-foundation.org> 1422675896 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1422675896 -0800
mergetag object 41c9e95d641acc096975e70239742929b5971afa
 type commit
 tag staging-3.19-rc7
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1422667684 -0800
 
 Staging tree fixes for 3.19-rc7
 
 Here are two tiny staging tree fixes.  One for the nvec driver to
 resolve a reported problem, and one to add a MAINTAINERS entry for the
 Android drivers.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iEYEABECAAYFAlTML9gACgkQMUfUDdst+ylHaQCeKSr7xYfSFhLpm+Uulqddn6xS
 FP0An1cX7t2NCj5glf69MmP6gIKD45Lx
 =Xje7
 -----END PGP SIGNATURE-----

Merge tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging tree fixes from Greg KH:
 "Here are two tiny staging tree fixes.  One for the nvec driver to
  resolve a reported problem, and one to add a MAINTAINERS entry for the
  Android drivers"

* tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  MAINTAINERS: add Android driver entries
  staging: nvec: specify a platform-device base id