git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49b5c7f 96ff564)
Merge branch 'wireless-2.6' into wireless-next-2.6
authorReinette Chatre <reinette.chatre@intel.com>
Fri, 30 Apr 2010 22:13:00 +0000 (15:13 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Fri, 30 Apr 2010 22:13:00 +0000 (15:13 -0700)
commitad41ee3a45c7de33cfa0057f4a12362ba1f1af32
tree84ad26649f4fce8a3816351ab1d511cf6c6f0bf1tree | snapshot
parent49b5c7f473f1bbcb30275dcaee2c06dfb8ec2279commit | diff
parent96ff56419504ac6a610ff1af42330e0423242e16commit | diff
Merge branch 'wireless-2.6' into wireless-next-2.6

Patch "iwlwifi: work around passive scan issue" was merged into
wireless-2.6, but touched a lot of code since modified (and moved)
in wireless-next-2.6. This caused some conflicts.

Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn-lib.c diff1 | | blob | history
drivers/net/wireless/iwlwifi/iwl-commands.h diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl3945-base.c diff1 | diff2 | blob | history
drivers/net/wireless/p54/p54pci.c diff1 | diff2 | blob | history
net/mac80211/agg-tx.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
Full containers within linux kernel