From: Olof Johansson <olof@lixom.net>
Date: Mon, 26 Oct 2015 00:59:20 +0000 (+0900)
Subject: Merge branch 'next/soc' into for-next
X-Git-Tag: KARO-TX6UL-2015-11-03~148^2~23
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cbbdad31ab58170ba386685b06e71831cfefc9ba;p=karo-tx-linux.git

Merge branch 'next/soc' into for-next

* next/soc:
  ARM: mvebu: add broken-idle option
  ARM: orion5x: use mac_pton() helper
---

cbbdad31ab58170ba386685b06e71831cfefc9ba