]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'scsi-drivers/drivers-for-3.16'
Stephen Rothwell [Wed, 21 May 2014 05:57:58 +0000 (15:57 +1000)]
Merge remote-tracking branch 'scsi-drivers/drivers-for-3.16'

10 years agoMerge remote-tracking branch 'scsi-core/core-for-3.16'
Stephen Rothwell [Wed, 21 May 2014 05:56:38 +0000 (15:56 +1000)]
Merge remote-tracking branch 'scsi-core/core-for-3.16'

10 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 21 May 2014 05:56:35 +0000 (15:56 +1000)]
Merge remote-tracking branch 'scsi/for-next'

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 21 May 2014 05:50:25 +0000 (15:50 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 21 May 2014 05:49:06 +0000 (15:49 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 21 May 2014 05:39:03 +0000 (15:39 +1000)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

10 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Wed, 21 May 2014 05:38:01 +0000 (15:38 +1000)]
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 21 May 2014 05:36:25 +0000 (15:36 +1000)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 21 May 2014 05:34:41 +0000 (15:34 +1000)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/arm64/kernel/early_printk.c

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 21 May 2014 05:22:28 +0000 (15:22 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 21 May 2014 05:21:20 +0000 (15:21 +1000)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Wed, 21 May 2014 05:20:03 +0000 (15:20 +1000)]
Merge remote-tracking branch 'hsi/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 21 May 2014 05:18:40 +0000 (15:18 +1000)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 21 May 2014 05:18:33 +0000 (15:18 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'

10 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 21 May 2014 05:07:20 +0000 (15:07 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

10 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 21 May 2014 04:56:10 +0000 (14:56 +1000)]
Merge remote-tracking branch 'percpu/for-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Wed, 21 May 2014 04:45:41 +0000 (14:45 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Wed, 21 May 2014 04:44:31 +0000 (14:44 +1000)]
Merge remote-tracking branch 'kvm-arm/next'

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 21 May 2014 04:43:27 +0000 (14:43 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 21 May 2014 04:32:15 +0000 (14:32 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

10 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 21 May 2014 04:29:42 +0000 (14:29 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

10 years agoMerge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Wed, 21 May 2014 04:28:44 +0000 (14:28 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 21 May 2014 04:27:42 +0000 (14:27 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 21 May 2014 04:16:26 +0000 (14:16 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/x86/kernel/ldt.c
arch/x86/vdso/vdso32-setup.c
drivers/block/mtip32xx/mtip32xx.c
kernel/sched/idle.c
net/ipv4/tcp_output.c

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:49:32 +0000 (13:49 +1000)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:47:41 +0000 (13:47 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'

10 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Wed, 21 May 2014 03:45:56 +0000 (13:45 +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

10 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:44:09 +0000 (13:44 +1000)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt

10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 21 May 2014 03:42:51 +0000 (13:42 +1000)]
Merge remote-tracking branch 'iommu/next'

10 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 21 May 2014 03:41:58 +0000 (13:41 +1000)]
Merge remote-tracking branch 'watchdog/master'

10 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Wed, 21 May 2014 03:40:46 +0000 (13:40 +1000)]
Merge remote-tracking branch 'selinux/next'

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 21 May 2014 03:30:47 +0000 (13:30 +1000)]
Merge remote-tracking branch 'security/next'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:29:31 +0000 (13:29 +1000)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:27:38 +0000 (13:27 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Wed, 21 May 2014 03:26:09 +0000 (13:26 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
drivers/mmc/host/rtsx_usb_sdmmc.c

10 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:24:58 +0000 (13:24 +1000)]
Merge remote-tracking branch 'md/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 21 May 2014 03:24:40 +0000 (13:24 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Wed, 21 May 2014 03:23:44 +0000 (13:23 +1000)]
Merge remote-tracking branch 'mmc-uh/next'

10 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 21 May 2014 03:22:29 +0000 (13:22 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:21:01 +0000 (13:21 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 21 May 2014 03:11:23 +0000 (13:11 +1000)]
Merge remote-tracking branch 'block/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 21 May 2014 03:10:18 +0000 (13:10 +1000)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 21 May 2014 03:09:13 +0000 (13:09 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 21 May 2014 02:58:06 +0000 (12:58 +1000)]
Merge remote-tracking branch 'modules/modules-next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 21 May 2014 02:56:52 +0000 (12:56 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 21 May 2014 02:55:48 +0000 (12:55 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Wed, 21 May 2014 02:54:50 +0000 (12:54 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Wed, 21 May 2014 02:53:29 +0000 (12:53 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

10 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Wed, 21 May 2014 02:52:32 +0000 (12:52 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 21 May 2014 02:50:56 +0000 (12:50 +1000)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 21 May 2014 02:49:55 +0000 (12:49 +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

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 21 May 2014 02:13:54 +0000 (12:13 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 21 May 2014 02:12:59 +0000 (12:12 +1000)]
Merge remote-tracking branch 'infiniband/for-next'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 21 May 2014 02:11:43 +0000 (12:11 +1000)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
drivers/bluetooth/btusb.c

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 21 May 2014 02:10:15 +0000 (12:10 +1000)]
Merge remote-tracking branch 'wireless-next/master'

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Wed, 21 May 2014 02:08:47 +0000 (12:08 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 21 May 2014 01:50:52 +0000 (11:50 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c

10 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Wed, 21 May 2014 01:45:24 +0000 (11:45 +1000)]
Merge remote-tracking branch 'dmaengine/next'

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 21 May 2014 01:44:13 +0000 (11:44 +1000)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 21 May 2014 01:43:17 +0000 (11:43 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

10 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 21 May 2014 01:42:21 +0000 (11:42 +1000)]
Merge remote-tracking branch 'thermal/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 21 May 2014 01:31:19 +0000 (11:31 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/mips/loongson/lemote-2f/clock.c
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 21 May 2014 01:30:10 +0000 (11:30 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 21 May 2014 01:28:48 +0000 (11:28 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 21 May 2014 01:27:03 +0000 (11:27 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 21 May 2014 01:26:11 +0000 (11:26 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 21 May 2014 01:25:12 +0000 (11:25 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 21 May 2014 01:23:18 +0000 (11:23 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 21 May 2014 01:19:17 +0000 (11:19 +1000)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 21 May 2014 01:08:59 +0000 (11:08 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/cifs/cifsfs.c
fs/f2fs/file.c

10 years agoMerge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Wed, 21 May 2014 01:07:38 +0000 (11:07 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 21 May 2014 00:57:40 +0000 (10:57 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 21 May 2014 00:56:47 +0000 (10:56 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 21 May 2014 00:55:35 +0000 (10:55 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 21 May 2014 00:54:31 +0000 (10:54 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 21 May 2014 00:52:52 +0000 (10:52 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 21 May 2014 00:51:59 +0000 (10:51 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 21 May 2014 00:51:02 +0000 (10:51 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Wed, 21 May 2014 00:50:56 +0000 (10:50 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 21 May 2014 00:50:03 +0000 (10:50 +1000)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 21 May 2014 00:38:58 +0000 (10:38 +1000)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 21 May 2014 00:38:01 +0000 (10:38 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 21 May 2014 00:37:03 +0000 (10:37 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 21 May 2014 00:36:05 +0000 (10:36 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

10 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Wed, 21 May 2014 00:35:11 +0000 (10:35 +1000)]
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

10 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 21 May 2014 00:34:15 +0000 (10:34 +1000)]
Merge remote-tracking branch 'tile/master'

10 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Wed, 21 May 2014 00:26:50 +0000 (10:26 +1000)]
Merge remote-tracking branch 'sparc-next/master'

Conflicts:
arch/sparc/include/asm/pgtable_64.h

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 21 May 2014 00:25:29 +0000 (10:25 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'fsl/next'
Stephen Rothwell [Wed, 21 May 2014 00:24:35 +0000 (10:24 +1000)]
Merge remote-tracking branch 'fsl/next'

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 21 May 2014 00:21:51 +0000 (10:21 +1000)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/kernel/exceptions-64s.S

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 21 May 2014 00:20:52 +0000 (10:20 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 21 May 2014 00:19:56 +0000 (10:19 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Wed, 21 May 2014 00:18:40 +0000 (10:18 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 21 May 2014 00:17:44 +0000 (10:17 +1000)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 21 May 2014 00:16:51 +0000 (10:16 +1000)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 21 May 2014 00:15:35 +0000 (10:15 +1000)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 21 May 2014 00:14:29 +0000 (10:14 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

10 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Wed, 21 May 2014 00:04:08 +0000 (10:04 +1000)]
Merge remote-tracking branch 'keystone/next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 21 May 2014 00:03:05 +0000 (10:03 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 21 May 2014 00:02:57 +0000 (10:02 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'