Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 17:10:13 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 17:10:13 +0000 (10:10 -0700)
commit1a7c55368c7c8749aa9326c29a50e79a4eba5d26
treeabbbfe79f7362a2f2d2fa478c57f943514338ae2
parentbd45fe539f0e26ff8d76b4cb954195ab8a6467af
parent25edd6946a1d74e5e77813c2324a0908c68bcf9e
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Get rid of indirect p1275 PROM call buffer.
  sparc64: Fill a missing delay slot.
  sparc64: Make lock backoff really a NOP on UP builds.
  sparc64: simple microoptimizations for atomic functions
  sparc64: Make rwsems 64-bit.
  sparc64: Really fix atomic64_t interface types.