| commit | d431adfbc9b7de651f3164c6b7ffcad75805d7e4 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Jul 25 21:40:40 2012 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Jul 25 21:40:40 2012 +0200 |
| tree | 29bce222c81a3a392e51c11e2188659aa6d1bded | |
| parent | d6250a3f12edb3a86db9598ffeca3de8b4a219e9 [diff] | |
| parent | e2b34e311be3a57c9abcb927e37a57e38913714c [diff] |
Merge branch 'linus' into x86/urgent Merge in Linus's tree to avoid a conflict. Signed-off-by: Ingo Molnar <mingo@kernel.org>