Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/net/wireless
History
David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c
	net/sched/cls_api.c
	net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
..
.gitignore
ap.c cfg80211: send stop AP event only due to internal reason 2014-02-25 17:34:18 +01:00
chan.c cfg80211: Add attributes describing prohibited channel bandwidth 2014-04-25 17:38:23 +02:00
core.c cfg80211: change return value of notifier function 2014-04-25 17:33:44 +02:00
core.h cfg80211: change wiphy_to_dev function name 2014-04-25 17:33:04 +02:00
db.txt
debugfs.c
debugfs.h
ethtool.c cfg80211: change wiphy_to_dev function name 2014-04-25 17:33:04 +02:00
ethtool.h
genregdb.awk cfg80211: regulatory: allow getting DFS CAC time from userspace 2014-02-25 17:29:25 +01:00
ibss.c cfg80211: change wiphy_to_dev function name 2014-04-25 17:33:04 +02:00
Kconfig cfg80211: Enable GO operation on additional channels 2014-04-09 10:55:34 +02:00
lib80211.c
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c
lib80211_crypt_wep.c
Makefile
mesh.c cfg80211/mac80211: move interface counting for combination check to mac80211 2014-04-09 10:55:43 +02:00
mlme.c cfg80211: change wiphy_to_dev function name 2014-04-25 17:33:04 +02:00
nl80211.c cfg80211: Dynamic channel bandwidth changes in AP mode 2014-04-28 18:09:59 +02:00
nl80211.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-02-13 14:43:02 -05:00
radiotap.c radiotap: fix bitmap-end-finding buffer overrun 2013-12-16 12:06:43 +01:00
rdev-ops.h cfg80211: Dynamic channel bandwidth changes in AP mode 2014-04-28 18:09:59 +02:00
reg.c cfg80211: Use 5MHz bandwidth by default when checking usable channels 2014-04-25 17:39:32 +02:00
reg.h cfg80211: Enable GO operation on indoor channels 2014-04-09 10:55:37 +02:00
regdb.h
scan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-05-12 13:19:14 -04:00
sme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-05-12 13:19:14 -04:00
sysfs.c
sysfs.h
trace.c
trace.h cfg80211: Dynamic channel bandwidth changes in AP mode 2014-04-28 18:09:59 +02:00
util.c cfg80211: change wiphy_to_dev function name 2014-04-25 17:33:04 +02:00
wext-compat.c cfg80211: change wiphy_to_dev function name 2014-04-25 17:33:04 +02:00
wext-compat.h cfg80211: remove unused wiphy argument from cfg80211_wext_freq() 2014-04-10 10:06:19 +02:00
wext-core.c
wext-priv.c
wext-proc.c
wext-sme.c cfg80211: change wiphy_to_dev function name 2014-04-25 17:33:04 +02:00
wext-spy.c