tree be77ed97c9c94cbcc9931c58ce1a061e9dc26755
parent fb7d4045669b3ea0e92cf45963839a9808b7650c
parent 74bd7d093b8e87f35eaf3b14459b96a0e20d1d10
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1172798911 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1172798911 -0800

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:
  [SPARC64]: Fix parport_pc build.
  [SPARC64]: Update defconfig.