David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-21 22:28:24 -05:00
..
brcmfmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
brcmsmac	net: brcm80211: Deletion of unnecessary checks before two function calls	2014-11-20 16:14:39 -05:00
brcmutil	brcmutil: assure unused bits are cleared in 11n chanspec	2014-05-29 13:10:25 -04:00
include	brcmfmac: Add wowl support for PCIE devices.	2014-09-30 13:17:48 -04:00
Kconfig	brcmfmac: conditionally compile firmware protocol source code	2014-09-15 15:09:26 -04:00
Makefile	brcm80211: Use normal DEBUG define	2012-01-24 14:21:13 -05:00