David S. Miller ff9c38bba3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/mac80211/ht.c

2009-12-01 22:13:38 -08:00

..

boot

arch/sparc/boot/*.c: Mark various internal functions static

2009-11-15 15:01:40 -08:00

configs

sparc: Update defconfigs.

2009-09-16 00:31:26 -07:00

include/asm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-18 22:19:03 -08:00

kernel

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-18 22:19:03 -08:00

lib

sparc64: Fix section attribute warnings.

2009-05-29 16:12:02 -07:00

math-emu

sparc64: unify math-emu

2008-12-04 09:16:56 -08:00

mm

sparc64: Fix definition of VMEMMAP_SIZE.

2009-11-23 16:38:56 -08:00

oprofile

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

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

prom

sparc64: Fix bootup with mcount in some configs.

2009-09-04 03:39:45 -07:00

Kconfig

Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-10-08 12:05:50 -07:00

Kconfig.debug

generic debug pagealloc: build fix

2009-04-02 19:04:48 -07:00

Makefile

arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0

2009-09-20 12:28:22 +02:00