Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Jan 2011 19:26:34 +0000 (14:26 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Jan 2011 19:26:34 +0000 (14:26 -0500)

Trivial merge