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
..
configs	parisc: Update defconfigs which were missing CONFIG_NET.	2014-09-24 14:34:29 -04:00
hpux	parisc: sys_hpux: NUL terminator is one past the end	2014-08-27 14:33:46 +02:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
kernel	parisc: Use compat layer for msgctl, shmat, shmctl and semtimedop syscalls	2014-11-10 22:23:47 +01:00
lib	parisc: Replace __get_cpu_var uses for address calculation	2014-04-03 20:50:33 +02:00
math-emu	parisc: remove duplicate define	2013-11-07 22:28:15 +01:00
mm	parisc: Eliminate memset after alloc_bootmem_pages	2014-07-24 22:05:08 +02:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defpalo.conf	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
install.sh	parisc: make "make install" not depend on vmlinux	2013-11-07 22:28:06 +01:00
Kconfig	parisc: Wire up seccomp, getrandom and memfd_create syscalls	2014-08-27 14:39:56 +02:00
Kconfig.debug	consolidate per-arch stack overflow debugging options	2013-07-04 11:25:39 -07:00
Makefile	parisc: Only use -mfast-indirect-calls option for 32-bit kernel builds	2014-09-23 21:38:26 +02:00
nm