]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Apr 2012 20:03:48 +0000 (16:03 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Apr 2012 20:03:48 +0000 (16:03 -0400)

Trivial merge