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
..
configs	parisc: add defconfig for c8000 machine	2013-07-31 23:42:10 +02:00
hpux	[readdir] constify ->actor	2013-06-29 12:57:05 +04:00
include	net: introduce SO_MAX_PACING_RATE	2013-09-28 15:35:41 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-09-06 09:36:28 -07:00
lib	parisc: Fix gcc miscompilation in pa_memcpy()	2013-07-09 22:09:23 +02:00
math-emu	parisc: avoid undefined shift in cnv_float.h	2013-01-07 23:06:22 +01:00
mm	arch/parisc/mm/fault.c: fix uninitialized variable usage	2013-09-30 14:31:02 -07:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.debug	consolidate per-arch stack overflow debugging options	2013-07-04 11:25:39 -07:00
Makefile	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
defpalo.conf	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
install.sh	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
nm	…