diff options
author | Arnd Bergmann | 2017-07-03 16:44:57 +0200 |
---|---|---|
committer | Arnd Bergmann | 2017-07-03 16:44:57 +0200 |
commit | ac548add22a7916b3f38bd46b73bccf0ba6ca4cf (patch) | |
tree | 24241c3de5f3481512840356fe08a6f1b1047cde /include/uapi/linux/nbd.h | |
parent | Merge tag 'actions-arm64-dt-for-4.13' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | ARM64: dts: marvell: armada37xx: Fix timer interrupt specifiers (diff) | |
download | kernel-qcow2-linux-ac548add22a7916b3f38bd46b73bccf0ba6ca4cf.tar.gz kernel-qcow2-linux-ac548add22a7916b3f38bd46b73bccf0ba6ca4cf.tar.xz kernel-qcow2-linux-ac548add22a7916b3f38bd46b73bccf0ba6ca4cf.zip |
Merge tag 'mvebu-dt64-4.13-3' of git://git.infradead.org/linux-mvebu into next/dt64
Pull "late dt64 for 4.13" from Gregory CLEMENT:
It is actually a patch that missed the end of the 4.12 merge
window. The patch itself fix a bogus definition of the timer for the
Armada 37xx SoCs.
* tag 'mvebu-dt64-4.13-3' of git://git.infradead.org/linux-mvebu:
ARM64: dts: marvell: armada37xx: Fix timer interrupt specifiers
Diffstat (limited to 'include/uapi/linux/nbd.h')
0 files changed, 0 insertions, 0 deletions