Frederic Weisbecker c032862fba Merge commit '8700c95adb03' into timers/nohz ... The full dynticks tree needs the latest RCU and sched upstream updates in order to fix some dependencies. Merge a common upstream merge point that has these updates. Conflicts: include/linux/perf_event.h kernel/rcutree.h kernel/rcutree_plugin.h Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>		2013-05-02 17:54:19 +02:00
..
drivers	Merge 3.9-rc3 into tty-next	2013-03-21 16:07:34 -07:00
include	nohz: Rename CONFIG_NO_HZ to CONFIG_NO_HZ_COMMON	2013-04-03 13:56:03 +02:00
kernel	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-04-30 07:50:17 -07:00
os-Linux	Merge commit '8700c95adb03' into timers/nohz	2013-05-02 17:54:19 +02:00
scripts	um: Preinclude include/linux/kern_levels.h	2012-09-27 20:20:09 +02:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	um: get rid of pointless include "..." where include <...> will do	2012-10-09 22:28:45 +02:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig	Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-08-01 16:45:02 -07:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	idle: Remove GENERIC_IDLE_LOOP config switch	2013-04-17 10:39:38 +02:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net	arch/um: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:04 -08:00
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	arch/um: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:04 -08:00
Makefile	UAPI: Partition the header include path sets and add uapi/ header directories	2012-10-02 18:01:26 +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