From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 16:30:27 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: v3.6-rc1~128
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=90e66dd93d53f346e6f652f6eb6512f576917ee7;p=~emulex%2Finfiniband.git

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull C6X changes from Mark Salter:

  - remove use of legacy irqs which really wasn't needed
  - add support for C66x SoC on EVMC6678 board
  - clean up compiler warning

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  C6X: clean up compiler warning
  C6X: add basic support for TMS320C6678 SoC
  C6X: remove dependence on legacy IRQs
  C6X: remove megamod-pic requirement on direct-mapped core pic
---

90e66dd93d53f346e6f652f6eb6512f576917ee7