diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:45:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:45:31 +0100 |
| commit | 0e064caf6402d1d67db4233d26beec88ca212919 (patch) | |
| tree | 2bb6affb9cdeb23adff35dee7ca9fe1c14475f18 | |
| parent | 90a6501f94aedd7fb40f5556334843194fb598be (diff) | |
| parent | f409adf5b1db55ece7e80b67a944f9c0d3fe93e9 (diff) | |
| parent | c13f3d378f77ce3176628ade452b0e461242faf3 (diff) | |
Merge branches 'core/futexes' and 'core/iommu' into core/urgent
Merge reason: Switch from topical split to the stabilization track
Signed-off-by: Ingo Molnar <mingo@elte.hu>