Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Nov 2012 19:38:12 +0000 (14:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Nov 2012 19:38:12 +0000 (14:38 -0500)

Trivial merge