From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Apr 2009 14:40:48 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.30-rc3~79
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3307f19f634dfb134b370c59a778fdb2d574c17b;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: remove some pointless conditionals before kfree()
  sbus: changed ioctls to unlocked
  sparc: asm/atomic.h on 32bit should include asm/system.h for xchg
  sparc64: Fix smp_callin() locking.
---

3307f19f634dfb134b370c59a778fdb2d574c17b