From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Nov 2015 20:59:46 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.4-rc2~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0ec7dc8d19683ae292a4866c155824b647226103;p=linux-2.6-block.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:

 - Fix a flood of annoying build warnings

 - A number of fixes for Atheros 79xx platforms

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: ath79: Add a machine entry for booting OF machines
  MIPS: ath79: Fix the size of the MISC INTC registers in ar9132.dtsi
  MIPS: ath79: Fix the DDR control initialization on ar71xx and ar934x
  MIPS: Fix flood of warnings about comparsion being always true.
---

0ec7dc8d19683ae292a4866c155824b647226103