]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:33:08 +0000 (11:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:33:08 +0000 (11:33 -0700)
commit8dad4f4cdc96fd01e778033d41d36324288fe276
tree5e917c649b9ea7792a18cdf8a25736bc62b870e9
parentfc57e801d8c03acb27e2944b7c02cc930bec0666
parentaf1860af6dcd54a3b941a70e10bdb080709e88ba
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:
  x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
  PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC