Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Dec 2016 17:06:38 +0000 (09:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Dec 2016 17:06:38 +0000 (09:06 -0800)
commit8fa3b6f9392bf6d90cb7b908e07bd90166639f0a
tree944fc71566177a9451e5413809945e7c0bdcc7d9
parent56e9461a496488a73c54e550e1614068957267f8
parent8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76
Merge tag 'cris-for-4.10' of git://git./linux/kernel/git/jesper/cris

Pull CRIS updates from Jesper Nilsson:
 "Three patches for minor issues"

* tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  cris: No need to append -O2 and $(LINUXINCLUDE)
  tty: serial: make crisv10 explicitly non-modular
  cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected