| commit | e8b9dd7e2471b1274e3be719fcc385e0a710e46f | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Sun Jul 15 10:24:53 2012 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Sun Jul 15 10:24:53 2012 +0200 |
| tree | 030d7ce20e8f8767d9423f78c102aba089eec372 | |
| parent | 924412f66fd9d21212e560a93792b0b607d46c6e [diff] | |
| parent | 6b1859dba01c7d512b72d77e3fd7da8354235189 [diff] |
Merge branch 'timers/urgent' into timers/core Reason: Update to upstream changes to avoid further conflicts. Fixup a trivial merge conflict in kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>