Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
commit3edf2fb9d80a46d6c32ba12547a42419845b4b76
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Aug 2009 19:14:01 +0000 (22 12:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Aug 2009 19:14:01 +0000 (22 12:14 -0700)
tree3afdd3d7b74f8a22595f4868584e234f79b374af
parente3054ea7f79db2c694a4f74febead2d4f8de5a98
parentc82f63e411f1b58427c103bd95af2863b1c96dd1
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: check saved state before restore