Merge branch 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 20:44:41 +0000 (12:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 20:44:41 +0000 (12:44 -0800)
* 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6:
  xen: suspend and resume system devices when running PVHVM


Trivial merge