Marcelo Tosatti eac0556750 Merge branch 'linus' into queue ...

Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

2012-04-19 17:06:26 -03:00

..

drivers

um: Disintegrate asm/system.h

2012-04-10 00:13:45 +02:00

include

Merge branch 'linus' into queue

2012-04-19 17:06:26 -03:00

kernel

um: uml_setup_stubs': warning: unused variable 'pages'

2012-04-10 00:13:45 +02:00

os-Linux

um: use the right ifdef around exports in user_syms.c

2012-03-25 00:29:55 +01:00

scripts

um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS

2012-03-25 00:29:56 +01: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

.gitignore

um: tell git to ignore generated files

2010-03-06 11:26:28 -08:00

defconfig

um: Update defconfig

2012-03-25 00:46:51 +01:00

Kconfig.char

um: clean Kconfig up a bit

2011-11-02 14:15:29 +01:00

Kconfig.common

um: Wire CONFIG_GENERIC_IO up

2012-03-25 00:29:56 +01:00

Kconfig.debug

lib: consolidate DEBUG_STACK_USAGE option

2011-05-25 08:39:54 -07:00

Kconfig.net

Fix common misspellings

2011-03-31 11:26:23 -03:00

Kconfig.rest

um: switch to use of drivers/Kconfig

2011-11-02 14:15:41 +01:00

Kconfig.um

um: clean Kconfig up a bit

2011-11-02 14:15:29 +01:00

Makefile

um: Switch to large mcmodel on x86_64

2012-03-25 00:29:57 +01:00

Makefile-ia64

…

Makefile-os-Linux

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

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

Makefile-ppc

…

Makefile-skas

…