From: Linus Torvalds Date: Sat, 31 Jan 2015 03:44:56 +0000 (-0800) Subject: Merge tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... X-Git-Tag: v3.19-rc7~6 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32;p=~emulex%2Finfiniband.git 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 --- 5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32