]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 06:45:49 +0000 (17:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 06:45:49 +0000 (17:45 +1100)
commit6ed31b71ae85016e30c6a23749e6fe19f67dd039
treef12e4f84cf849d6068696e6bdfce97c17e9f041f
parentd25857de318d59b9e6c592f0c0ec34b7f40df569
parent97e81acd31de184af22b78c4977a66f40ca1efa3
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
drivers/gpu/drm/qxl/Kconfig
Documentation/kernel-parameters.txt
arch/arm/mach-at91/Kconfig.non_dt
arch/arm/mach-ixp4xx/common.c
arch/x86/Kconfig
drivers/char/Makefile
drivers/devfreq/exynos/exynos4_bus.c
drivers/gpu/drm/qxl/Kconfig
drivers/media/platform/ti-vpe/vpdma.c
init/Kconfig
net/core/dev.c