Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/plat-omap
History
Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers 
Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 22:42:24 +00:00
..
include/plat Merge branch 'next/fixes-non-critical' into next/drivers 2012-03-20 22:42:24 +00:00
clock.c ARM: OMAP: clock.c: included linux/debugfs.h twice 2012-03-05 16:11:03 -08:00
common.c ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback 2012-02-14 11:42:42 -08:00
counter_32k.c ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00: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 ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
devices.c ARM: Add arm_memblock_steal() to allocate memory away from the kernel 2012-01-13 15:02:35 +00:00
dma.c ARM: OMAP: Fix devexit for dma when CONFIG_HOTPLUG is not set 2012-02-24 08:24:46 -08:00
dmtimer.c ARM: OMAP: dmtimer: fix missing content/correction in low-power mode support 2012-03-05 16:11:00 -08:00
fb.c
fb.h
i2c.c ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success 2011-11-04 17:41:07 -07:00
Kconfig ARM: GIC: Make MULTI_IRQ_HANDLER mandatory 2011-11-15 18:14:02 +00:00
mailbox.c ARM: OMAP: mailbox: trivial whitespace fix 2012-03-05 16:11:03 -08:00
Makefile ARM: OMAP: am33xx: Update common OMAP machine specific sources 2011-12-13 10:46:43 -08:00
mcbsp.c ARM: OMAP: mcbsp: Start generalize signal muxing functions 2011-09-26 17:49:07 -07:00
mux.c
ocpi.c
omap-pm-noop.c ARM: OMAP: change get_context_loss_count ret value to int 2011-11-04 17:41:07 -07:00
omap_device.c ARM: OMAP: convert omap_device_build() and callers to __init 2012-02-24 13:04:10 -08:00
sram.c ARM: OMAP: sram: Add am33xx SRAM support (minimal) 2012-03-05 16:11:01 -08:00
sram.h
usb.c