Merge tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2015 00:36:10 +0000 (16:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2015 00:36:10 +0000 (16:36 -0800)
commitf4d68930a88219ffda60f137dcc858e4f5db6680
tree024c8ae8d288a858b6b1c58ae8c1ef7dcfa481f8
parent3510ca19a82ba4c6a17af79c1f0448622a406efa
parentbb3fc5ddef93836a36a39308cf7eca82ef0a1c4c
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