]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into x86/amd-iommu
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 16:43:08 +0000 (18:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 16:43:08 +0000 (18:43 +0200)

Trivial merge