From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 20:23:35 +0000 (-0700)
Subject: Merge branch 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/linux... 
X-Git-Tag: firefly_0821_release~3680^2~1903^2^2~7
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fb6f3d69af95006c0518be7fbcd73bff555c837d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/linux into late/kirkwood

From Jason Cooper:

defconfig:
 - update kirkwood_defconfig via 'make oldconfig'
 - Add all Kirkwood DT boards to the defconfig
 - enable SERIAL_OF_PLATFORM and ORION_WATCHDOG in kirkwood_defconfig

* 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood: add DT boards to defconfig
  ARM: Kirkwood: update defconfig
---

fb6f3d69af95006c0518be7fbcd73bff555c837d