proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-07 23:45:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
f56f52e02a
mirror_ubuntu-kernels/arch/arm/plat-omap
History
Tony Lindgren f56f52e02a Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt 
Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolved as suggested by Jon Hunter.
2012-11-09 14:54:17 -08:00
..
include Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt 2012-11-09 14:54:17 -08:00
counter_32k.c ARM: OMAP: Remove plat-omap/common.h 2012-10-31 15:37:13 -07:00
debug-devices.c ARM: OMAP: Remove unnecessary mach and plat includes 2012-11-02 12:00:36 -07:00
debug-leds.c ARM: OMAP: Fix relative includes for fpga.h 2012-10-31 15:37:14 -07:00
dma.c ARM: OMAP: Remove cpu_is_omap usage from plat-omap/dma.c 2012-10-31 15:37:13 -07:00
dmtimer.c Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt 2012-11-09 14:54:17 -08:00
fb.c ARM: OMAP: Remove unnecessary mach and plat includes 2012-11-02 12:00:36 -07:00
i2c.c ARM: OMAP: Remove unnecessary mach and plat includes 2012-11-02 12:00:36 -07:00
Kconfig ARM: OMAP2+: Fix location of select PINCTRL 2012-10-22 13:37:34 -07:00
mailbox.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
Makefile ARM: OMAP: Remove omap_init_consistent_dma_size() 2012-11-06 16:01:19 -08:00
sram.c ARM: OMAP: Move omap2+ specific parts of sram.c to mach-omap2 2012-10-31 10:14:14 -07:00