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

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

skas

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

aio.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

elf_aux.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

execvp.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

file.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

helper.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

internal.h

um: pass siginfo to guest process

2012-08-02 00:49:17 +02:00

irq.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

main.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

Makefile

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

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

mem.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

process.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-10-13 10:05:52 +09:00

registers.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

sigio.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

signal.c

um: fix build failure due to mess-up of sig_info protorype

2013-03-11 10:08:03 +01:00

start_up.c

um: add missing declaration of 'getrlimit()' and friends

2013-03-11 10:08:03 +01:00

time.c

nohz: Rename CONFIG_NO_HZ to CONFIG_NO_HZ_COMMON

2013-04-03 13:56:03 +02:00

tty.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

umid.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

user_syms.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

util.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00