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)
commit4acbab84688bfea82322c14e809fc7d82242cee3
tree7c4a9c0a088a70799d744d30e7c6a3220701adbb
parent78ae87c3cd723c8a8dcd67d4e4cbc6d63671c108
parent899b69d079713d0f568fb2700b86987aa94f29b2
Merge branch 'master' of /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