Merge branch 'bjorn-pci-root-v4-2.6.35' into release
authorLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:16 +0000 (16:17 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:16 +0000 (16:17 -0400)

Trivial merge