Ingo Molnar d1a76187a5 Merge commit 'v2.6.28-rc2' into core/locking ...

Conflicts:
	arch/um/include/asm/system.h

2008-10-28 16:54:49 +01:00

..

asm

Merge commit 'v2.6.28-rc2' into core/locking

2008-10-28 16:54:49 +01:00

shared

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

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