Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Jun 2011 18:26:04 +0000 (14:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Jun 2011 18:26:04 +0000 (14:26 -0400)

Trivial merge