Merge commit '900cfa46191a7d87cf1891924cb90499287fd235'; branches 'timers/nohz',...

author Thomas Gleixner <tglx@linutronix.de>

Mon, 14 Jul 2008 16:09:05 +0000 (18:09 +0200)

committer Thomas Gleixner <tglx@linutronix.de>

Mon, 14 Jul 2008 16:09:05 +0000 (18:09 +0200)
author Thomas Gleixner <tglx@linutronix.de>
Mon, 14 Jul 2008 16:09:05 +0000 (18:09 +0200)
committer Thomas Gleixner <tglx@linutronix.de>
Mon, 14 Jul 2008 16:09:05 +0000 (18:09 +0200)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc kernel/hrtimer.c
Simple merge
author	Thomas Gleixner <tglx@linutronix.de>
	Mon, 14 Jul 2008 16:09:05 +0000 (18:09 +0200)
committer	Thomas Gleixner <tglx@linutronix.de>
	Mon, 14 Jul 2008 16:09:05 +0000 (18:09 +0200)
		1	2	3	4	5
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/hrtimer.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history