From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 4 Jun 2007 20:25:59 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.22-rc4~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4acbab84688bfea82322c14e809fc7d82242cee3;p=linux-2.6-omap-h63xx.git

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
---

4acbab84688bfea82322c14e809fc7d82242cee3