From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Nov 2015 00:36:10 +0000 (-0800)
Subject: Merge tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan... 
X-Git-Tag: firefly_0821_release~176^2~749
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4d68930a88219ffda60f137dcc858e4f5db6680;p=firefly-linux-kernel-4.4.55.git

Merge tag 'nios2-v4.4-rc1' of git://git./linux/kernel/git/lftan/nios2

Pull nios2 updates from Ley Foon Tan:

 - nios2: Remove unnecessary #ifdef guards
 - nios2: Switch to generic __xchg()
 - nios2: Fix unused variable warning

* tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: Remove unnecessary #ifdef guards
  nios2: Switch to generic __xchg()
  nios2: Fix unused variable warning
---

f4d68930a88219ffda60f137dcc858e4f5db6680