David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-10-08 21:40:54 -04:00
hal	staging: rtl8723au: hal: Removed unnecessary braces.	2014-09-28 23:11:26 -04:00
include	staging: rtl8723au: Fix alignment of mac_addr for ether_addr_copy() usage	2014-10-20 12:51:10 +08:00
os_dep	cfg80211: Convert del_station() callback to use a param struct	2014-10-20 16:24:21 +02:00
Kconfig	staging: rtl8723au: Remove P2P/WiFiDirect/WiFiDisplay code	2014-04-15 11:03:56 -07:00
Makefile	staging: rtl8723au: Add compiler check for -Wtype-limits	2014-06-18 14:08:58 -07:00
TODO	staging: r8723au: Turn on build of new driver	2014-04-05 14:53:46 -07:00