]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9821626 6bfb09a)
Merge branch 'linus' into x86/iommu
authorIngo Molnar <mingo@elte.hu>
Sun, 14 Sep 2008 12:07:00 +0000 (14:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 14 Sep 2008 12:07:00 +0000 (14:07 +0200)
Conflicts:
lib/swiotlb.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
drivers/pci/intel-iommu.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/intel-iommu.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.