Merge tag 'omap-for-v3.11/gpmc-part2-signed' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 19:40:15 +0000 (21:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 19:40:15 +0000 (21:40 +0200)
commit8fe14e5a74d3f45589c83c06ed63b5c8a376a824
treec8e30fcbc8145a09960ead3ccc17fea5aacebe05
parent30d2266c685ce9f560e5023e4add58f890554a46
parentb536dd412b4364df2f9495c6550ee38f6ad3b0fe
Merge tag 'omap-for-v3.11/gpmc-part2-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/drivers

From Tony Lindgren:

GPMC suspend patch that was left out of the earlier
omap-for-v3.11/gpmc-signed branch because of a compile error
it caused. The compile error is fixed in this version.

* tag 'omap-for-v3.11/gpmc-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: gpmc: Low power transition support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>