tree 40569f568230f918ca55f04b355e251747f913ed
parent b364776ad1208a71f0c53578c84619a395412a8d
parent 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4
author David Woodhouse <David.Woodhouse@intel.com> 1224614540 +0100
committer David Woodhouse <David.Woodhouse@intel.com> 1224614540 +0100

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c