git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 12 Oct 2012 00:58:28 +0000 (11:58 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 12 Oct 2012 00:58:28 +0000 (11:58 +1100)
commit	2d04b3e1119877b5ce7796e530d0759dceccde49
tree	6f46a1660a373ced02d412da53754c194c3c805c	tree \| snapshot
parent	f5837513efb74bcafa24493ffc8d3ff6c1fbcd9a	commit \| diff
parent	cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a	commit \| diff

Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
drivers/video/epson1355fb.c
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/displays/panel-taal.c
drivers/video/omap2/dss/dispc.c

46 files changed:

arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdk4x12.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/display.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-smdk2416.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-anw6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-hmt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-mini6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-ncp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-real6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6450.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pc100/mach-smdkc100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-goni.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_fimd.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/omap/omap_vout.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/da8xx-fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/ep93xx-fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/exynos/exynos_mipi_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/gbefb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/imxfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/jz4740_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mddi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mddi_client_nt35399.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp_hw.h	diff1 \|	diff2 \|	blob \| history
drivers/video/mx3fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/nuc900fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/displays/panel-taal.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dispc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/omapfb/omapfb-main.c	diff1 \|	diff2 \|	blob \| history
drivers/video/ps3fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/udlfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/vermilion/vermilion.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdk4x12.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/display.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-smdk2416.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-anw6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-hmt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-mini6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-ncp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-real6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6450.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pc100/mach-smdkc100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-goni.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_fimd.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/omap/omap_vout.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/da8xx-fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/ep93xx-fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/exynos/exynos_mipi_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/gbefb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/imxfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/jz4740_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mddi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mddi_client_nt35399.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp_hw.h	diff1 \|	diff2 \|	blob \| history
drivers/video/mx3fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/nuc900fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/displays/panel-taal.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dispc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/omapfb/omapfb-main.c	diff1 \|	diff2 \|	blob \| history
drivers/video/ps3fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/udlfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/vermilion/vermilion.c	diff1 \|	diff2 \|	blob \| history