]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Mark Brown [Sat, 19 Oct 2013 12:36:47 +0000 (13:36 +0100)]
Add -next files for
20131018
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Sat, 19 Oct 2013 12:26:49 +0000 (13:26 +0100)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Mark Brown [Sat, 19 Oct 2013 12:23:38 +0000 (13:23 +0100)]
Merge remote-tracking branch 'random/dev'
Conflicts:
drivers/char/random.c
Mark Brown [Sat, 19 Oct 2013 12:20:15 +0000 (13:20 +0100)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
drivers/clk/Makefile
Mark Brown [Sat, 19 Oct 2013 12:14:25 +0000 (13:14 +0100)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/fuse/dir.c
Mark Brown [Sat, 19 Oct 2013 10:24:12 +0000 (11:24 +0100)]
Merge remote-tracking branch 'pwm/for-next'
Mark Brown [Sat, 19 Oct 2013 10:20:05 +0000 (11:20 +0100)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
MAINTAINERS
Mark Brown [Sat, 19 Oct 2013 10:16:51 +0000 (11:16 +0100)]
Merge remote-tracking branch 'samsung/for-next'
Mark Brown [Sat, 19 Oct 2013 10:13:49 +0000 (11:13 +0100)]
Merge remote-tracking branch 'renesas/next'
Mark Brown [Sat, 19 Oct 2013 10:10:47 +0000 (11:10 +0100)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/mach-kirkwood/board-dt.c
Mark Brown [Sat, 19 Oct 2013 10:06:58 +0000 (11:06 +0100)]
Merge remote-tracking branch 'msm/for-next'
Mark Brown [Sat, 19 Oct 2013 09:58:43 +0000 (10:58 +0100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-imx/mach-imx6q.c
Mark Brown [Sat, 19 Oct 2013 00:12:58 +0000 (01:12 +0100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Mark Brown [Sat, 19 Oct 2013 00:07:38 +0000 (01:07 +0100)]
Merge remote-tracking branch 'arm-soc/for-next'
Mark Brown [Sat, 19 Oct 2013 00:04:13 +0000 (01:04 +0100)]
Merge remote-tracking branch 'gpio/for-next'
Mark Brown [Fri, 18 Oct 2013 23:57:24 +0000 (00:57 +0100)]
Merge remote-tracking branch 'pinctrl/for-next'
Mark Brown [Fri, 18 Oct 2013 23:50:49 +0000 (00:50 +0100)]
Merge remote-tracking branch 'target-updates/for-next'
Mark Brown [Fri, 18 Oct 2013 23:47:29 +0000 (00:47 +0100)]
Merge remote-tracking branch 'scsi/for-next'
Mark Brown [Thu, 3 Oct 2013 23:53:01 +0000 (00:53 +0100)]
misc: mic: Update for sysfs_get_dirent() cleanups
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Fri, 18 Oct 2013 23:10:22 +0000 (00:10 +0100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Mark Brown [Fri, 18 Oct 2013 23:06:14 +0000 (00:06 +0100)]
Merge remote-tracking branch 'staging/staging-next'
Mark Brown [Fri, 18 Oct 2013 23:03:12 +0000 (00:03 +0100)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/musb/davinci.c
Mark Brown [Fri, 18 Oct 2013 22:58:22 +0000 (23:58 +0100)]
Merge remote-tracking branch 'usb/usb-next'
Mark Brown [Fri, 18 Oct 2013 22:55:30 +0000 (23:55 +0100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c
Mark Brown [Fri, 18 Oct 2013 18:43:18 +0000 (19:43 +0100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
include/linux/netdevice.h
Mark Brown [Fri, 18 Oct 2013 18:40:43 +0000 (19:40 +0100)]
Merge remote-tracking branch 'leds/for-next'
Mark Brown [Fri, 18 Oct 2013 18:37:30 +0000 (19:37 +0100)]
Merge remote-tracking branch 'regmap/for-next'
Mark Brown [Fri, 18 Oct 2013 18:33:52 +0000 (19:33 +0100)]
Merge remote-tracking branch 'workqueues/for-next'
Mark Brown [Fri, 18 Oct 2013 18:31:45 +0000 (19:31 +0100)]
Merge remote-tracking branch 'percpu/for-next'
Mark Brown [Fri, 18 Oct 2013 18:29:39 +0000 (19:29 +0100)]
Merge remote-tracking branch 'xen-tip/linux-next'
Mark Brown [Fri, 18 Oct 2013 18:25:19 +0000 (19:25 +0100)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Mark Brown [Fri, 18 Oct 2013 18:09:19 +0000 (19:09 +0100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/arm/kvm/reset.c
Mark Brown [Fri, 18 Oct 2013 17:44:56 +0000 (18:44 +0100)]
Merge remote-tracking branch 'rcu/rcu/next'
Mark Brown [Fri, 18 Oct 2013 17:41:59 +0000 (18:41 +0100)]
Merge remote-tracking branch 'edac-amd/for-next'
Mark Brown [Fri, 18 Oct 2013 17:25:14 +0000 (18:25 +0100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
mm/mprotect.c
Mark Brown [Fri, 18 Oct 2013 17:09:02 +0000 (18:09 +0100)]
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi.c
Mark Brown [Fri, 18 Oct 2013 17:02:44 +0000 (18:02 +0100)]
Merge remote-tracking branch 'dt-rh/for-next'
Mark Brown [Fri, 18 Oct 2013 16:59:04 +0000 (17:59 +0100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Mark Brown [Fri, 18 Oct 2013 16:41:22 +0000 (17:41 +0100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
net/netfilter/xt_set.c
Mark Brown [Fri, 18 Oct 2013 16:35:00 +0000 (17:35 +0100)]
Merge remote-tracking branch 'iommu/next'
Mark Brown [Fri, 18 Oct 2013 16:24:36 +0000 (17:24 +0100)]
Merge remote-tracking branch 'selinux/master'
Mark Brown [Fri, 18 Oct 2013 16:10:06 +0000 (17:10 +0100)]
Merge remote-tracking branch 'security/next'
Mark Brown [Fri, 18 Oct 2013 16:07:49 +0000 (17:07 +0100)]
Merge remote-tracking branch 'regulator/for-next'
Mark Brown [Fri, 18 Oct 2013 16:04:34 +0000 (17:04 +0100)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
drivers/video/omap2/dss/hdmi4_core.c
drivers/video/omap2/dss/hdmi4_core.h
Mark Brown [Fri, 18 Oct 2013 16:00:43 +0000 (17:00 +0100)]
Merge remote-tracking branch 'fbdev/for-next'
Mark Brown [Fri, 18 Oct 2013 15:57:48 +0000 (16:57 +0100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Mark Brown [Fri, 18 Oct 2013 15:55:39 +0000 (16:55 +0100)]
Merge remote-tracking branch 'mfd/master'
Mark Brown [Fri, 18 Oct 2013 15:40:00 +0000 (16:40 +0100)]
Merge remote-tracking branch 'md/for-next'
Mark Brown [Fri, 18 Oct 2013 15:36:25 +0000 (16:36 +0100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Mark Brown [Fri, 18 Oct 2013 15:34:15 +0000 (16:34 +0100)]
Merge remote-tracking branch 'mmc/mmc-next'
Mark Brown [Fri, 18 Oct 2013 15:26:26 +0000 (16:26 +0100)]
Merge remote-tracking branch 'block/for-next'
Mark Brown [Fri, 18 Oct 2013 15:17:47 +0000 (16:17 +0100)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
mm/memcontrol.c
Mark Brown [Fri, 18 Oct 2013 13:47:51 +0000 (14:47 +0100)]
Merge remote-tracking branch 'input/next'
Mark Brown [Fri, 18 Oct 2013 13:45:43 +0000 (14:45 +0100)]
Merge remote-tracking branch 'virtio/virtio-next'
Mark Brown [Fri, 18 Oct 2013 13:33:56 +0000 (14:33 +0100)]
Merge remote-tracking branch 'modules/modules-next'
Mark Brown [Fri, 18 Oct 2013 13:31:35 +0000 (14:31 +0100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Mark Brown [Fri, 18 Oct 2013 13:29:24 +0000 (14:29 +0100)]
Merge remote-tracking branch 'sound/for-next'
Mark Brown [Fri, 18 Oct 2013 13:26:44 +0000 (14:26 +0100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Conflicts:
drivers/gpu/drm/tegra/Kconfig
Mark Brown [Fri, 18 Oct 2013 13:24:17 +0000 (14:24 +0100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Mark Brown [Thu, 3 Oct 2013 17:10:55 +0000 (18:10 +0100)]
drm/i915: Resolve interaction with drm-fixes tree
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Fri, 18 Oct 2013 13:22:28 +0000 (14:22 +0100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
Mark Brown [Fri, 18 Oct 2013 13:19:52 +0000 (14:19 +0100)]
Merge remote-tracking branch 'crypto/master'
Mark Brown [Fri, 18 Oct 2013 13:17:37 +0000 (14:17 +0100)]
Merge remote-tracking branch 'l2-mtd/master'
Mark Brown [Fri, 18 Oct 2013 13:13:55 +0000 (14:13 +0100)]
Merge remote-tracking branch 'bluetooth/master'
Mark Brown [Fri, 18 Oct 2013 13:10:53 +0000 (14:10 +0100)]
Merge remote-tracking branch 'ipsec-next/master'
Mark Brown [Fri, 18 Oct 2013 13:03:26 +0000 (14:03 +0100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/h8300/include/uapi/asm/socket.h
drivers/net/usb/qmi_wwan.c
include/net/dst.h
Mark Brown [Fri, 18 Oct 2013 12:46:53 +0000 (13:46 +0100)]
Merge remote-tracking branch 'slave-dma/next'
Mark Brown [Fri, 18 Oct 2013 12:44:01 +0000 (13:44 +0100)]
Merge remote-tracking branch 'dlm/next'
Mark Brown [Fri, 18 Oct 2013 12:41:51 +0000 (13:41 +0100)]
Merge remote-tracking branch 'ubi/linux-next'
Mark Brown [Fri, 18 Oct 2013 12:39:00 +0000 (13:39 +0100)]
Merge remote-tracking branch 'thermal/next'
Mark Brown [Fri, 18 Oct 2013 12:21:45 +0000 (13:21 +0100)]
Merge remote-tracking branch 'idle/next'
Mark Brown [Fri, 18 Oct 2013 12:05:57 +0000 (13:05 +0100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/i2c/i2c-core.c
Mark Brown [Fri, 18 Oct 2013 12:02:15 +0000 (13:02 +0100)]
Merge remote-tracking branch 'libata/for-next'
Mark Brown [Fri, 18 Oct 2013 11:59:23 +0000 (12:59 +0100)]
Merge remote-tracking branch 'kbuild/for-next'
Mark Brown [Fri, 18 Oct 2013 11:57:08 +0000 (12:57 +0100)]
Merge remote-tracking branch 'v4l-dvb/master'
Mark Brown [Fri, 18 Oct 2013 11:54:54 +0000 (12:54 +0100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Mark Brown [Fri, 18 Oct 2013 11:50:38 +0000 (12:50 +0100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Mark Brown [Fri, 18 Oct 2013 11:48:30 +0000 (12:48 +0100)]
Merge remote-tracking branch 'hid/for-next'
Mark Brown [Fri, 18 Oct 2013 11:42:02 +0000 (12:42 +0100)]
Merge remote-tracking branch 'pci/next'
Mark Brown [Fri, 18 Oct 2013 11:27:30 +0000 (12:27 +0100)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/nfs/direct.c
fs/nfs/file.c
Mark Brown [Fri, 18 Oct 2013 11:24:54 +0000 (12:24 +0100)]
Merge remote-tracking branch 'xfs/for-next'
Mark Brown [Fri, 18 Oct 2013 11:19:41 +0000 (12:19 +0100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Mark Brown [Fri, 18 Oct 2013 11:17:22 +0000 (12:17 +0100)]
Merge remote-tracking branch 'nfs/linux-next'
Mark Brown [Fri, 18 Oct 2013 11:15:14 +0000 (12:15 +0100)]
Merge remote-tracking branch 'logfs/master'
Mark Brown [Fri, 18 Oct 2013 11:13:09 +0000 (12:13 +0100)]
Merge remote-tracking branch 'jfs/jfs-next'
Mark Brown [Fri, 18 Oct 2013 11:11:02 +0000 (12:11 +0100)]
Merge remote-tracking branch 'gfs2/master'
Mark Brown [Fri, 18 Oct 2013 10:56:48 +0000 (11:56 +0100)]
Merge remote-tracking branch 'fuse/for-next'
Mark Brown [Fri, 18 Oct 2013 10:42:44 +0000 (11:42 +0100)]
Merge remote-tracking branch 'fscache/fscache'
Mark Brown [Fri, 18 Oct 2013 10:40:39 +0000 (11:40 +0100)]
Merge remote-tracking branch 'f2fs/dev'
Mark Brown [Fri, 18 Oct 2013 10:35:35 +0000 (11:35 +0100)]
Merge remote-tracking branch 'ecryptfs/next'
Mark Brown [Fri, 18 Oct 2013 10:32:34 +0000 (11:32 +0100)]
Merge remote-tracking branch 'cifs/for-next'
Mark Brown [Thu, 3 Oct 2013 12:05:20 +0000 (13:05 +0100)]
ceph: Fix up for iov_iter changes
Extend an earlier fixup by Stephen Rothwell.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Fri, 18 Oct 2013 10:19:11 +0000 (11:19 +0100)]
Merge remote-tracking branch 'ceph/master'
Mark Brown [Fri, 18 Oct 2013 10:04:13 +0000 (11:04 +0100)]
Merge remote-tracking branch 'aio-direct/for-next'
Mark Brown [Fri, 18 Oct 2013 09:58:55 +0000 (10:58 +0100)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h
Mark Brown [Fri, 18 Oct 2013 08:09:09 +0000 (09:09 +0100)]
Merge remote-tracking branch 's390/features'
Mark Brown [Fri, 18 Oct 2013 08:06:22 +0000 (09:06 +0100)]
Merge remote-tracking branch 'mpc5xxx/next'
Mark Brown [Fri, 18 Oct 2013 07:51:00 +0000 (08:51 +0100)]
Merge remote-tracking branch 'powerpc/next'
Mark Brown [Fri, 18 Oct 2013 07:48:57 +0000 (08:48 +0100)]
Merge remote-tracking branch 'parisc-hd/for-next'
Mark Brown [Fri, 18 Oct 2013 07:45:27 +0000 (08:45 +0100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
projects / karo-tx-linux.git / log