]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 4 Feb 2016 21:30:44 +0000 (13:30 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 8 Feb 2016 22:00:49 +0000 (14:00 -0800)
* fixes:
  ARM: multi_v7_defconfig: enable DW_WATCHDOG
  ARM: nomadik: fix up SD/MMC DT settings


Trivial merge