commit | 8fa3b6f9392bf6d90cb7b908e07bd90166639f0a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 12 09:06:38 2016 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 12 09:06:38 2016 -0800 |
tree | 944fc71566177a9451e5413809945e7c0bdcc7d9 | |
parent | 56e9461a496488a73c54e550e1614068957267f8 [diff] | |
parent | 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 [diff] |
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