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