Arnd Bergmann
df80442d1e
Merge branch 'depends/rmk/memory_h' into next/cleanup2
...
Theis resolves lots of simple conflicts between the omap
cleanup and the mach/memory.h removal series.
Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 13:47:27 +01:00
..
2011-07-02 10:56:11 +01:00
2011-07-02 10:56:11 +01:00
2011-07-02 10:56:11 +01:00
2011-07-02 10:56:11 +01:00
2011-07-02 10:56:11 +01:00
2011-07-02 10:56:11 +01:00
2011-07-02 10:56:12 +01:00
2011-09-10 23:39:56 +01:00
2011-07-02 10:56:11 +01:00
2011-08-09 08:42:39 +01:00
2011-07-07 15:31:05 +01:00
2010-12-19 12:57:16 -05:00
2011-09-07 00:48:03 +01:00
2009-11-27 15:43:21 -05:00
2011-07-07 15:31:05 +01:00
2011-07-07 15:31:06 +01:00
2011-07-07 15:31:06 +01:00
2011-07-07 15:31:06 +01:00
2011-07-07 15:31:06 +01:00
2011-09-17 12:47:17 +01:00
2010-12-19 12:57:08 -05:00
2011-06-09 10:13:16 +01:00
2010-04-27 12:45:10 +02:00
2010-06-08 19:42:18 +01:00
2009-10-05 15:17:45 +01:00
2010-09-19 12:17:43 +01:00
2010-06-08 19:42:18 +01:00
2010-06-08 19:42:18 +01:00
2011-07-08 19:46:37 +01:00
2010-06-08 19:42:18 +01:00
2010-09-19 12:17:43 +01:00
2011-11-01 13:47:27 +01:00
2008-09-06 11:35:55 +01:00
2011-02-21 19:24:14 +00:00
2011-07-24 10:20:54 -07:00
2006-09-27 16:13:48 +01:00
2011-05-23 19:27:40 +01:00
2010-12-19 12:56:46 -05:00
2011-02-21 19:24:14 +00:00
2011-11-01 13:47:27 +01:00
2011-07-12 11:19:29 -05:00
2010-12-24 09:49:52 +00:00
2011-07-26 17:41:04 -07:00
2011-02-02 21:23:26 +00:00
2011-07-12 11:08:12 +01:00
2011-04-14 09:15:24 +01:00
2011-07-05 20:27:16 +01:00
2011-07-05 20:27:16 +01:00
2011-07-02 10:56:10 +01:00
2011-07-02 10:56:10 +01:00
2011-07-02 10:56:10 +01:00
2011-03-20 09:32:12 +00:00
2011-07-22 23:09:07 +01:00
2011-07-07 15:31:08 +01:00
2011-07-07 15:31:09 +01:00
2011-07-07 15:31:07 +01:00
2011-07-07 15:31:08 +01:00
2011-08-28 10:39:54 +01:00
2011-07-07 15:31:08 +01:00
2011-07-07 15:31:09 +01:00
2011-08-28 10:39:54 +01:00
2011-07-07 15:31:09 +01:00
2011-08-09 08:42:38 +01:00
2011-07-07 15:31:07 +01:00
2011-07-07 15:31:07 +01:00
2011-07-07 15:31:07 +01:00
2011-07-07 15:31:07 +01:00
2011-07-07 15:31:09 +01:00
2011-07-07 15:31:10 +01:00
2011-07-21 17:49:54 +01:00
2011-07-07 15:31:10 +01:00
2011-07-07 15:31:10 +01:00
2011-08-28 10:39:53 +01:00
2009-12-14 14:53:22 +00:00
2011-08-15 11:58:59 +01:00
2011-08-28 10:39:54 +01:00
2011-08-28 10:39:53 +01:00
2011-07-21 17:49:54 +01:00
2011-07-22 23:09:07 +01:00
2011-07-07 15:31:11 +01:00
2011-07-07 15:31:12 +01:00
2011-07-07 15:31:12 +01:00
2011-07-07 15:31:12 +01:00
2011-07-22 23:09:07 +01:00
2011-07-22 23:09:07 +01:00
2011-02-23 17:24:11 +00:00
2010-07-27 10:43:48 +01:00