Merge branch 'misc-2.6.32' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:14:45 +0000 (02:14 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:14:45 +0000 (02:14 -0400)
Conflicts:
drivers/pci/dmar.c

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

Trivial merge