Olof Johansson
ae0b82504e
Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc
...
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)
ARM: shmobile: remove additional __io() macro use
ARM: mach-shmobile: default to no earlytimer
ARM: mach-shmobile: r8a7779 and Marzen timer rework
ARM: mach-shmobile: r8a7740 and Bonito timer rework
ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework
ARM: mach-shmobile: sh7377 and G4EVM timer rework
ARM: mach-shmobile: sh7367 and G3EVM timer rework
ARM: mach-shmobile: add shmobile_earlytimer_init()
ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup
ARM: mach-shmobile: Move sh7372 Mackerel external clk setup
ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()
ARM: mach-shmobile: r8a7779 L2 cache support
ARM: mach-shmobile: r8a7779 map_io and init_early update
ARM: mach-shmobile: r8a7740 map_io and init_early update
ARM: mach-shmobile: sh73a0 map_io and init_early update
ARM: mach-shmobile: sh7372 map_io and init_early update
ARM: mach-shmobile: sh7377 map_io and init_early update
ARM: mach-shmobile: sh7367 map_io and init_early update
sh: remove clk_ops
...
(includes an update to v3.3-rc7)
Conflicts:
arch/arm/mach-omap2/id.c
2012-03-13 17:38:09 -07:00
..
2012-03-10 09:51:26 -08:00
2012-01-27 14:56:24 +09:00
2012-01-27 14:56:24 +09:00
2012-03-10 09:51:26 -08:00
2012-03-10 09:51:26 -08:00
2012-01-05 12:57:10 +00:00
2012-03-09 07:04:43 -08:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-12-23 11:21:28 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 19:44:47 -08:00
2012-01-26 19:59:30 +00:00
2012-01-16 08:36:04 -06:00
2012-01-23 10:20:05 +00:00
2012-01-09 16:16:29 +00:00
2012-01-07 11:51:28 +00:00
2012-02-09 18:40:22 +09:00
2012-01-31 12:58:31 +09:00
2012-01-12 02:20:59 +09:00
2012-01-07 11:51:28 +00:00
2012-01-09 16:16:29 +00:00
2012-03-06 02:25:15 -08:00
2012-01-09 16:16:29 +00:00
2011-11-06 13:54:56 +09:00
2012-03-10 07:26:59 -08:00
2012-01-23 10:20:05 +00:00
2012-03-10 09:51:26 -08:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-11-06 13:54:56 +09:00
2011-12-26 16:42:15 +09:00
2011-12-23 11:21:28 +09:00