tree be7d1431af7741295e729ce25d376294cc7dead3
parent 5b1d07ed0e5b2707f786957c7a40eb2f399c84a8
parent ed247e12fe5da4417602c3c0ce22932fb0f9cac1
author Linus Torvalds <torvalds@linux-foundation.org> 1239892848 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239892848 -0700

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.