Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Apr 2010 20:37:10 +0000 (16:37 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Apr 2010 20:37:10 +0000 (16:37 -0400)
commita124f3bed79d5fd5f87b09a7569ae6b7da4171d2
tree44694c6283672300722ae7096947cf1deb2a6f26
parentf18d4463d092162f34a8bd226505627ceeac3e8a
parent91dd6c27a29f97d81d2f71651d3b6bb55a4c1788
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6