Merge tag 'staging-3.19-rc7' of git://

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://
  MAINTAINERS: add Android driver entries
  staging: nvec: specify a platform-device base id