Linus Torvalds de0a5345a5 Merge branch 'for-linus' of git://github.com/richardweinberger/linux ... * 'for-linus' of git://github.com/richardweinberger/linux: (90 commits) um: fix ubd cow size um: Fix kmalloc argument order in um/vdso/vma.c um: switch to use of drivers/Kconfig UserModeLinux-HOWTO.txt: fix a typo UserModeLinux-HOWTO.txt: remove ^H characters um: we need sys/user.h only on i386 um: merge delay_{32,64}.c um: distribute exports to where exported stuff is defined um: kill system-um.h um: generic ftrace.h will do... um: segment.h is x86-only and needed only there um: asm/pda.h is not needed anymore um: hw_irq.h can go generic as well um: switch to generic-y um: clean Kconfig up a bit um: a couple of missing dependencies... um: kill useless argument of free_chan() and free_one_chan() um: unify ptrace_user.h um: unify KSTK_... um: fix gcov build breakage ...		2011-11-02 09:45:39 -07:00
..
drivers	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
include	um: kill system-um.h	2011-11-02 14:15:34 +01:00
kernel	um: distribute exports to where exported stuff is defined	2011-11-02 14:15:36 +01:00
os-Linux	um: unify ptrace_user.h	2011-11-02 14:15:27 +01:00
scripts	um: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +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	time: Cleanup old CONFIG_GENERIC_TIME references that snuck in	2011-10-04 13:07:47 -07:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	genirq: Remove the now obsolete config options and select statements	2011-03-30 14:13:23 +02: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: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +01: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