]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:49:20 +0000 (13:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:49:20 +0000 (13:49 +1100)
commitacea055bdf77885a91a10d6f461933f6ae1b5027
tree41ce03295bb7b0f5e113c1df7d5f7dc6316a9d3e
parent3acbacca0deff52c331c6b21bbb671ebcbd9c6c6
parent8faaaead62c3c7394fa6302303ce70e484b509ba
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
drivers/gpu/drm/qxl/Kconfig
13 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/qxl/Kconfig
drivers/media/platform/ti-vpe/vpdma.c
drivers/net/wan/lmc/lmc_main.c
init/Kconfig
net/core/dev.c
net/nfc/hci/llc_shdlc.c