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
2012-01-09 17:06:36 +00:00
2012-01-05 13:24:33 +00:00
2012-01-09 17:06:36 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2011-12-12 16:07:35 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-09 16:01:00 +00:00
2012-01-07 11:51:28 +00:00
2011-11-26 19:21:29 -05:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-09 17:06:36 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2011-09-26 10:11:25 -04:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 20:23:00 +00:00
2012-01-07 11:51:28 +00:00
2012-01-05 12:57:15 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-09 17:06:36 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 20:23:00 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-09 17:06:36 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-09 17:06:36 +00:00
2012-01-07 12:42:17 +00:00
2012-01-07 12:42:17 +00:00
2012-01-09 16:01:00 +00:00
2012-01-09 17:06:36 +00:00
2012-01-05 12:57:18 +00:00
2012-01-09 16:01:00 +00:00
2012-01-09 16:01:00 +00:00
2012-01-09 16:01:00 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-09 17:06:36 +00:00
2012-01-07 20:23:00 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2011-11-26 19:21:29 -05:00
2012-01-07 11:51:28 +00:00
2012-01-07 11:51:28 +00:00
2012-01-05 13:24:33 +00:00
2011-12-13 08:52:02 +00:00
2011-12-23 11:58:34 +01:00
2012-01-07 11:51:28 +00:00
2012-01-09 17:06:36 +00:00
2011-12-18 23:00:26 +00:00
2012-01-09 17:06:36 +00:00
2012-01-05 13:24:33 +00:00
2011-11-07 09:11:16 -08:00
2012-01-09 16:01:00 +00:00
2012-01-07 11:51:28 +00:00
2012-01-09 17:06:36 +00:00
2012-01-07 11:51:28 +00:00
2011-12-18 23:00:26 +00:00
2011-12-23 22:58:10 +00:00
2011-10-31 19:30:48 -04:00
2012-01-07 20:23:00 +00:00
2011-03-31 11:26:23 -03:00
2011-12-01 12:34:21 +00:00
2012-01-05 13:33:59 +01:00
421b759b86