summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-04 11:45:25 +0100
committerIngo Molnar <mingo@elte.hu>2010-03-04 11:45:31 +0100
commit0e064caf6402d1d67db4233d26beec88ca212919 (patch)
tree2bb6affb9cdeb23adff35dee7ca9fe1c14475f18 /arch/x86
parentsched, rcu: Fix rcu_dereference() for RCU-lockdep (diff)
parentfutex: Protect pid lookup in compat code with RCU (diff)
parentx86/gart: Unexport gart_iommu_aperture (diff)
downloadlinux-0e064caf6402d1d67db4233d26beec88ca212919.tar.xz
linux-0e064caf6402d1d67db4233d26beec88ca212919.zip
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>