Pull misc-2.6.40 into release branch
authorTony Luck <tony.luck@intel.com>
Fri, 20 May 2011 17:35:03 +0000 (10:35 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 20 May 2011 17:35:03 +0000 (10:35 -0700)

Trivial merge