Merge tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jan 2015 03:44:56 +0000 (19:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jan 2015 03:44:56 +0000 (19:44 -0800)
commit5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32
tree93aaacfd0fd8125c64e02e0354bc672dfa9aff50
parent73dc61cb386b0fdc488e8c6545817c1bbbb6e93e
parent41c9e95d641acc096975e70239742929b5971afa
Merge tag 'staging-3.19-rc7' of git://git./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
MAINTAINERS