projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19c1a6f 091bf76)
Merge commit 'v2.6.30-rc5' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Mon, 11 May 2009 12:44:27 +0000 (14:44 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 May 2009 12:44:31 +0000 (14:44 +0200)
Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/pci-swiotlb.c patch | diff1 | diff2 | blob | history
lib/dma-debug.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/pci-swiotlb.c
Simple merge
diff --cc lib/dma-debug.c
Simple merge