]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 4 Jun 2014 07:39:30 +0000 (17:39 +1000)]
Merge branch 'akpm-current/current'
Conflicts:
arch/arm/include/asm/Kbuild
arch/powerpc/include/asm/topology.h
fs/ext4/page-io.c
fs/jfs/super.c
kernel/kexec.c
mm/memcontrol.c
Stephen Rothwell [Wed, 4 Jun 2014 07:19:01 +0000 (17:19 +1000)]
Merge branch 'rd-docs/master'
Stephen Rothwell [Wed, 4 Jun 2014 07:17:29 +0000 (17:17 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 07:16:09 +0000 (17:16 +1000)]
Merge remote-tracking branch 'aio/master'
Stephen Rothwell [Wed, 4 Jun 2014 07:14:35 +0000 (17:14 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 4 Jun 2014 07:13:16 +0000 (17:13 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
drivers/mmc/host/Kconfig
drivers/mmc/host/Makefile
Stephen Rothwell [Wed, 4 Jun 2014 07:01:50 +0000 (17:01 +1000)]
Merge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:52:23 +0000 (16:52 +1000)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/dcache.c
fs/namei.c
fs/namespace.c
Stephen Rothwell [Wed, 4 Jun 2014 06:50:44 +0000 (16:50 +1000)]
Merge remote-tracking branch 'dma-buf/for-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem_dmabuf.c
drivers/staging/android/sync.c
Stephen Rothwell [Wed, 4 Jun 2014 06:49:27 +0000 (16:49 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Conflicts:
drivers/leds/leds-pwm.c
Stephen Rothwell [Wed, 4 Jun 2014 06:48:23 +0000 (16:48 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:45:57 +0000 (16:45 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Conflicts:
drivers/scsi/qla2xxx/qla_target.c
drivers/scsi/virtio_scsi.c
Stephen Rothwell [Wed, 4 Jun 2014 06:44:00 +0000 (16:44 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:37:55 +0000 (16:37 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
mm/memcontrol.c
Stephen Rothwell [Wed, 4 Jun 2014 06:36:29 +0000 (16:36 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:35:35 +0000 (16:35 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:35:25 +0000 (16:35 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:24:20 +0000 (16:24 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:13:13 +0000 (16:13 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:10:37 +0000 (16:10 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
include/uapi/linux/kvm.h
Stephen Rothwell [Wed, 4 Jun 2014 06:09:26 +0000 (16:09 +1000)]
Merge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Wed, 4 Jun 2014 06:08:05 +0000 (16:08 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:05:27 +0000 (16:05 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:05:23 +0000 (16:05 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 06:01:35 +0000 (16:01 +1000)]
Revert "sched_clock: Remove deprecated setup_sched_clock() API"
This reverts commit
c04ae71c9c264312a6f57d2665a79f7bbccf8758.
Stephen Rothwell [Wed, 4 Jun 2014 05:19:06 +0000 (15:19 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/arm/boot/dts/vf610.dtsi
arch/arm64/mm/mmu.c
Stephen Rothwell [Wed, 4 Jun 2014 05:08:58 +0000 (15:08 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 04:57:49 +0000 (14:57 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
arch/arm/mach-vexpress/platsmp.c
Stephen Rothwell [Wed, 4 Jun 2014 04:56:04 +0000 (14:56 +1000)]
Merge remote-tracking branch 'audit/master'
Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c
Stephen Rothwell [Wed, 4 Jun 2014 04:54:16 +0000 (14:54 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Stephen Rothwell [Wed, 4 Jun 2014 04:53:16 +0000 (14:53 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 04:52:22 +0000 (14:52 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Wed, 4 Jun 2014 04:51:11 +0000 (14:51 +1000)]
Merge remote-tracking branch 'iommu/next'
Conflicts:
drivers/iommu/exynos-iommu.c
Stephen Rothwell [Wed, 4 Jun 2014 04:40:50 +0000 (14:40 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 4 Jun 2014 04:39:37 +0000 (14:39 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Wed, 4 Jun 2014 04:29:46 +0000 (14:29 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 4 Jun 2014 04:28:22 +0000 (14:28 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 04:26:28 +0000 (14:26 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
arch/arm/boot/dts/am437x-gp-evm.dts
Stephen Rothwell [Wed, 4 Jun 2014 04:24:58 +0000 (14:24 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Conflicts:
drivers/mmc/host/rtsx_usb_sdmmc.c
Stephen Rothwell [Wed, 4 Jun 2014 04:23:42 +0000 (14:23 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 04:22:19 +0000 (14:22 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 04:22:04 +0000 (14:22 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 4 Jun 2014 04:14:36 +0000 (14:14 +1000)]
Stephen Rothwell [Wed, 4 Jun 2014 03:50:00 +0000 (13:50 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:49:57 +0000 (13:49 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:48:45 +0000 (13:48 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 4 Jun 2014 03:47:39 +0000 (13:47 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:36:32 +0000 (13:36 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:35:27 +0000 (13:35 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:33:51 +0000 (13:33 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:32:51 +0000 (13:32 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:31:15 +0000 (13:31 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
Stephen Rothwell [Wed, 4 Jun 2014 03:30:16 +0000 (13:30 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 03:28:38 +0000 (13:28 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c
Stephen Rothwell [Wed, 4 Jun 2014 03:27:13 +0000 (13:27 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/crypto_user.c
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/crypto/caam/error.c
Stephen Rothwell [Wed, 4 Jun 2014 02:59:13 +0000 (12:59 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 4 Jun 2014 02:57:59 +0000 (12:57 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Conflicts:
drivers/net/ethernet/mellanox/mlx4/cmd.c
Stephen Rothwell [Wed, 4 Jun 2014 02:57:03 +0000 (12:57 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 4 Jun 2014 02:46:26 +0000 (12:46 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
Documentation/driver-model/devres.txt
drivers/staging/rtl8821ae/core.c
include/net/inetpeer.h
net/ipv6/output_core.c
Stephen Rothwell [Wed, 4 Jun 2014 02:45:25 +0000 (12:45 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Wed, 4 Jun 2014 02:40:02 +0000 (12:40 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 4 Jun 2014 02:39:05 +0000 (12:39 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 02:38:08 +0000 (12:38 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 4 Jun 2014 02:27:12 +0000 (12:27 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h
Stephen Rothwell [Wed, 4 Jun 2014 02:26:03 +0000 (12:26 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 02:24:40 +0000 (12:24 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 02:22:54 +0000 (12:22 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 4 Jun 2014 02:21:46 +0000 (12:21 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 02:19:51 +0000 (12:19 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 02:15:46 +0000 (12:15 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 4 Jun 2014 02:05:35 +0000 (12:05 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/ext4/file.c
fs/f2fs/file.c
fs/nfs/direct.c
fs/splice.c
Stephen Rothwell [Wed, 4 Jun 2014 02:04:14 +0000 (12:04 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:54:22 +0000 (11:54 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:53:26 +0000 (11:53 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:52:33 +0000 (11:52 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:50:56 +0000 (11:50 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:49:25 +0000 (11:49 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:47:42 +0000 (11:47 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 4 Jun 2014 01:46:48 +0000 (11:46 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:45:50 +0000 (11:45 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 4 Jun 2014 01:45:43 +0000 (11:45 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Wed, 4 Jun 2014 01:44:50 +0000 (11:44 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 4 Jun 2014 01:33:49 +0000 (11:33 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 4 Jun 2014 01:32:51 +0000 (11:32 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 4 Jun 2014 01:31:52 +0000 (11:31 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:30:54 +0000 (11:30 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 4 Jun 2014 01:29:59 +0000 (11:29 +1000)]
Merge remote-tracking branch 'uml/next'
Conflicts:
arch/um/include/asm/Kbuild
Stephen Rothwell [Wed, 4 Jun 2014 01:29:03 +0000 (11:29 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 4 Jun 2014 01:21:44 +0000 (11:21 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Conflicts:
arch/sparc/include/asm/pgtable_64.h
Stephen Rothwell [Wed, 4 Jun 2014 01:18:53 +0000 (11:18 +1000)]
Merge remote-tracking branch 'powerpc/next'
Conflicts:
arch/powerpc/include/asm/sections.h
Stephen Rothwell [Wed, 4 Jun 2014 01:17:22 +0000 (11:17 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:08:16 +0000 (11:08 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'
Conflicts:
arch/arm64/include/asm/thread_info.h
Stephen Rothwell [Wed, 4 Jun 2014 01:08:08 +0000 (11:08 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:07:03 +0000 (11:07 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 01:06:08 +0000 (11:06 +1000)]
Merge remote-tracking branch 'renesas/next'
Conflicts:
arch/arm/boot/dts/r8a7790-lager.dts
Stephen Rothwell [Wed, 4 Jun 2014 01:00:29 +0000 (11:00 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 00:59:22 +0000 (10:59 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 00:59:14 +0000 (10:59 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 4 Jun 2014 00:59:11 +0000 (10:59 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Wed, 4 Jun 2014 00:58:16 +0000 (10:58 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/boot/dts/r8a7790-lager.dts
include/dt-bindings/pinctrl/omap.h
projects / karo-tx-linux.git / log