]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 5 Aug 2013 06:03:17 +0000 (16:03 +1000)]
Merge branch 'akpm-current/current'
Conflicts:
fs/binfmt_elf.c
Stephen Rothwell [Mon, 5 Aug 2013 05:53:04 +0000 (15:53 +1000)]
Merge remote-tracking branch 'aio/master'
Stephen Rothwell [Mon, 5 Aug 2013 05:44:49 +0000 (15:44 +1000)]
Merge remote-tracking branch 'ptr-ret/PTR_RET'
Stephen Rothwell [Mon, 5 Aug 2013 05:43:05 +0000 (15:43 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Mon, 5 Aug 2013 05:41:26 +0000 (15:41 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:39:42 +0000 (15:39 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:38:03 +0000 (15:38 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:37:58 +0000 (15:37 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:36:18 +0000 (15:36 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:34:39 +0000 (15:34 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:33:00 +0000 (15:33 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Mon, 5 Aug 2013 05:31:23 +0000 (15:31 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:29:47 +0000 (15:29 +1000)]
Merge remote-tracking branch 'msm/for-next'
Conflicts:
arch/arm/Kconfig.debug
Stephen Rothwell [Mon, 5 Aug 2013 05:28:08 +0000 (15:28 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/Kconfig.debug
Stephen Rothwell [Mon, 5 Aug 2013 05:26:27 +0000 (15:26 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:26:20 +0000 (15:26 +1000)]
Merge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:24:41 +0000 (15:24 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:23:03 +0000 (15:23 +1000)]
Merge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:21:18 +0000 (15:21 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:19:41 +0000 (15:19 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:17:28 +0000 (15:17 +1000)]
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Stephen Rothwell [Mon, 5 Aug 2013 05:15:32 +0000 (15:15 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:13:55 +0000 (15:13 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:12:18 +0000 (15:12 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:10:38 +0000 (15:10 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/gadget/udc-core.c
drivers/usb/host/ehci-tegra.c
drivers/usb/musb/omap2430.c
drivers/usb/musb/tusb6010.c
Stephen Rothwell [Mon, 5 Aug 2013 05:08:30 +0000 (15:08 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 5 Aug 2013 05:00:27 +0000 (15:00 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/sh-sci.c
Stephen Rothwell [Mon, 5 Aug 2013 03:43:16 +0000 (13:43 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
net/core/net-sysfs.c
Stephen Rothwell [Mon, 5 Aug 2013 03:41:38 +0000 (13:41 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 03:39:49 +0000 (13:39 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 03:39:38 +0000 (13:39 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 03:31:23 +0000 (13:31 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 03:31:17 +0000 (13:31 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 03:24:14 +0000 (13:24 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
mm/Kconfig
Stephen Rothwell [Mon, 5 Aug 2013 03:15:59 +0000 (13:15 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 03:07:39 +0000 (13:07 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 5 Aug 2013 02:59:21 +0000 (12:59 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:50:59 +0000 (12:50 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 5 Aug 2013 02:49:03 +0000 (12:49 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:45:51 +0000 (12:45 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Mon, 5 Aug 2013 02:44:12 +0000 (12:44 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:35:45 +0000 (12:35 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:31:06 +0000 (12:31 +1000)]
Merge remote-tracking branch 'selinux/master'
Conflicts:
security/selinux/hooks.c
Stephen Rothwell [Mon, 5 Aug 2013 02:26:11 +0000 (12:26 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 5 Aug 2013 02:24:29 +0000 (12:24 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:22:47 +0000 (12:22 +1000)]
Merge remote-tracking branch 'fbdev/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:21:08 +0000 (12:21 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:19:30 +0000 (12:19 +1000)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Mon, 5 Aug 2013 02:17:50 +0000 (12:17 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:16:11 +0000 (12:16 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:16:07 +0000 (12:16 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:14:31 +0000 (12:14 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:14:14 +0000 (12:14 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:09:40 +0000 (12:09 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:08:00 +0000 (12:08 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:06:04 +0000 (12:06 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:04:25 +0000 (12:04 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 02:02:41 +0000 (12:02 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_pm.c
Stephen Rothwell [Mon, 5 Aug 2013 02:00:47 +0000 (12:00 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/qxl/qxl_release.c
Stephen Rothwell [Mon, 5 Aug 2013 01:46:59 +0000 (11:46 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 5 Aug 2013 01:45:22 +0000 (11:45 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 5 Aug 2013 01:43:42 +0000 (11:43 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 5 Aug 2013 01:41:39 +0000 (11:41 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/ethernet/broadcom/Kconfig
Stephen Rothwell [Mon, 5 Aug 2013 01:39:51 +0000 (11:39 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Mon, 5 Aug 2013 01:34:15 +0000 (11:34 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 5 Aug 2013 01:29:51 +0000 (11:29 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 5 Aug 2013 01:28:14 +0000 (11:28 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 5 Aug 2013 01:26:34 +0000 (11:26 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 01:24:45 +0000 (11:24 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Mon, 5 Aug 2013 01:17:43 +0000 (11:17 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 01:15:55 +0000 (11:15 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 01:14:12 +0000 (11:14 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 01:12:18 +0000 (11:12 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 5 Aug 2013 01:10:40 +0000 (11:10 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 5 Aug 2013 01:09:02 +0000 (11:09 +1000)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Mon, 5 Aug 2013 01:07:20 +0000 (11:07 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 01:05:41 +0000 (11:05 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Mon, 5 Aug 2013 00:59:42 +0000 (10:59 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/ext4/namei.c
mm/shmem.c
Stephen Rothwell [Mon, 5 Aug 2013 00:53:12 +0000 (10:53 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:51:23 +0000 (10:51 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:49:09 +0000 (10:49 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:47:34 +0000 (10:47 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:45:59 +0000 (10:45 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:43:57 +0000 (10:43 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 5 Aug 2013 00:42:21 +0000 (10:42 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 5 Aug 2013 00:40:44 +0000 (10:40 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 5 Aug 2013 00:35:40 +0000 (10:35 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 5 Aug 2013 00:34:01 +0000 (10:34 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:32:26 +0000 (10:32 +1000)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Mon, 5 Aug 2013 00:32:24 +0000 (10:32 +1000)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Mon, 5 Aug 2013 00:30:46 +0000 (10:30 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 5 Aug 2013 00:29:10 +0000 (10:29 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
include/linux/serial_sci.h
Stephen Rothwell [Mon, 5 Aug 2013 00:27:30 +0000 (10:27 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 5 Aug 2013 00:25:53 +0000 (10:25 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:24:18 +0000 (10:24 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:22:44 +0000 (10:22 +1000)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 5 Aug 2013 00:21:11 +0000 (10:21 +1000)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:19:38 +0000 (10:19 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 5 Aug 2013 00:18:04 +0000 (10:18 +1000)]
Merge remote-tracking branch 'ia64/next'
Conflicts:
arch/ia64/configs/generic_defconfig
arch/ia64/configs/gensparse_defconfig
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/xen_domu_defconfig
Stephen Rothwell [Mon, 5 Aug 2013 00:16:28 +0000 (10:16 +1000)]
Merge remote-tracking branch 'cris/for-next'
Conflicts:
arch/cris/arch-v32/drivers/Kconfig
projects / karo-tx-linux.git / log