From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 28 Mar 2007 21:01:21 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.21-rc6~73
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d0a9af809124c432297a7c4a3bcf98cbfdb4036a;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [VIDEO]: Fix section mismatch in cg3.c
  [SPARC]: sparc64 gcc-4.2.0 20070317 -Werror failure
  [VIDEO] ffb: Fix two DAC handling bugs.
  [SPARC32]: Fix SMP build regression
  [DRM]: Delete sparc64 FFB driver code that never gets built.
---

d0a9af809124c432297a7c4a3bcf98cbfdb4036a