diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 11:40:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-08 11:40:17 +0200 |
| commit | 0223f9aaef94a09ffc0b6abcba732e62a483b88c (patch) | |
| tree | 3cf04190e2698415d6e80756c9fb4516f190c671 /drivers/macintosh/ams/ams-pmu.c | |
| parent | Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off (diff) | |
| parent | m68k: Reformat arch/m68k/mm/hwtest.c (diff) | |
| download | linux-0223f9aaef94a09ffc0b6abcba732e62a483b88c.tar.xz linux-0223f9aaef94a09ffc0b6abcba732e62a483b88c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- a fix for an intermittent crash in macsonic and hilkbd, marked for
stable,
- build fixes for uncommon configs.
Note: "m68k: AMIGA_BUILTIN_SERIAL should depend on TTY" was also
picked up by GregKH for his TTY/Serial patches tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Reformat arch/m68k/mm/hwtest.c
m68k: Disable/restore interrupts in hwreg_present()/hwreg_write()
m68k: AMIGA_BUILTIN_SERIAL should depend on TTY
m68k: Add missing ioport_unmap()
m68k/atari - stram: Add missing #include <linux/ioport.h>
Diffstat (limited to 'drivers/macintosh/ams/ams-pmu.c')
0 files changed, 0 insertions, 0 deletions