David S. Miller 90d3ac15e5 Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' ... Conflicts: arch/sparc/kernel/smp_32.c With merge conflict help from Daniel Hellstrom. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-05-20 13:10:22 -07:00
..
drivers	um: remove file pointer from ioctl	2011-03-22 17:44:09 -07:00
include	um: fix call tracer and bug handler	2011-04-14 16:06:56 -07:00
kernel	sched: Provide scheduler_ipi() callback in response to smp_send_reschedule()	2011-04-14 08:52:32 +02:00
os-Linux	um: fix global timer issue when using CONFIG_NO_HZ	2010-10-26 16:52:03 -07:00
scripts	uml: throw out CONFIG_MODE_TT	2007-10-16 09:43:05 -07:00
sys-i386	uml: kernels on {i386,x86_64} produce bad coredumps	2011-03-22 17:44:09 -07:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	um: change to new flag variables	2011-03-17 14:02:57 +01:00
sys-x86_64	uml: kernels on {i386,x86_64} produce bad coredumps	2011-03-22 17:44:09 -07:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
Kconfig.char	sound: make OSS sound core optional	2008-08-29 10:06:21 +02:00
Kconfig.common	genirq: Remove the now obsolete config options and select statements	2011-03-30 14:13:23 +02:00
Kconfig.debug	uml: GPROF needs to depend on FRAME_POINTER	2008-02-05 09:44:25 -08:00
Kconfig.net	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.rest	uml: kill a kconfig warning	2009-04-21 13:41:50 -07:00
Kconfig.um	genirq: Remove __do_IRQ	2011-01-21 11:55:31 +01:00
Kconfig.x86	um: disable CONFIG_CMPXCHG_LOCAL	2011-04-14 16:06:56 -07:00
Makefile	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01: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
defconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00