]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:22:55 +0000 (17:22 +1000)]
Merge remote-tracking branch 'kdbus/kdbus'
Conflicts:
Documentation/Makefile
Stephen Rothwell [Thu, 9 Apr 2015 07:21:49 +0000 (17:21 +1000)]
Merge remote-tracking branch 'extcon/extcon-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:10:26 +0000 (17:10 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 9 Apr 2015 07:08:15 +0000 (17:08 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/media/mn88473/mn88473.c
Stephen Rothwell [Thu, 9 Apr 2015 07:05:43 +0000 (17:05 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Thu, 9 Apr 2015 07:01:01 +0000 (17:01 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:59:00 +0000 (16:59 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/dma/Kconfig
Stephen Rothwell [Thu, 9 Apr 2015 06:45:59 +0000 (16:45 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:44:58 +0000 (16:44 +1000)]
Merge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:42:41 +0000 (16:42 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:41:39 +0000 (16:41 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:40:14 +0000 (16:40 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:39:07 +0000 (16:39 +1000)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)]
Merge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:25:21 +0000 (16:25 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 06:15:22 +0000 (16:15 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Conflicts:
drivers/xen/Kconfig
Stephen Rothwell [Thu, 9 Apr 2015 06:02:39 +0000 (16:02 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/mips/kernel/genex.S
Stephen Rothwell [Thu, 9 Apr 2015 05:49:11 +0000 (15:49 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 9 Apr 2015 05:37:20 +0000 (15:37 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:27:37 +0000 (15:27 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Conflicts:
arch/arm/mach-exynos/suspend.c
Stephen Rothwell [Thu, 9 Apr 2015 05:26:18 +0000 (15:26 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 05:26:15 +0000 (15:26 +1000)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Conflicts:
arch/arm/mach-rockchip/Kconfig
drivers/clocksource/Kconfig
drivers/clocksource/rockchip_timer.c
Stephen Rothwell [Thu, 9 Apr 2015 05:13:12 +0000 (15:13 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
include/linux/bpf.h
include/uapi/linux/bpf.h
samples/bpf/Makefile
Stephen Rothwell [Thu, 9 Apr 2015 05:11:15 +0000 (15:11 +1000)]
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/dma/intel_mid_dma.c
drivers/dma/intel_mid_dma_regs.h
Stephen Rothwell [Thu, 9 Apr 2015 05:06:09 +0000 (15:06 +1000)]
Merge remote-tracking branch 'mailbox/mailbox-for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:58:22 +0000 (14:58 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt
Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt
Stephen Rothwell [Thu, 9 Apr 2015 04:55:32 +0000 (14:55 +1000)]
Merge remote-tracking branch 'audit/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:43:10 +0000 (14:43 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:41:52 +0000 (14:41 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:40:14 +0000 (14:40 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:38:48 +0000 (14:38 +1000)]
Merge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:37:12 +0000 (14:37 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:36:10 +0000 (14:36 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 9 Apr 2015 04:34:50 +0000 (14:34 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:34:47 +0000 (14:34 +1000)]
Merge remote-tracking branch 'integrity/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:33:28 +0000 (14:33 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
drivers/char/tpm/tpm-chip.c
Stephen Rothwell [Thu, 9 Apr 2015 04:16:13 +0000 (14:16 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:15:06 +0000 (14:15 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:13:18 +0000 (14:13 +1000)]
Merge remote-tracking branch 'battery/master'
Conflicts:
drivers/hid/wacom.h
drivers/hid/wacom_sys.c
Stephen Rothwell [Thu, 9 Apr 2015 04:12:14 +0000 (14:12 +1000)]
Merge remote-tracking branch 'backlight/for-backlight-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:10:43 +0000 (14:10 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:09:14 +0000 (14:09 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:07:57 +0000 (14:07 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:06:27 +0000 (14:06 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Thu, 9 Apr 2015 04:02:54 +0000 (14:02 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 04:00:45 +0000 (14:00 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:58:39 +0000 (13:58 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:57:38 +0000 (13:57 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:56:05 +0000 (13:56 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:53:58 +0000 (13:53 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:52:18 +0000 (13:52 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:51:16 +0000 (13:51 +1000)]
Merge remote-tracking branch 'drm-exynos/exynos-drm/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:49:53 +0000 (13:49 +1000)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Thu, 9 Apr 2015 03:47:56 +0000 (13:47 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 9 Apr 2015 03:45:12 +0000 (13:45 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Thu, 9 Apr 2015 03:44:02 +0000 (13:44 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:42:52 +0000 (13:42 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:41:39 +0000 (13:41 +1000)]
Merge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:40:35 +0000 (13:40 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 03:33:41 +0000 (13:33 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-mackerel.c
Stephen Rothwell [Thu, 9 Apr 2015 03:25:01 +0000 (13:25 +1000)]
Merge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:23:49 +0000 (13:23 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:13:06 +0000 (13:13 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 9 Apr 2015 03:00:33 +0000 (13:00 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:58:41 +0000 (12:58 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:55:18 +0000 (12:55 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 9 Apr 2015 02:54:11 +0000 (12:54 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:46:23 +0000 (12:46 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:44:16 +0000 (12:44 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:39:33 +0000 (12:39 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 9 Apr 2015 02:27:55 +0000 (12:27 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/ext4/inode.c
fs/udf/file.c
net/9p/protocol.c
Stephen Rothwell [Thu, 9 Apr 2015 02:19:48 +0000 (12:19 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 9 Apr 2015 02:08:28 +0000 (12:08 +1000)]
Merge remote-tracking branch 'file-locks/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:06:39 +0000 (12:06 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:05:30 +0000 (12:05 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:04:29 +0000 (12:04 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:03:24 +0000 (12:03 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:02:23 +0000 (12:02 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:01:20 +0000 (12:01 +1000)]
Merge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 02:01:16 +0000 (12:01 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Conflicts:
fs/fscache/object.c
Stephen Rothwell [Thu, 9 Apr 2015 01:50:26 +0000 (11:50 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 9 Apr 2015 01:49:07 +0000 (11:49 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 9 Apr 2015 01:37:46 +0000 (11:37 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 9 Apr 2015 01:36:38 +0000 (11:36 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:36:36 +0000 (11:36 +1000)]
Merge remote-tracking branch 'ceph/master'
Conflicts:
fs/ceph/inode.c
fs/ceph/snap.c
fs/ceph/super.c
fs/ceph/super.h
include/linux/ceph/libceph.h
net/ceph/auth_x.c
net/ceph/ceph_common.c
Stephen Rothwell [Thu, 9 Apr 2015 01:35:24 +0000 (11:35 +1000)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:34:22 +0000 (11:34 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 9 Apr 2015 01:33:15 +0000 (11:33 +1000)]
Merge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:31:39 +0000 (11:31 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 9 Apr 2015 01:30:36 +0000 (11:30 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 9 Apr 2015 01:27:54 +0000 (11:27 +1000)]
Merge remote-tracking branch 'fsl/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:24:36 +0000 (11:24 +1000)]
Merge remote-tracking branch 'powerpc-mpe/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:18:51 +0000 (11:18 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 9 Apr 2015 01:17:50 +0000 (11:17 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:08:28 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Conflicts:
drivers/bus/Makefile
drivers/irqchip/Makefile
Stephen Rothwell [Thu, 9 Apr 2015 01:07:25 +0000 (11:07 +1000)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:06:24 +0000 (11:06 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 9 Apr 2015 01:05:18 +0000 (11:05 +1000)]
Merge remote-tracking branch 'm68k/for-next'
projects / karo-tx-linux.git / log