diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 10:07:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 10:07:13 -0700 |
| commit | 1e649afde3708012daf43ff91730595e30e6f3bb (patch) | |
| tree | 3b3a9e873621e7729cc64f36465ffa3cf116c11c /include | |
| parent | 7d6e1cb7aed231b58acd71bdbe67fc03221373e4 (diff) | |
| parent | 450aed725c9a53282483c48ebd012feefae94a07 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"Here are a few fixes for the m68k architecture. Nothing fancy this
time, just a build fix for the asm/system.h disintegration, and two
fixes for missing platform checks (one got in during last merge
window), which can cause crashes in multi-platform kernels."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/q40: Add missing platform check before registering platform devices
m68k/mac: Add missing platform check before registering platform devices
m68k: include asm/cmpxchg.h in our m68k atomic.h
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions