Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Nov 2008 17:20:43 +0000 (09:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Nov 2008 17:20:43 +0000 (09:20 -0800)
commit7e2cec8631b76e123787a57eb8334b95762b8741
tree5c9687feba833f307e299c3b5f053698dbf5f4bb
parent0a4cf2c8786219b4871c37240ab9787a61d843ee
parent12de512ae1d6d150f95b7157cb3293ef7545676d
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Update defconfig.
  Revert "sparc: correct section of current_pc()"