Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Aug 2009 19:14:01 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Aug 2009 19:14:01 +0000 (12:14 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: check saved state before restore


Trivial merge