git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Tony Lindgren <tony@atomide.com>
	Fri, 21 Sep 2012 20:48:01 +0000 (13:48 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 21 Sep 2012 20:48:01 +0000 (13:48 -0700)
commit	0c9de3c52d2baed6bc2ee44885adb418152c71c4
tree	e19ab2c41ae47250fd614418022b32aa783aa563	tree \| snapshot (tar.gz zip)
parent	6bfc82ff589a00e5fbc12b958c649d703d273c86	commit \| diff
parent	3c7c5dab44d6c8861bc86dab924353d8d40344f8	commit \| diff

Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer

Conflicts:
arch/arm/mach-omap2/timer.c

12 files changed:

arch/arm/boot/dts/omap5.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock33xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap-wakeupgen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/sram.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/imx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/u_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ftdi_sio.c	diff1 \|	diff2 \|	blob \| history