From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Dec 2016 17:06:38 +0000 (-0800)
Subject: Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8fa3b6f9392bf6d90cb7b908e07bd90166639f0a;p=linux-beck.git

Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/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
---

8fa3b6f9392bf6d90cb7b908e07bd90166639f0a