summaryrefslogtreecommitdiff
path: root/arch/nios2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-16 16:56:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-16 16:56:42 -0700
commitfb6363e9f4eeb37323feb8253b93854195942b8b (patch)
tree556f873d92cd7af2e92d176afc16339d902b7c2c /arch/nios2
parentce6a01c2d50e1d400cb6d492841f9b1932034fc2 (diff)
parent9a6462763b170bd22be707d5d9e2b8ba8cc4028e (diff)
Merge tag 'm68k-for-v4.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: "Preparatory work for Arnd's genrtc removal series" * tag 'm68k-for-v4.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/mvme16x: Include generic <linux/rtc.h> m68k/bvme6000: Include generic <linux/rtc.h>
Diffstat (limited to 'arch/nios2')
0 files changed, 0 insertions, 0 deletions