David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
boards	avr32: boards/atngw100/mrmt.c: fix building error	2013-08-08 14:16:22 +02:00
boot	Kbuild: centralize MKIMAGE and cmd_uimage definitions	2012-03-26 15:49:20 +02:00
configs	MMC highlights for 3.10:	2013-05-04 13:45:17 -07:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
kernel	avr32: cast syscall_return to silence compiler warning	2013-09-30 08:42:01 +02:00
lib	ARCH: drivers remove __dev* attributes.	2013-01-03 15:57:13 -08:00
mach-at32ap	mtd: atmel_nand: replace cpu_is_at32ap7000() with a nand platform data	2013-08-05 20:55:42 +01:00
mm	arch: mm: pass userspace fault flag to generic fault handler	2013-09-12 15:38:01 -07:00
oprofile	oprofilefs_create_...() do not need superblock argument	2013-09-03 22:52:48 -04:00
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.debug	[AVR32] Include instrumentation menu	2008-01-25 08:31:40 +01:00
Makefile	kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line	2010-08-03 14:09:45 +02:00