Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Feb 2010 21:04:43 +0000 (16:04 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Feb 2010 21:04:43 +0000 (16:04 -0500)
commitf318d658decb5789cfbb43041daf3dc3aade1df0
tree96db512f43eb4213722e90f9340a4b94f453d04f
parent42c4568a4ace0adc27a9d6f02936e2047ba6fc7e
parent1db5950f1d0b82e07371b211a48317b8972da063
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6