Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2010-04-14 18:44:00 -07:00

parent 4e310fda91 b560177f3e

commit d471a4b9f2

2 changed files with 7 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

arch/m68k/include/asm/atomic_mm.h

View file

4

arch/m68k/include/asm/sigcontext.h

View file