From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Mar 2014 17:52:46 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: firefly_0821_release~176^2~4329
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=314814017c3525b7f4796056f779f3e67e08d396;p=firefly-linux-kernel-4.4.55.git

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

Pull c6x build fix from Mark Salter:
 "Build fix for c6x"

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: fix build failure caused by cache.h
---

314814017c3525b7f4796056f779f3e67e08d396