Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 25 Feb 2011 20:14:33 +0000 (15:14 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 25 Feb 2011 20:14:33 +0000 (15:14 -0500)

Trivial merge