David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -04:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c	mac80211: simplify buffers in aes_128_cmac_vector	2012-08-20 14:03:18 +02:00
aes_cmac.h
agg-rx.c
agg-tx.c
cfg.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
cfg.h
chan.c
debug.h
debugfs_key.c
debugfs_key.h
debugfs_netdev.c
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.h
debugfs.c	mac80211: remove freq/chantype from debugfs	2012-08-20 14:13:40 +02:00
debugfs.h
driver-ops.h	mac80211: support P2P Device abstraction	2012-08-20 13:58:22 +02:00
event.c
ht.c
ibss.c	mac80211: add supported rates change notification in IBSS	2012-08-20 13:31:43 +02:00
ieee80211_i.h	mac80211: pass channel to ieee80211_send_probe_req	2012-08-20 14:13:45 +02:00
iface.c	mac80211: add IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF	2012-08-20 13:58:23 +02:00
Kconfig
key.c
key.h
led.c	leds: Rename led_brightness_set() to led_set_brightness()	2012-07-24 07:52:34 +08:00
led.h
main.c	mac80211: convert ops checks to WARN_ON	2012-08-20 14:13:44 +02:00
Makefile
mesh_hwmp.c	mac80211: clean up mpath_move_to_queue()	2012-08-20 13:25:05 +02:00
mesh_pathtbl.c	mac80211: clean up mpath_move_to_queue()	2012-08-20 13:25:05 +02:00
mesh_plink.c	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2012-08-21 16:00:21 -04:00
mesh_sync.c
mesh.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-08-24 12:25:30 -04:00
mesh.h	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2012-08-21 16:00:21 -04:00
michael.c
michael.h
mlme.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
offchannel.c	mac80211: support P2P Device abstraction	2012-08-20 13:58:22 +02:00
pm.c
rate.c
rate.h	mac80211: use oper_channel in rate init	2012-08-20 14:13:41 +02:00
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2012-07-12 15:21:05 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_pid_algo.c
rc80211_pid_debugfs.c
rc80211_pid.h
rx.c	mac80211: use RX status band instead of current band	2012-08-20 14:13:43 +02:00
scan.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-08-24 12:25:30 -04:00
spectmgmt.c
sta_info.c
sta_info.h
status.c	mac80211: support P2P Device abstraction	2012-08-20 13:58:22 +02:00
tkip.c
tkip.h
trace.c
trace.h	mac80211: don't assume channel is set in tracing	2012-08-20 14:13:42 +02:00
tx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-08-31 15:14:18 -04:00
util.c	mac80211: pass channel to ieee80211_send_probe_req	2012-08-20 14:13:45 +02:00
wep.c
wep.h
wme.c
wme.h
wpa.c
wpa.h