Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
authorOlof Johansson <olof@lixom.net>
Fri, 19 Apr 2013 18:50:32 +0000 (11:50 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 19 Apr 2013 18:51:24 +0000 (11:51 -0700)
commit61b464aef0e306f141dbc0bb3f9c58049a987a7e
treee4a43e5b52f72df8e8417aa918f2fe3ea57d0071
parenta71efd61db6368629b1b3e403076c957207f79bd
parentf5fa4098c3fcc0e504fbc0682dccd331dbbcf197
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup

From Nicolas Ferre:
Little modification in SoC presentation in kernel log.
Removing of a long-standing warning in sam9263 PM code.

* tag 'at91-soc' of git://github.com/at91linux/linux-at91:
  ARM: at91: suspend both memory controllers on at91sam9263
  ARM: at91: change "Unknown" qualifier SoC subtype handling

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-at91/pm.c