Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 19 Dec 2013 14:08:03 +0000 (15:08 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 19 Dec 2013 14:08:32 +0000 (15:08 +0100)
commite23c34bb41da65f354fb7eee04300c56ee48f60c
tree549fbe449d55273b81ef104a9755109bf4ae7817
parentb481c2cb3534c85dca625973b33eba15f9af3e4c
parent319e2e3f63c348a9b66db4667efa73178e18b17d
Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply fixes on top of newer things
in tree (efi-stub).

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 files changed:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
drivers/block/Makefile
drivers/devfreq/exynos/exynos4_bus.c
drivers/gpu/drm/exynos/exynos_drm_g2d.c
drivers/gpu/drm/exynos/exynos_drm_gem.c
drivers/gpu/drm/exynos/exynos_drm_gem.h
drivers/xen/Kconfig
include/linux/tracepoint.h
init/Kconfig
net/core/dev.c
net/netfilter/ipset/Kconfig