]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b1d07e ed247e1)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2009 14:40:48 +0000 (07:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2009 14:40:48 +0000 (07:40 -0700)
* 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.


Trivial merge
Clone of davem's net-next-2.6 tree