q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/net/mac80211
History
David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-28 17:37:00 -07:00
..
aes_ccm.c mac80211: use AES_BLOCK_SIZE 2011-07-08 11:11:24 -04:00
aes_ccm.h mac80211: use AES_BLOCK_SIZE 2011-07-08 11:11:24 -04:00
aes_cmac.c mac80211: use AES_BLOCK_SIZE 2011-07-08 11:11:24 -04:00
aes_cmac.h mac80211: fix CMAC races 2011-07-08 11:11:20 -04:00
agg-rx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-06 14:40:06 -04:00
agg-tx.c net: mac80211: Add and use ht_vdbg debugging macro 2012-06-05 15:32:10 -04:00
cfg.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-13 15:35:35 -04:00
cfg.h
chan.c mac80211: allow channel change while mesh is down 2012-06-05 15:21:47 -04:00
debugfs.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs.h simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs_key.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs_key.h mac80211: support separate default keys 2010-12-13 15:23:29 -05:00
debugfs_netdev.c mac80211: Add missing mesh parameter dot11MeshForwarding for debugfs 2012-06-06 15:20:21 -04:00
debugfs_netdev.h
debugfs_sta.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
debugfs_sta.h
driver-ops.h mac80211: Framework to get wifi-driver stats via ethtool. 2012-05-08 21:53:51 -04:00
driver-trace.c
driver-trace.h mac80211: Framework to get wifi-driver stats via ethtool. 2012-05-08 21:53:51 -04:00
event.c
ht.c net: Convert net_ratelimit uses to net_<level>_ratelimited 2012-05-15 13:45:03 -04:00
ibss.c cfg80211: simplify cfg80211_can_beacon_sec_chan API 2012-06-05 15:32:16 -04:00
ieee80211_i.h mac80211: unify SW/offload remain-on-channel 2012-06-06 15:31:18 -04:00
iface.c mac80211: unify SW/offload remain-on-channel 2012-06-06 15:31:18 -04:00
Kconfig mac80211: Implement mesh synchronization framework 2012-04-10 15:20:31 -04:00
key.c mac80211: clean up asm/unaligned.h inclusion 2012-02-27 14:06:32 -05:00
key.h mac80211: allow driver to disconnect after resume 2011-07-13 14:49:43 -04:00
led.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
led.h mac80211: selective throughput LED trigger active 2010-12-22 14:33:37 -05:00
main.c mac80211: unify SW/offload remain-on-channel 2012-06-06 15:31:18 -04:00
Makefile mac80211: unify SW/offload remain-on-channel 2012-06-06 15:31:18 -04:00
mesh.c net: mac80211: Convert printk(KERN_DEBUG to pr_debug 2012-06-05 15:27:16 -04:00
mesh.h mac80211: Adds clean sdata helper 2012-04-24 14:56:10 -04:00
mesh_hwmp.c net: mac80211: Convert printk(KERN_DEBUG to pr_debug 2012-06-05 15:27:16 -04:00
mesh_pathtbl.c net: mac80211: Convert printk(KERN_DEBUG to pr_debug 2012-06-05 15:27:16 -04:00
mesh_plink.c net: mac80211: Convert printk(KERN_DEBUG to pr_debug 2012-06-05 15:27:16 -04:00
mesh_sync.c net: mac80211: Convert printk(KERN_DEBUG to pr_debug 2012-06-05 15:27:16 -04:00
michael.c
michael.h
mlme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -07:00
offchannel.c mac80211: unify SW/offload remain-on-channel 2012-06-06 15:31:18 -04:00
pm.c mac80211: Clear wowlan flag when drv_suspend returns failure 2012-06-06 15:20:22 -04:00
rate.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
rate.h mac80211: notify driver of rate control updates 2012-04-10 14:54:08 -04:00
rc80211_minstrel.c mac80211: remove hw.conf.channel usage where possible 2012-04-13 14:32:50 -04:00
rc80211_minstrel.h minstrel_ht: fixed rate mode through debugfs 2011-06-01 15:12:29 -04:00
rc80211_minstrel_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_minstrel_ht.c mac80211: remove hw.conf.channel usage where possible 2012-04-13 14:32:50 -04:00
rc80211_minstrel_ht.h minstrel_ht: move minstrel_mcs_groups declaration to header file 2010-06-24 15:42:18 -04:00
rc80211_minstrel_ht_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rc80211_pid.h Fix common misspellings 2011-03-31 11:26:23 -03:00
rc80211_pid_algo.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
rc80211_pid_debugfs.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00
rx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -07:00
scan.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-12 14:25:04 -04:00
spectmgmt.c mac80211: Remove unnecessary OOM logging messages 2011-09-13 15:45:02 -04:00
sta_info.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-06 14:40:06 -04:00
sta_info.h mac80211: add missing kernel-doc 2012-06-12 13:56:41 +02:00
status.c mac80211: unify SW/offload remain-on-channel 2012-06-06 15:31:18 -04:00
tkip.c net: mac80211: Convert printk(KERN_DEBUG to pr_debug 2012-06-05 15:27:16 -04:00
tkip.h mac80211: fix TKIP races, make API easier to use 2011-07-08 11:11:19 -04:00
tx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-06 14:40:06 -04:00
util.c mac80211: add stations after AP start on reconfig 2012-06-06 15:20:23 -04:00
wep.c mac80211: fix network header location when adding encryption headers 2012-05-16 12:47:43 -04:00
wep.h mac80211: move RX WEP weak IV counting 2012-03-13 14:54:16 -04:00
wme.c mac80211: use IEEE80211_NUM_ACS 2012-04-10 14:56:10 -04:00
wme.h mac80211: make ieee80211_downgrade_queue static 2012-04-10 14:54:06 -04:00
wpa.c mac80211: fix network header location when adding encryption headers 2012-05-16 12:47:43 -04:00
wpa.h mac80211: fix tx->skb NULL pointer dereference 2012-01-16 15:01:16 -05:00