Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Nov 2014 20:38:48 +0000 (15:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Nov 2014 20:38:48 +0000 (15:38 -0500)

Trivial merge