diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-20 02:23:03 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-20 02:23:03 +0300 |
commit | 8fdd36d44205cd6bccca26246ae84d7515d10015 (patch) | |
tree | d5165bf36a4ad8a669dfce18486aba37a74771cc /arch/ia64/include/asm/io.h | |
parent | 2ad0d52699700a91660a406a4046017a2d7f246a (diff) | |
parent | 58064e1f46b174e108c11323c2b1011064fd3efe (diff) | |
download | linux-8fdd36d44205cd6bccca26246ae84d7515d10015.tar.xz |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"Only two changes.
One cleans up warnings in the ColdFire DMA code, the other stubs out
(with warnings) ColdFire clock api functions not normally used"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: Fix typos in Coldfire 5272 DMA debug code
m68k: coldfire: Normalize clk API
Diffstat (limited to 'arch/ia64/include/asm/io.h')
0 files changed, 0 insertions, 0 deletions