From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 May 2016 23:50:38 +0000 (-0700)
Subject: Merge tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ce6a01c2d50e1d400cb6d492841f9b1932034fc2;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'metag-for-v4.7' of git://git./linux/kernel/git/jhogan/metag

Pull metag architecture updates from James Hogan:
 "Three minor fixes:

   - removal of stale comment
   - fix build for Meta1 when perf events are enabled
   - fix inline asm constraint in atomics"

* tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: Fix atomic_*_return inline asm constraints
  metag: perf: fix build on Meta1
  metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init
---

ce6a01c2d50e1d400cb6d492841f9b1932034fc2