]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 16 May 2014 05:09:53 +0000 (15:09 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
arch/arm64/kernel/early_printk.c
Stephen Rothwell [Fri, 16 May 2014 04:50:35 +0000 (14:50 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 16 May 2014 04:49:28 +0000 (14:49 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:48:11 +0000 (14:48 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:46:48 +0000 (14:46 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:46:41 +0000 (14:46 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Fri, 16 May 2014 04:35:32 +0000 (14:35 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:24:24 +0000 (14:24 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 16 May 2014 04:15:30 +0000 (14:15 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Fri, 16 May 2014 04:14:21 +0000 (14:14 +1000)]
Merge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Fri, 16 May 2014 04:13:18 +0000 (14:13 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 16 May 2014 04:02:08 +0000 (14:02 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:58:30 +0000 (13:58 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:47:13 +0000 (13:47 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/block/mtip32xx/mtip32xx.c
kernel/sched/idle.c
net/ipv4/tcp_output.c
Stephen Rothwell [Fri, 16 May 2014 03:46:00 +0000 (13:46 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:44:10 +0000 (13:44 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:42:26 +0000 (13:42 +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 [Fri, 16 May 2014 03:40:39 +0000 (13:40 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Stephen Rothwell [Fri, 16 May 2014 03:39:22 +0000 (13:39 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 16 May 2014 03:38:29 +0000 (13:38 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 16 May 2014 03:37:18 +0000 (13:37 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Fri, 16 May 2014 03:27:21 +0000 (13:27 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 16 May 2014 03:26:08 +0000 (13:26 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
drivers/regulator/tps65090-regulator.c
Stephen Rothwell [Fri, 16 May 2014 03:24:10 +0000 (13:24 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:22:51 +0000 (13:22 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Fri, 16 May 2014 03:21:45 +0000 (13:21 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:21:28 +0000 (13:21 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 16 May 2014 03:20:31 +0000 (13:20 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Fri, 16 May 2014 03:19:15 +0000 (13:19 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 16 May 2014 03:17:49 +0000 (13:17 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:14:55 +0000 (13:14 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 16 May 2014 03:13:49 +0000 (13:13 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 16 May 2014 03:12:42 +0000 (13:12 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 16 May 2014 03:01:36 +0000 (13:01 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 16 May 2014 03:00:18 +0000 (13:00 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:59:14 +0000 (12:59 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:58:17 +0000 (12:58 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:56:54 +0000 (12:56 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 16 May 2014 02:55:57 +0000 (12:55 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Fri, 16 May 2014 02:54:20 +0000 (12:54 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c
Stephen Rothwell [Fri, 16 May 2014 02:53:19 +0000 (12:53 +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 [Fri, 16 May 2014 02:22:50 +0000 (12:22 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 16 May 2014 02:21:30 +0000 (12:21 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
drivers/bluetooth/btusb.c
Stephen Rothwell [Fri, 16 May 2014 02:20:15 +0000 (12:20 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 16 May 2014 02:18:48 +0000 (12:18 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Fri, 16 May 2014 02:08:12 +0000 (12:08 +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
Stephen Rothwell [Fri, 16 May 2014 01:34:32 +0000 (11:34 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Fri, 16 May 2014 01:33:21 +0000 (11:33 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 16 May 2014 01:32:25 +0000 (11:32 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:31:29 +0000 (11:31 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 16 May 2014 01:29:35 +0000 (11:29 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/mips/loongson/lemote-2f/clock.c
Stephen Rothwell [Fri, 16 May 2014 01:28:26 +0000 (11:28 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:27:05 +0000 (11:27 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:25:20 +0000 (11:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 16 May 2014 01:24:27 +0000 (11:24 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 16 May 2014 01:23:29 +0000 (11:23 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:21:34 +0000 (11:21 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:17:35 +0000 (11:17 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 16 May 2014 01:07:19 +0000 (11:07 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/cifs/cifsfs.c
fs/f2fs/file.c
Stephen Rothwell [Fri, 16 May 2014 01:05:58 +0000 (11:05 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Fri, 16 May 2014 00:56:02 +0000 (10:56 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:55:09 +0000 (10:55 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 16 May 2014 00:53:57 +0000 (10:53 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 16 May 2014 00:52:53 +0000 (10:52 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 16 May 2014 00:51:12 +0000 (10:51 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 16 May 2014 00:50:19 +0000 (10:50 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 16 May 2014 00:49:22 +0000 (10:49 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 16 May 2014 00:49:16 +0000 (10:49 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 16 May 2014 00:48:23 +0000 (10:48 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 16 May 2014 00:37:21 +0000 (10:37 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 16 May 2014 00:36:23 +0000 (10:36 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 16 May 2014 00:35:25 +0000 (10:35 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:34:24 +0000 (10:34 +1000)]
Merge remote-tracking branch 'uml/next'
Conflicts:
arch/um/include/asm/Kbuild
Stephen Rothwell [Fri, 16 May 2014 00:33:29 +0000 (10:33 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 16 May 2014 00:32:37 +0000 (10:32 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 16 May 2014 00:31:16 +0000 (10:31 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 16 May 2014 00:30:22 +0000 (10:30 +1000)]
Merge remote-tracking branch 'fsl/next'
Stephen Rothwell [Fri, 16 May 2014 00:27:36 +0000 (10:27 +1000)]
Merge remote-tracking branch 'powerpc/next'
Conflicts:
arch/powerpc/kernel/exceptions-64s.S
Stephen Rothwell [Fri, 16 May 2014 00:26:42 +0000 (10:26 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:24:59 +0000 (10:24 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 16 May 2014 00:24:04 +0000 (10:24 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:23:00 +0000 (10:23 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Fri, 16 May 2014 00:22:03 +0000 (10:22 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:21:10 +0000 (10:21 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:19:55 +0000 (10:19 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Fri, 16 May 2014 00:18:49 +0000 (10:18 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/mach-mvebu/Kconfig
Stephen Rothwell [Fri, 16 May 2014 00:08:26 +0000 (10:08 +1000)]
Merge remote-tracking branch 'keystone/next'
Stephen Rothwell [Fri, 16 May 2014 00:07:24 +0000 (10:07 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:07:13 +0000 (10:07 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 16 May 2014 00:06:16 +0000 (10:06 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:05:21 +0000 (10:05 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:04:30 +0000 (10:04 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Fri, 16 May 2014 00:03:35 +0000 (10:03 +1000)]
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
Stephen Rothwell [Fri, 16 May 2014 00:01:30 +0000 (10:01 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:00:39 +0000 (10:00 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Thu, 15 May 2014 23:49:32 +0000 (09:49 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 15 May 2014 23:49:28 +0000 (09:49 +1000)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:27 +0000 (09:49 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:23 +0000 (09:49 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
projects / karo-tx-linux.git / log