Arnd Bergmann
1220547bfd
Merge branch 'depends/omap/gpio/runtime-pm-cleanup' into next/cleanup
...
Conflicts:
arch/arm/mach-omap1/gpio16xx.c
drivers/gpio/gpio-omap.c
Merge in the runtime-pm-cleanup branch from the gpio tree into
next/cleanup, this resolves a nonobvious merge conflict between
the two branches. Both branches move parts of the gpio-omap
driver into platform code, this takes the superset of both
changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-02 13:05:00 +00:00
..
2012-01-04 11:37:42 -07:00
2011-10-31 19:31:47 -04:00
2011-07-28 16:19:23 -06:00
2012-01-02 00:26:06 -07:00
2011-12-12 13:40:16 -07:00
2011-12-12 13:40:16 -07:00
2012-01-02 00:26:06 -07:00
2012-01-07 12:15:36 -08:00
2011-09-05 11:26:34 +01:00
2011-10-31 19:31:47 -04:00
2012-01-02 00:26:06 -07:00
2012-01-02 00:26:06 -07:00
2011-08-22 09:12:54 +01:00
2011-10-06 04:14:52 -06:00
2012-01-22 12:31:04 -07:00
2011-10-31 19:31:47 -04:00
2011-10-31 19:31:47 -04:00
2012-02-01 21:59:37 -07:00
2011-12-13 11:14:35 -07:00
2011-10-31 19:31:47 -04:00
2011-08-01 04:58:00 -07:00
2011-08-01 04:58:00 -07:00
2011-11-06 19:44:47 -08:00
2011-11-06 19:44:47 -08:00
2011-12-12 13:40:16 -07:00
2012-02-24 10:34:33 -08:00
2011-11-21 20:53:15 +01:00
2011-12-12 13:40:16 -07:00
2012-02-01 21:59:15 -07:00
2012-01-14 13:25:23 -08:00
2011-11-15 19:09:36 +08:00
2012-01-02 00:26:06 -07:00
2012-01-13 22:25:23 -07:00
2012-02-01 17:05:28 -07:00
2012-01-02 00:26:06 -07:00
2012-01-09 00:37:44 +01:00
2012-01-02 01:43:50 -07:00
2012-01-02 00:26:06 -07:00
2011-08-22 09:12:55 +01:00
2012-01-18 13:48:43 -07:00
2011-07-31 23:28:22 +02:00
2012-01-02 00:26:06 -07:00
2012-01-02 00:26:06 -07:00
2012-01-02 00:26:06 -07:00
2011-07-22 14:50:57 -07:00
2012-01-02 00:27:01 -07:00
2011-12-12 13:40:16 -07:00
2011-12-12 13:40:16 -07:00
2012-01-17 17:43:09 -07:00
2012-01-14 13:25:23 -08:00