| commit | edb581110d04c70a4be5723ff8862a0f523657dd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 15 19:16:01 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 15 19:16:01 2011 -0700 |
| tree | a2f6e2a95b2c9fc8e64909ee0db74b39cd61f4a4 | |
| parent | 291b63c86aea8a571ddf913d41ab5156b8314dad [diff] | |
| parent | 178a29600340bef5b13cd4157053679debe35351 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Set HAVE_C_RECORDMCOUNT sparc32: unbreak arch_write_unlock() sparc64: remove unnecessary macros from spinlock_64.h