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)
commit37eca0d64a2dbeece25969ec0698e1ff72bdcf39
tree54ba70f0428f586f4fe28d8b429b9f9e0799a17a
parent277b199800ac90811ac86d215063df1984f51619
parent3c06806e690885ce978ef180c8f8b6f8c17fb4b4
Merge branch 'linus' into core/locking

Reason: Pull in the semaphore related changes

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