diff options
| author | Linus Torvalds <[email protected]> | 2012-04-03 17:07:13 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-04-03 17:07:13 +0000 |
| commit | 1e649afde3708012daf43ff91730595e30e6f3bb (patch) | |
| tree | 3b3a9e873621e7729cc64f36465ffa3cf116c11c /lib/mpi/mpi-scan.c | |
| parent | Merge branch 'drm-prime-dmabuf-initial' of git://people.freedesktop.org/~airl... (diff) | |
| parent | m68k/q40: Add missing platform check before registering platform devices (diff) | |
| download | kernel-1e649afde3708012daf43ff91730595e30e6f3bb.tar.gz kernel-1e649afde3708012daf43ff91730595e30e6f3bb.zip | |
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 'lib/mpi/mpi-scan.c')
0 files changed, 0 insertions, 0 deletions