| commit | 3307f19f634dfb134b370c59a778fdb2d574c17b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 16 07:40:48 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 16 07:40:48 2009 -0700 |
| tree | be7d1431af7741295e729ce25d376294cc7dead3 | |
| parent | 5b1d07ed0e5b2707f786957c7a40eb2f399c84a8 [diff] | |
| parent | ed247e12fe5da4417602c3c0ce22932fb0f9cac1 [diff] |
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.