Tony Lindgren 68c9a95e92 ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API ... Commit ac5b0ea3d (Merge tag 'omap-devel-f-for-3.6'...) had a merge conflict that somehow got incorrecly resolved in a lossy way for commit bed9d1bb (ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API). Fix the issue by applying the missing pieces. Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>		2012-07-06 00:58:43 -07:00
..
include/plat	ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API	2012-07-06 00:58:43 -07:00
clock.c	ARM: OMAP: PM: Lock clocks list while generating summary	2012-06-17 11:57:50 -06:00
common.c	ARM: OMAP: add includes for missing prototypes	2012-04-13 06:34:26 -06:00
counter_32k.c	arm-soc: cleanups, part 2	2012-05-26 12:31:49 -07:00
debug-devices.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
debug-leds.c	Disintegrate asm/system.h for ARM	2012-03-28 18:30:01 +01:00
devices.c	ARM: OMAP: Move omap_mmc_add() to mach-omap1	2012-05-09 16:35:12 -07:00
dma.c	ARM: OMAP: dma: Clear status registers on enable/disable irq	2012-06-03 22:50:42 -07:00
dmtimer.c	ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()	2012-07-05 02:15:55 -07:00
fb.c	ARM: OMAP2+: Fix compile error when FB_OMAP2 is not set	2012-03-09 09:53:21 +02:00
i2c.c	ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success	2011-11-04 17:41:07 -07:00
Kconfig	ARM: fix __io macro for PCMCIA	2012-04-05 11:29:55 -07:00
mailbox.c	ARM: OMAP: mailbox: trivial whitespace fix	2012-03-05 16:11:03 -08:00
Makefile	ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry	2012-07-05 08:05:14 -07:00
mux.c	Disintegrate asm/system.h for ARM	2012-03-28 18:30:01 +01:00
omap_device.c	ARM: OMAP2+: clean up some cppcheck warnings	2012-04-17 15:50:47 -06:00
omap-pm-noop.c	ARM: OMAP: omap_device: remove omap_device_parent	2012-03-05 15:38:02 -08:00
sram.c	ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx	2012-07-05 08:05:15 -07:00
sram.h	OMAP: plat-omap: Fix static function warnings	2010-10-08 10:12:38 -07:00