Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Mar 2013 20:53:47 +0000 (15:53 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Mar 2013 20:53:47 +0000 (15:53 -0500)

Trivial merge