Arnd Bergmann
421b759b86
Merge branch 'samsung/cleanup' into next/boards ...
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 17:06:36 +00:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-11-24 14:57:54 +00:00
2011-11-24 14:57:54 +00:00
2011-11-24 14:57:55 +00:00
2011-11-24 14:57:55 +00:00
2011-11-24 14:57:54 +00:00
2011-11-24 14:57:55 +00:00
2011-05-25 23:04:33 +08:00
2011-05-25 23:04:32 +08:00
2011-04-23 11:03:06 +08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-07-11 14:43:28 +08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-06-15 20:04:02 -07:00
2011-05-03 15:38:52 -04:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-11-06 13:54:56 +09:00
2011-11-10 15:32:27 +08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-11-10 15:32:27 +08:00
2012-01-09 17:06:36 +00:00
2011-10-17 09:13:40 +01:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-03-03 16:27:01 -05:00
2010-11-29 13:25:22 +09:00
2011-11-10 15:32:27 +08:00
2011-07-20 17:20:52 -04:00
2011-01-20 17:02:05 -08:00
2011-10-09 11:44:31 +02:00
2011-08-25 08:52:53 +02:00
2011-10-13 09:06:58 +02:00
2011-06-15 20:04:02 -07:00
2011-01-20 17:02:05 -08:00
2011-12-01 17:49:11 -08:00
2011-05-03 02:38:02 -07:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-05-20 22:27:08 +01:00
2011-05-20 22:27:08 +01:00
2011-03-12 08:05:19 +09:00
2011-03-12 08:05:19 +09:00
2011-01-20 17:02:05 -08:00
2011-05-20 22:34:25 +01:00
2011-05-20 22:34:25 +01:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-12-19 18:00:03 -08:00
2011-01-20 17:02:05 -08:00
2011-11-29 10:34:45 +01:00
2011-11-29 10:34:51 +01:00
2011-05-20 22:27:08 +01:00
2011-02-19 10:55:12 +00:00
2011-06-15 20:04:02 -07:00
2011-06-15 20:04:02 -07:00
2011-11-10 15:32:27 +08:00
421b759b86