Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Apr 2010 20:37:59 +0000 (16:37 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Apr 2010 20:37:59 +0000 (16:37 -0400)
commit76026660c3699a82d1df2d04f6dd81af01d9d19a
tree553f0b3d0bbfac19f106348c04d7923d11830c2f
parent317a929dcd39bceff93974dac5fbdafa9b2a33ac
parente7cb49550eb25f2e551d7d7f3bb71560df83680c
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-scan.c