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

Conflicts:

	include/asm-x86/statfs.h

2008-10-13 17:13:56 +01:00

..

drivers

uml: fix tty-related build error

2008-07-30 09:41:45 -07:00

include

UML: make several more things static

2008-07-24 10:47:24 -07:00

kernel

kernel/cpu.c: create a CPU_STARTING cpu_chain notifier

2008-09-08 19:25:24 +02:00

os-Linux

UML: make several more things static

2008-07-24 10:47:24 -07:00

scripts

uml: throw out CONFIG_MODE_TT

2007-10-16 09:43:05 -07:00

sys-i386

UML: make several more things static

2008-07-24 10:47:24 -07:00

sys-ia64

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sys-ppc

Generic semaphore implementation

2008-04-17 10:42:34 -04:00

sys-x86_64

x86_64: uml: fix rename header guard

2008-08-15 12:25:34 +02:00

defconfig

UML: update defconfig

2008-02-23 17:12:13 -08:00

Kconfig

thanks to net/mac80211 we need to pull drivers/leds/Kconfig on uml

2008-05-21 16:55:58 -07:00

Kconfig.char

sound: make OSS sound core optional

2008-08-29 10:06:21 +02:00

Kconfig.debug

uml: GPROF needs to depend on FRAME_POINTER

2008-02-05 09:44:25 -08:00

Kconfig.i386

Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUT

2008-09-06 19:30:22 +01:00

Kconfig.net

uml: fix URLs in Kconfig and help strings

2008-02-05 09:44:25 -08:00

Kconfig.x86_64

Remove redundant CONFIG_ARCH_SUPPORTS_AOUT

2008-09-06 19:30:20 +01:00

Makefile

[UML] fix gcc ICEs and unresolved externs

2008-07-07 10:53:10 -07:00

Makefile-i386

[UML] fix gcc ICEs and unresolved externs

2008-07-07 10:53:10 -07:00

Makefile-ia64

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile-os-Linux

kbuild: enable 'make CFLAGS=...' to add additional options to CC

2007-10-14 22:21:35 +02:00

Makefile-ppc

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile-skas

[PATCH] uml makefiles sanitized

2005-09-29 08:46:26 -07:00

Makefile-x86_64

[UML] fix gcc ICEs and unresolved externs

2008-07-07 10:53:10 -07:00