Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Mar 2014 17:52:46 +0000 (09:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Mar 2014 17:52:46 +0000 (09:52 -0800)
commit314814017c3525b7f4796056f779f3e67e08d396
treeba4a7d939c30742e07b9c84832d794a0ff2eda52
parentc3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0
parentae72758f1dd93bd367dc7719702f24a9bfb3bad9
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