From: Olof Johansson <olof@lixom.net>
Date: Fri, 19 Apr 2013 18:50:32 +0000 (-0700)
Subject: Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
X-Git-Tag: v3.10-rc1~62^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=61b464aef0e306f141dbc0bb3f9c58049a987a7e;p=linux.git

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>
---

61b464aef0e306f141dbc0bb3f9c58049a987a7e