tree 314f7a5637d5517a19f29d64a17e3459505def8f
parent b963bd39c9000328f6ce4f12aa52abbb0c68ee91
parent df43176c934f2bc01f7615a6e20a4b8e77dcdd11
author Len Brown <len.brown@intel.com> 1253340885 -0400
committer Len Brown <len.brown@intel.com> 1253340885 -0400

Merge branch 'misc-2.6.32' into release

Conflicts:
	drivers/pci/dmar.c

Signed-off-by: Len Brown <len.brown@intel.com>