]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 4 Jun 2007 20:25:59 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 4 Jun 2007 20:25:59 +0000 (13:25 -0700)
commitfa457c22d08ac199881ece9246df91d1a1237bf9
tree7c4a9c0a088a70799d744d30e7c6a3220701adbb
parent6f6fb15de5a9cae8e0b481a175456f69ab5fc258
parentf2f749590d3d0f941e019cd0f95d19c25f584c3a
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [ATA]: Don't allow to enable this for SPARC64 without PCI.
  [VIDEO]: XVR500 and XVR2500 require FB=y