Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <[email protected]>
Tue, 11 Nov 2008 17:20:43 +0000 (09:20 -0800)
committerLinus Torvalds <[email protected]>
Tue, 11 Nov 2008 17:20:43 +0000 (09:20 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Update defconfig.
  Revert "sparc: correct section of current_pc()"


Trivial merge