Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Mar 2007 01:28:31 +0000 (17:28 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Mar 2007 01:28:31 +0000 (17:28 -0800)
commit132a69c6cc3dfa7fa354a88128acee7e6ee7082b
treebe77ed97c9c94cbcc9931c58ce1a061e9dc26755
parentfb7d4045669b3ea0e92cf45963839a9808b7650c
parent74bd7d093b8e87f35eaf3b14459b96a0e20d1d10
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.