Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Mar 2010 21:34:38 +0000 (16:34 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Mar 2010 21:34:38 +0000 (16:34 -0500)

Trivial merge