Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Oct 2010 15:14:58 +0000 (11:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Oct 2010 15:14:58 +0000 (11:14 -0400)
commitb1a9338d5eaa9c38c326e20ce339247f4d585b62
treed2e48e2120e96c4427a5d6897312c15a0111c429
parent1728943d83e9fd919e454332fe344944123b3c3a
parent62cb3c6ac47a5ab7d8c67dbbf8cbdcd5ae735410
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6