David S. Miller 4180442058 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c net/ipv4/tcp_metrics.c Overlapping changes between the "don't create two tcp metrics objects with the same key" race fix in net and the addition of the destination address in the lookup key in net-next. Minor overlapping changes in bnx2x driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-18 00:55:41 -08: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	2014-01-18 00:55:41 -08:00
kernel	parisc: Ensure full cache coherency for kmap/kunmap	2014-01-08 23:02:57 +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
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