]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:37:14 +0000 (14:37 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:37:14 +0000 (14:37 +0200)
commit372d9c718a9d47c51d6da6865f27ee735da15bef
treefb1b4fd03668a6cdbd0414eadc7dc09ccfd3f67e
parent2dc0e6b86fa9fd3aca7ef2944de763a37165ecb5
parent1e4cfed127986c32c910d5b3549c6eccf847fdf2
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
net/netfilter/xt_set.c
34 files changed:
arch/arc/kernel/kprobes.c
arch/s390/kernel/kprobes.c
drivers/base/dma-contiguous.c
drivers/clk/clk-fixed-factor.c
drivers/cpufreq/Kconfig.x86
drivers/cpufreq/exynos-cpufreq.c
drivers/dma/Kconfig
drivers/gpu/drm/drm_irq.c
drivers/input/serio/i8042.c
drivers/md/raid5.h
drivers/media/i2c/s5c73m3/s5c73m3-core.c
drivers/mfd/Kconfig
drivers/mtd/nand/docg4.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/regulator/tps65910-regulator.c
drivers/scsi/bfa/bfad.c
drivers/scsi/bnx2i/bnx2i_hwi.c
drivers/scsi/fnic/fnic_main.c
drivers/scsi/hpsa.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/qla2xxx/qla_os.c
fs/btrfs/Kconfig
include/linux/devfreq.h
include/linux/netdevice.h
include/net/bluetooth/l2cap.h
init/Kconfig
kernel/kexec.c
kernel/time/timekeeping.c
mm/Kconfig
mm/slub.c
net/netfilter/xt_set.c