Merge branch 'linus' into core/locking
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 15:27:20 +0000 (17:27 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 15:27:28 +0000 (17:27 +0200)
Reason: Pull in the semaphore related changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
kernel/watchdog.c

Simple merge