Remove the remains of a broken merge.
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>