From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Aug 2010 17:10:13 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.36-rc3~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7c55368c7c8749aa9326c29a50e79a4eba5d26;p=pandora-kernel.git

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.
---

1a7c55368c7c8749aa9326c29a50e79a4eba5d26