Merge branches 'core/futexes' and 'core/iommu' into core/urgent
Ingo Molnar [Thu, 4 Mar 2010 10:45:25 +0000 (11:45 +0100)]
Merge reason: Switch from topical split to the stabilization track

Signed-off-by: Ingo Molnar <mingo@elte.hu>


Trivial merge