Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Oct 2014 09:37:24 +0000 (05:37 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Oct 2014 09:37:24 +0000 (05:37 -0400)
Pull S+core updates from Lennox Wu:
 "Three of the patches are for building allmodconfig, and the others are
  for removing useless flags"

* tag 'for-linus-20141006' of git://github.com/sctscore/linux-off:
  score: Remove GENERIC_HAS_IOMAP
  arch/score/include/asm/Kbuild: Add generic "serial.h"
  score: remove deprecated IRQF_DISABLED
  arch/score/mm/cache.c: Export 'flush_icache_range'
  arch: score: Export necessary symbols in related files


Trivial merge