]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 6 May 2014 05:34:39 +0000 (15:34 +1000)]
Merge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:22:50 +0000 (15:22 +1000)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/dcache.c
fs/namei.c
fs/namespace.c
Stephen Rothwell [Tue, 6 May 2014 05:21:49 +0000 (15:21 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:20:18 +0000 (15:20 +1000)]
Merge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:19:02 +0000 (15:19 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:18:51 +0000 (15:18 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:12:54 +0000 (15:12 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:11:55 +0000 (15:11 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 6 May 2014 05:02:11 +0000 (15:02 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/iio/adc/Kconfig
Stephen Rothwell [Tue, 6 May 2014 05:01:11 +0000 (15:01 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
Stephen Rothwell [Tue, 6 May 2014 04:53:40 +0000 (14:53 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 6 May 2014 04:51:59 +0000 (14:51 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
arch/arm64/kernel/early_printk.c
Stephen Rothwell [Tue, 6 May 2014 04:40:35 +0000 (14:40 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 6 May 2014 04:39:42 +0000 (14:39 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:38:50 +0000 (14:38 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:37:28 +0000 (14:37 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:37:21 +0000 (14:37 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Tue, 6 May 2014 04:36:03 +0000 (14:36 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:25:09 +0000 (14:25 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:24:15 +0000 (14:24 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Tue, 6 May 2014 04:23:04 +0000 (14:23 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 6 May 2014 04:12:07 +0000 (14:12 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 6 May 2014 04:10:17 +0000 (14:10 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:10:15 +0000 (14:10 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:59:12 +0000 (13:59 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
net/ipv4/tcp_output.c
Stephen Rothwell [Tue, 6 May 2014 03:58:00 +0000 (13:58 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:56:29 +0000 (13:56 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:54:45 +0000 (13:54 +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 [Tue, 6 May 2014 03:52:59 +0000 (13:52 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Stephen Rothwell [Tue, 6 May 2014 03:31:42 +0000 (13:31 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 6 May 2014 03:30:50 +0000 (13:30 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 6 May 2014 03:29:39 +0000 (13:29 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Tue, 6 May 2014 03:19:54 +0000 (13:19 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 6 May 2014 03:18:40 +0000 (13:18 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
drivers/regulator/tps65090-regulator.c
Stephen Rothwell [Tue, 6 May 2014 03:16:41 +0000 (13:16 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:15:22 +0000 (13:15 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Tue, 6 May 2014 03:14:17 +0000 (13:14 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:14:00 +0000 (13:14 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 6 May 2014 03:12:47 +0000 (13:12 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 6 May 2014 03:09:42 +0000 (13:09 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:08:43 +0000 (13:08 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 6 May 2014 03:07:39 +0000 (13:07 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 6 May 2014 02:59:29 +0000 (12:59 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 6 May 2014 02:58:25 +0000 (12:58 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:57:21 +0000 (12:57 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:56:23 +0000 (12:56 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:55:02 +0000 (12:55 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Tue, 6 May 2014 02:54:10 +0000 (12:54 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:52:37 +0000 (12:52 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Tue, 6 May 2014 02:51:37 +0000 (12:51 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
Stephen Rothwell [Tue, 6 May 2014 02:14:32 +0000 (12:14 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 6 May 2014 02:13:40 +0000 (12:13 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 6 May 2014 02:12:09 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 6 May 2014 02:01:50 +0000 (12:01 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
Stephen Rothwell [Tue, 6 May 2014 01:56:28 +0000 (11:56 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 6 May 2014 01:55:17 +0000 (11:55 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 6 May 2014 01:53:19 +0000 (11:53 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/mips/loongson/lemote-2f/clock.c
Stephen Rothwell [Tue, 6 May 2014 01:52:14 +0000 (11:52 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:50:56 +0000 (11:50 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:50:02 +0000 (11:50 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 6 May 2014 01:49:10 +0000 (11:49 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 6 May 2014 01:47:13 +0000 (11:47 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:43:17 +0000 (11:43 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 6 May 2014 01:32:50 +0000 (11:32 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/f2fs/file.c
Stephen Rothwell [Tue, 6 May 2014 01:31:31 +0000 (11:31 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:30:30 +0000 (11:30 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:29:17 +0000 (11:29 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:27:40 +0000 (11:27 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 6 May 2014 01:26:48 +0000 (11:26 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 6 May 2014 01:25:56 +0000 (11:25 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 6 May 2014 01:25:00 +0000 (11:25 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:24:56 +0000 (11:24 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 6 May 2014 01:24:04 +0000 (11:24 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 6 May 2014 01:22:55 +0000 (11:22 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 6 May 2014 01:21:58 +0000 (11:21 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 6 May 2014 01:21:02 +0000 (11:21 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:20:00 +0000 (11:20 +1000)]
Merge remote-tracking branch 'uml/next'
Conflicts:
arch/um/include/asm/Kbuild
Stephen Rothwell [Tue, 6 May 2014 01:19:05 +0000 (11:19 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 6 May 2014 01:18:11 +0000 (11:18 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Tue, 6 May 2014 01:16:52 +0000 (11:16 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 6 May 2014 01:14:06 +0000 (11:14 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 6 May 2014 01:13:09 +0000 (11:13 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:12:14 +0000 (11:12 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:11:08 +0000 (11:11 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:10:15 +0000 (11:10 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:09:13 +0000 (11:09 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 6 May 2014 01:08:07 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/mach-mvebu/Kconfig
Stephen Rothwell [Tue, 6 May 2014 01:02:38 +0000 (11:02 +1000)]
Merge remote-tracking branch 'keystone/next'
Stephen Rothwell [Tue, 6 May 2014 01:01:36 +0000 (11:01 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 6 May 2014 01:01:28 +0000 (11:01 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 6 May 2014 01:00:35 +0000 (11:00 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Tue, 6 May 2014 00:59:40 +0000 (10:59 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 6 May 2014 00:58:50 +0000 (10:58 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 6 May 2014 00:57:55 +0000 (10:57 +1000)]
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
Stephen Rothwell [Tue, 6 May 2014 00:55:51 +0000 (10:55 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 6 May 2014 00:55:02 +0000 (10:55 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 6 May 2014 00:53:42 +0000 (10:53 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Tue, 6 May 2014 00:53:36 +0000 (10:53 +1000)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Tue, 6 May 2014 00:53:35 +0000 (10:53 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 6 May 2014 00:53:32 +0000 (10:53 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
projects / karo-tx-linux.git / log