]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 03:05:59 +0000 (14:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 03:05:59 +0000 (14:05 +1100)
commitfbf6af038fd9bc23faa60bae23f4252c1fff2c02
treea2f79f0013a922dc1536d65cf00d6a7ce309431d
parent9ffcd60872be24e85f77c90129ac8969b0e6097d
parent9c8f6820f0d7040db2bd669f3b3cc062c6c1a635
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
drivers/gpu/drm/qxl/Kconfig
16 files changed:
Documentation/kernel-parameters.txt
arch/arm/mach-at91/Kconfig.non_dt
arch/arm/mach-ixp4xx/common.c
arch/powerpc/platforms/powernv/opal-flash.c
arch/x86/Kconfig
drivers/char/Makefile
drivers/devfreq/exynos/exynos4_bus.c
drivers/gpu/drm/exynos/exynos_drm_gem.c
drivers/gpu/drm/exynos/exynos_drm_gem.h
drivers/gpu/drm/qxl/Kconfig
drivers/leds/leds-lp5523.c
drivers/media/platform/ti-vpe/vpdma.c
drivers/net/wan/lmc/lmc_main.c
init/Kconfig
net/core/dev.c
net/nfc/digital_dep.c