David S. Miller 56c5d900db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	sound/core/memalloc.c

2008-10-11 12:39:35 -07:00

..

boot

sparc: Add target for a stripped kernel

2008-08-24 20:35:47 -07:00

include/asm

sparc32: Delete master_l10_limit.

2008-09-19 21:18:03 -07:00

kernel

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

2008-10-11 12:39:35 -07:00

lib

sparc: remove CVS keywords

2008-05-20 00:33:44 -07:00

math-emu

sparc: remove CVS keywords

2008-05-20 00:33:44 -07:00

mm

sparc32: add init memory poisoning

2008-09-03 16:29:42 -07:00

oprofile

Combine instrumentation menus in kernel/Kconfig.instrumentation

2007-10-19 11:53:54 -07:00

prom

sparc: remove CONFIG_SUN4

2008-08-31 20:59:37 -07:00

defconfig

sparc: Add kgdb support.

2008-04-29 02:38:50 -07:00

Kconfig

sparc32: use RTC subsystem

2008-09-03 15:52:38 -07:00

Kconfig.debug

[SPARC32]: Add irqflags.h to sparc32 and use it from generic code.

2007-10-13 21:53:11 -07:00

Makefile

sparc: Add target for a stripped kernel

2008-08-24 20:35:47 -07:00