Merge branch 'linus' into timers/hrtimers
authorThomas Gleixner <tglx@linutronix.de>
Sun, 25 Jan 2009 10:54:33 +0000 (11:54 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 25 Jan 2009 10:54:33 +0000 (11:54 +0100)
1  2 
kernel/hrtimer.c

Simple merge