tree f11ed44faa2a4085d9bef84fc5eee89bc488dfd1
parent c203b33d2ee34594f6656c033cddd4f5860eb06c
parent a71775147f6ae2a2901e7b917c0a76df353f8801
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175115681 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175115681 -0700

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.