Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 17:55:17 +0000 (13:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 17:55:17 +0000 (13:55 -0400)

Trivial merge