From: Linus Torvalds Date: Thu, 15 Apr 2010 01:44:00 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d471a4b9f2ac327c15300ba2b2bda2c6d6fd03bc;p=linux-beck.git 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 --- d471a4b9f2ac327c15300ba2b2bda2c6d6fd03bc