]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Dec 2010 20:52:27 +0000 (15:52 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Dec 2010 20:52:27 +0000 (15:52 -0500)

Trivial merge