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 /drivers/ide/cmd640.c | |
| parent | sched, rcu: Fix rcu_dereference() for RCU-lockdep (diff) | |
| parent | futex: Protect pid lookup in compat code with RCU (diff) | |
| parent | x86/gart: Unexport gart_iommu_aperture (diff) | |
| download | linux-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>