Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6 ...

Fixes a merge conflict against the x86 tree caused by a fix to
atomic.h which I renamed to atomic_long.h.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2009-06-12 11:32:58 +02:00

..

drivers

block: implement and enforce request peek/start/fetch

2009-05-11 09:52:18 +02:00

include

asm-generic: rename page.h and uaccess.h

2009-06-11 21:02:17 +02:00

kernel

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

os-Linux

uml: improve error messages

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

scripts

uml: throw out CONFIG_MODE_TT

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

sys-i386

uml: fix link error from prefixing of i386 syscalls with ptregs_

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

sys-ia64

uml: remove useless comments

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

sys-ppc

uml: remove useless comments

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

sys-x86_64

uml: remove useless comments

2009-04-01 08:59:17 -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

uml: kill a kconfig warning

2009-04-21 13:41:50 -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

get rid of the last symlink in uml build

2009-01-05 17:41:45 -08: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