David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
configs	parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver	2013-12-03 23:23:35 +01:00
hpux	[readdir] constify ->actor	2013-06-29 12:57:05 +04:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
kernel	parisc: fix kernel memory layout in vmlinux.ld.S	2013-11-30 22:09:21 +01:00
lib	parisc: size_t is unsigned, so comparison size < 0 doesn't make sense.	2013-11-20 00:09:42 +01:00
math-emu	parisc: remove duplicate define	2013-11-07 22:28:15 +01:00
mm	parisc: fix kernel memory layout in vmlinux.ld.S	2013-11-30 22:09:21 +01: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	Kconfig cleanups for v3.13	2013-11-15 14:05:15 -08:00
Kconfig.debug	consolidate per-arch stack overflow debugging options	2013-07-04 11:25:39 -07:00
Makefile	parisc: make "make install" not depend on vmlinux	2013-11-07 22:28:06 +01:00
nm