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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

2009-06-15 03:02:23 -07:00

..

boot

sparc,sparc64: unify boot/

2008-12-04 09:17:21 -08:00

configs

sparc32: Update defconfig.

2009-04-17 04:05:06 -07:00

include/asm

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

2009-06-15 03:02:23 -07:00

kernel

module: cleanup FIXME comments about trimming exception table entries.

2009-06-12 21:47:05 +09:30

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

module: trim exception table on init free.

2009-06-12 21:47:04 +09:30

oprofile

sparc64: Implement NMI watchdog on capable cpus.

2009-01-30 00:03:53 -08:00

prom

sparc: Eliminate PROMLIB_INTERNAL as it does nothing

2009-01-08 16:59:01 -08:00

Kconfig

generic debug pagealloc

2009-04-01 08:59:13 -07:00

Kconfig.debug

generic debug pagealloc: build fix

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

Makefile

sparc: unify kernel/init_task

2008-12-04 13:28:09 -08:00