From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Oct 2016 18:11:39 +0000 (-0700)
Subject: Merge tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhoga... 
X-Git-Tag: v4.9-rc1~25
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=e9f8f48bcac6f6dd37ad89ad63d1d1a497332313

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

Pull metag architecture fix from James Hogan:
 "A simple build fix for irqsoff atomics which has started hitting
  meta1_defconfig during the 4.9 merge window"

* tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: Only define atomic_dec_if_positive conditionally
---

e9f8f48bcac6f6dd37ad89ad63d1d1a497332313