]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 00:54:07 +0000 (09:54 +0900)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 00:54:07 +0000 (09:54 +0900)
* next/soc:
  ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned
  ARM: tegra: paz00: use con_id's to refer GPIO's in gpiod_lookup table


Trivial merge