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
..
alpha	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00
arc	The "weak" attribute is commonly used for the default version of a	2014-10-23 15:04:27 -07:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
arm64	arm64 fixes:	2014-11-14 14:24:33 -08:00
avr32	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00
blackfin	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
c6x	…
cris	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00
frv	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00
hexagon	Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:48:00 +02:00
ia64	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00
m32r	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00
m68k	m68k: Wire up bpf	2014-10-27 11:02:19 +01:00
metag	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
microblaze	microblaze: Wire up bpf syscall	2014-10-27 09:25:34 +01:00
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
mn10300	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00
openrisc	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
parisc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05:00
score	…
sh	sh: fix sh770x SCIF memory regions	2014-10-29 16:33:15 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
tile	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
um	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
unicore32	…
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-11-21 15:46:17 -08:00
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05:00
.gitignore	…
Kconfig	…