| commit | 6402c7dc2a19c19bd8cdc7d80878b850da418942 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Apr 24 20:33:46 2013 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed Apr 24 20:33:54 2013 +0200 |
| tree | cda2ea2df40442e2aa016119f3548cc504127ea8 | |
| parent | 77c675ba18836802f6b73d2d773481d06ebc0f04 [diff] | |
| parent | 60d509fa6a9c4653a86ad830e4c4b30360b23f0e [diff] |
Merge branch 'linus' into timers/core Reason: Get upstream fixes before adding conflicting code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>