| commit | d471a4b9f2ac327c15300ba2b2bda2c6d6fd03bc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 14 18:44:00 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 14 18:44:00 2010 -0700 |
| tree | 96d38bbbfc6dc78eaa370eca0fad6472660ebd12 | |
| parent | 4e310fda91cb095915395f811d10b2c900c9589e [diff] | |
| parent | b560177f3e1c6b2d75b220d41ae72636243475c4 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative() m68k: Fix `struct sigcontext' for ColdFire