From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2014 09:37:24 +0000 (-0400)
Subject: Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off
X-Git-Tag: v3.18-rc1~134
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8a9e838f59115e55ca206fb5f0b567d7b3540517;p=~emulex%2Finfiniband.git

Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off

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
---

8a9e838f59115e55ca206fb5f0b567d7b3540517