]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 00:59:20 +0000 (09:59 +0900)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 00:59:20 +0000 (09:59 +0900)
* next/soc:
  ARM: mvebu: add broken-idle option
  ARM: orion5x: use mac_pton() helper

1  2 
arch/arm/mach-mvebu/pmsu.c

Simple merge