]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge commit 'linus/master' into x86/urgent
authorH. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
1  2 
arch/x86/kernel/amd_iommu.c
arch/x86/mm/kmmio.c

Simple merge
Simple merge