| commit | 1f815faec46e83bc96039797151846b60875bb06 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Jul 31 17:05:27 2012 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Jul 31 17:05:27 2012 +0200 |
| tree | 41a874f8090e3f69c8a9f13e3c85dd7a371e569b | |
| parent | b44d50dcacea0d485ca2ff9140f8cc28ee22f28d [diff] | |
| parent | e2b34e311be3a57c9abcb927e37a57e38913714c [diff] |
Merge branch 'linus' into timers/urgent Merge in Linus's branch which already has timers/core merged. Signed-off-by: Ingo Molnar <mingo@kernel.org>