]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a6477fd 5685806)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Apr 2010 18:32:12 +0000 (11:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Apr 2010 18:32:12 +0000 (11:32 -0700)
commitcb4a86981f7452075a4ebbc55d0b223c46f3ca20
tree4949f9d94bb61182b0828a96bc86191eb28f6c99tree | snapshot
parenta6477fd62ed64a9dd5bed6c82c981983183b9f32commit | diff
parent568580655bfb57566e47fc0fe514a880f9005e45commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: Ensure we re-enable devices on resume
  x86/PCI: parse additional host bridge window resource types
  PCI: revert broken device warning
  PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset
  x86/PCI: ignore Consumer/Producer bit in ACPI window descriptions
Linux Kernel Source Tree.