Merge tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhoga...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2016 18:11:39 +0000 (11:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2016 18:11:39 +0000 (11:11 -0700)
commite9f8f48bcac6f6dd37ad89ad63d1d1a497332313
tree543337ad6028bd0aba62be05b4068be115a9ab64
parentd8bfb96a2e3c42f91a9944a19638c043cb86dd8f
parent35d04077ad96ed33ceea2501f5a4f1eacda77218
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