Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 16 Apr 2012 18:13:55 +0000 (14:13 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 16 Apr 2012 18:13:55 +0000 (14:13 -0400)

Trivial merge