diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 19:45:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 19:45:29 +0200 |
| commit | ea98af133f8dac1aa4ec093f69e1165a5db2d1ad (patch) | |
| tree | 19e104c66878c8de139a7445daa64b24ede7e6b3 /arch/s390/include/asm/airq.h | |
| parent | Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls (diff) | |
| download | linux-ea98af133f8dac1aa4ec093f69e1165a5db2d1ad.tar.xz linux-ea98af133f8dac1aa4ec093f69e1165a5db2d1ad.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:
- Kill harmless warning messages when running a multi-platform kernel
on Atari
- Correct virt/phys mixups that didn't actually hurt due to identity
mappings"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls
m68k: Ignore disabled HSYNC interrupt on Atari for irqs_disabled()
Diffstat (limited to 'arch/s390/include/asm/airq.h')
0 files changed, 0 insertions, 0 deletions