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

Conflicts:

	drivers/net/e1000e/ich8lan.c

2008-12-15 20:03:50 -08:00

..

drivers

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

2008-12-15 20:03:50 -08:00

include

x86, um: get rid of uml-config.h

2008-10-22 22:55:23 -07:00

kernel

x86, um: get rid of uml unistd.h

2008-10-22 22:55:21 -07:00

os-Linux

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

scripts

uml: throw out CONFIG_MODE_TT

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

sys-i386

x86, um: get rid of excessive includes of uml-config.h

2008-10-22 22:55:22 -07:00

sys-ia64

x86, um: get rid of sysdep symlink

2008-10-22 22:55:21 -07:00

sys-ppc

x86, um: get rid of header symlinks

2008-10-22 22:55:22 -07:00

sys-x86_64

x86: Fix ASM_X86__ header guards

2008-10-22 22:55:23 -07:00

defconfig

UML: update defconfig

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

Kconfig.char

sound: make OSS sound core optional

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

Kconfig.common

x86, um: get rid of arch/um/Kconfig.arch

2008-10-22 22:55:23 -07:00

Kconfig.debug

uml: GPROF needs to depend on FRAME_POINTER

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

Kconfig.net

uml: fix URLs in Kconfig and help strings

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

Kconfig.rest

x86, um: get rid of arch/um/Kconfig.arch

2008-10-22 22:55:23 -07:00

Kconfig.um

x86, um: get rid of arch/um/Kconfig.arch

2008-10-22 22:55:23 -07:00

Kconfig.x86

x86, um: get rid of arch/um/Kconfig.arch

2008-10-22 22:55:23 -07:00

Makefile

x86, um: get rid of uml-config.h

2008-10-22 22:55:23 -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

x86, um: get rid of arch/um/os symlink

2008-10-22 22:55:22 -07: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