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