tree ffd4b1a140854977e984a4390105333845c0e90c
parent 982162602b31041b426edec6480d327743abcbcc
parent 6bfb09a1005193be5c81ebac9f3ef85210142650
author Ingo Molnar <mingo@elte.hu> 1221394020 +0200
committer Ingo Molnar <mingo@elte.hu> 1221394020 +0200

Merge branch 'linus' into x86/iommu

Conflicts:
	lib/swiotlb.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>