tree 96d38bbbfc6dc78eaa370eca0fad6472660ebd12
parent 4e310fda91cb095915395f811d10b2c900c9589e
parent b560177f3e1c6b2d75b220d41ae72636243475c4
author Linus Torvalds <torvalds@linux-foundation.org> 1271295840 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271295840 -0700

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