Merge branch 'rt/head' into rt/2.6.31
authorThomas Gleixner <tglx@linutronix.de>
Fri, 28 Aug 2009 20:49:02 +0000 (22:49 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 28 Aug 2009 20:49:02 +0000 (22:49 +0200)
commit46586a7f92be726b36677e5889658d0fa40332e8
tree38b78535bba88eb08abfc6c60d8f3385dfb5de16
parent2e2b78495f045a837c1b4baa89a5e249a5aa00b0
parente8ec1f34a1b5b3d096ff63157180c780dc880308
Merge branch 'rt/head' into rt/2.6.31

Conflicts:
Makefile

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