| commit | 5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 30 19:44:56 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 30 19:44:56 2015 -0800 |
| tree | 93aaacfd0fd8125c64e02e0354bc672dfa9aff50 | |
| parent | 73dc61cb386b0fdc488e8c6545817c1bbbb6e93e [diff] | |
| parent | 41c9e95d641acc096975e70239742929b5971afa [diff] |
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