Merge commit 'v2.6.32-rc7' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Nov 2009 06:51:02 +0000 (07:51 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Nov 2009 06:51:07 +0000 (07:51 +0100)
commit99f4c9de2b707795acb215e2e94df7ea266042b5
tree6123682a8e0d880feebb690a55b3fb442ef3dee8
parent62ad33f67003b9a7b6013f0511579b9805e11626
parent156171c71a0dc4bce12b4408bb1591f8fe32dc1a
Merge commit 'v2.6.32-rc7' into core/iommu

Merge reason: Add fixes we'll depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/pci-dma.c