David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-12-23 17:13:56 -05:00

..

boot

sparc32: added U-Boot build target: uImage

2011-03-16 18:19:04 -07:00

configs

defconfig reduction

2010-08-14 22:26:53 +02:00

include/asm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-11-21 13:50:33 -05:00

kernel

sparc: Use kmemdup rather than duplicating its implementation

2011-12-04 10:46:56 -08:00

lib

sparc32: Correct the return value of memcpy.

2011-10-20 15:17:23 -07:00

math-emu

perf: Remove the nmi parameter from the swevent and overflow interface

2011-07-01 11:06:35 +02:00

mm

sparc32: Be less strict in matching %lo part of relocation.

2011-12-14 10:57:28 -08:00

oprofile

sparc: using HZ needs an include of linux/param.h

2009-10-05 00:46:08 -07:00

prom

sparc: Remove unnecessary semicolons

2011-06-07 16:06:34 -07:00

Kconfig

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2011-11-06 18:54:53 -08:00

Kconfig.debug

lib: consolidate DEBUG_STACK_USAGE option

2011-05-25 08:39:54 -07:00

Makefile

sparc32: added U-Boot build target: uImage

2011-03-16 18:19:04 -07:00