From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Aug 2012 15:10:12 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: firefly_0821_release~3680^2~2210
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9d0f8140fc8a723af4eb1ec4d757847515649574;p=firefly-linux-kernel-4.4.55.git

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

Pull C6X atomic64 support from Mark Salter:
 "Enable atomic64 ops in C6X
   - define L1_CACHE_SHIFT
   - select GENERIC_ATOMIC64"

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  C6X: select GENERIC_ATOMIC64
  C6X: add Lx_CACHE_SHIFT defines
---

9d0f8140fc8a723af4eb1ec4d757847515649574