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>
	Mon, 8 Oct 2012 01:21:52 +0000 (12:21 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 01:21:52 +0000 (12:21 +1100)
commit	505ac96c4efe681ba470a70c6df0d38516e6b701
tree	c059411886491c4e0b2d2904f9b09ffc9d2dac5b	tree \| snapshot
parent	8e3f0f71f9cce4075fc34a364353a31766c92c1d	commit \| diff
parent	ebe9f7b02590d870506ef493483fe4abdb08e967	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

31 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-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/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/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/ps3fb.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-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/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/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/ps3fb.c	diff1 \|	diff2 \|	blob \| history