Merge branch 'rt/head' into rt/2.6.31

Conflicts:
	Makefile

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>