Tony Lindgren 79ab266433 OMAP AM33xx clock data ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJP8/8TAAoJEMePsQ0LvSpLoI0P/iPxpjn1NOrVOOF2sDSZJyz6 XR0oUxf4iMpqYGxMcs0J3qxcNj3cSNy8nwyGL1H9YSvLHPwzHaL3OIgJC9HIQCAB Uxgh6VM+CNUSZsxjZ1ad4OIJ1D/HFEnIGEeqFf6oAgLsIdRBmK1lHHqEe+ThfvjG an6dKVcUIoHN1t4knmOwWrMFEPfmbazW6XSK/xayVycbV0n2mcM7ctRf9V4eZvHs Sw7MWHUDS8qryUUUKOKAwOXjVxnrNEIVqYjM2SeFM7g7T4tackuHlY+0ZhOqRv+a do/5iUX3jtTGJqG1Aphuq2w6Wq1J9GCeOM5qAWOaWPMXPNHpZOiCFtdLRbyZTngM 34npMVBwLECrs+utgUXiEB8xip3pgpY3JVaDo+n4fz0EN5vfH4s9j/oCstyLzEXE rCgXEdA/6MzKoz1MsbDfFzYWyxleZhR6CR/74smnIjbjlDTJz4CPfyTM9itMEQ3V bkpZPjYpIBUgN9VnBg1zbvCALxWUAMiSL4n2lomElpEZZpZ4H24AFPDjF0q/R4Hy OLx5fujKJKULDSNzkUHHMyc7m4VsxrQkOe7Vlyi2lCF4UrKrlSphbVNLP4ajoeJ/ I2m727MKDtdATS2maMpsvs87DT3mzLOJcisnHUw2BcDX4BwOVzxBImG/yX6afByY HVmYF24WdWAehODEn5jO =artU -----END PGP SIGNATURE----- Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data OMAP AM33xx clock data Conflicts: arch/arm/mach-omap2/Makefile		2012-07-05 08:18:04 -07:00
..
include/plat	OMAP AM33xx clock data	2012-07-05 08:18:04 -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-pm-noop.c	ARM: OMAP: omap_device: remove omap_device_parent	2012-03-05 15:38:02 -08:00
omap_device.c	ARM: OMAP2+: clean up some cppcheck warnings	2012-04-17 15:50:47 -06:00
sram.c	ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx	2012-07-05 08:05:15 -07:00
sram.h