Merge branch 'rt/head' into rt/2.6.33
authorThomas Gleixner <tglx@linutronix.de>
Fri, 26 Feb 2010 19:38:31 +0000 (20:38 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 26 Feb 2010 19:38:31 +0000 (20:38 +0100)
commit0d518ab64e5b1bf6ace8257c3eeb94b1ffcef2a2
tree71fa88c393701e3849c966b2f400784ce8620257
parent5fd3a249542494b19e3c77c92b5d5ddc7fb8ece4
parentdcfb059a06c1f62061edaece74560f44925279f2
Merge branch 'rt/head' into rt/2.6.33

Conflicts:
Makefile

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