Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 3 May 2010 18:53:49 +0000 (14:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 3 May 2010 18:53:49 +0000 (14:53 -0400)
commit1d7d969dd0b467ba32cf3829e8bf104a5084150d
treef0de3aca8a33bed612ba2c09f61fcabe289dc14d
parent12ef116bf750c221e214e33c61e7f4c98300b5fd
parentf8478df1eab2f11aefc4b6668c5867949ab96bd7
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c