Merge branch 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/linux...
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 20:23:35 +0000 (13:23 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 20:23:35 +0000 (13:23 -0700)
commitfb6f3d69af95006c0518be7fbcd73bff555c837d
treeb4d054de7d79ba3c0690ead046135ba9b3a2604f
parent80868a36913e11cfcd06764699b4284d34be0e59
parentf98a4e2e8d50fe4b5ca6e8adac7e3161a47d29da
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