From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 2 Mar 2007 01:28:31 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.21-rc3~148
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=132a69c6cc3dfa7fa354a88128acee7e6ee7082b

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix parport_pc build.
  [SPARC64]: Update defconfig.
---

132a69c6cc3dfa7fa354a88128acee7e6ee7082b