Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Dec 2011 20:08:02 +0000 (15:08 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Dec 2011 20:08:02 +0000 (15:08 -0500)

Trivial merge