]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Mark Brown [Thu, 17 Oct 2013 23:48:34 +0000 (00:48 +0100)]
Merge remote-tracking branch 'msm/for-next'
Mark Brown [Thu, 17 Oct 2013 23:45:38 +0000 (00:45 +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 [Thu, 17 Oct 2013 23:43:10 +0000 (00:43 +0100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Mark Brown [Thu, 17 Oct 2013 23:39:28 +0000 (00:39 +0100)]
Merge remote-tracking branch 'arm-soc/for-next'
Mark Brown [Thu, 17 Oct 2013 23:36:55 +0000 (00:36 +0100)]
Merge remote-tracking branch 'gpio/for-next'
Mark Brown [Thu, 17 Oct 2013 23:32:07 +0000 (00:32 +0100)]
Merge remote-tracking branch 'pinctrl/for-next'
Mark Brown [Thu, 17 Oct 2013 23:27:35 +0000 (00:27 +0100)]
Merge remote-tracking branch 'target-updates/for-next'
Mark Brown [Thu, 17 Oct 2013 23:25:11 +0000 (00:25 +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 [Thu, 17 Oct 2013 23:23:56 +0000 (00:23 +0100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Mark Brown [Thu, 17 Oct 2013 23:20:50 +0000 (00:20 +0100)]
Merge remote-tracking branch 'staging/staging-next'
Mark Brown [Thu, 17 Oct 2013 23:18:35 +0000 (00:18 +0100)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/musb/davinci.c
Mark Brown [Thu, 17 Oct 2013 23:15:01 +0000 (00:15 +0100)]
Merge remote-tracking branch 'usb/usb-next'
Mark Brown [Thu, 17 Oct 2013 23:12:19 +0000 (00:12 +0100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/imx.c
Mark Brown [Thu, 17 Oct 2013 22:55:55 +0000 (23:55 +0100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
include/linux/netdevice.h
Mark Brown [Thu, 17 Oct 2013 22:53:33 +0000 (23:53 +0100)]
Merge remote-tracking branch 'leds/for-next'
Mark Brown [Thu, 17 Oct 2013 22:50:24 +0000 (23:50 +0100)]
Merge remote-tracking branch 'regmap/for-next'
Mark Brown [Thu, 17 Oct 2013 22:46:48 +0000 (23:46 +0100)]
Merge remote-tracking branch 'workqueues/for-next'
Mark Brown [Thu, 17 Oct 2013 22:44:41 +0000 (23:44 +0100)]
Merge remote-tracking branch 'percpu/for-next'
Mark Brown [Thu, 17 Oct 2013 22:42:32 +0000 (23:42 +0100)]
Merge remote-tracking branch 'xen-tip/linux-next'
Mark Brown [Thu, 17 Oct 2013 22:23:34 +0000 (23:23 +0100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/arm/kvm/reset.c
Mark Brown [Thu, 17 Oct 2013 21:43:14 +0000 (22:43 +0100)]
Merge remote-tracking branch 'rcu/rcu/next'
Mark Brown [Thu, 17 Oct 2013 21:40:15 +0000 (22:40 +0100)]
Merge remote-tracking branch 'edac-amd/for-next'
Mark Brown [Thu, 17 Oct 2013 21:23:24 +0000 (22:23 +0100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
mm/mprotect.c
Mark Brown [Thu, 17 Oct 2013 20:47:55 +0000 (21:47 +0100)]
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi.c
Mark Brown [Thu, 17 Oct 2013 20:43:07 +0000 (21:43 +0100)]
Merge remote-tracking branch 'dt-rh/for-next'
Mark Brown [Thu, 17 Oct 2013 20:39:29 +0000 (21:39 +0100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Mark Brown [Thu, 17 Oct 2013 20:22:07 +0000 (21:22 +0100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
net/netfilter/xt_set.c
Mark Brown [Thu, 17 Oct 2013 19:15:55 +0000 (20:15 +0100)]
Merge remote-tracking branch 'iommu/next'
Mark Brown [Thu, 17 Oct 2013 19:05:38 +0000 (20:05 +0100)]
Merge remote-tracking branch 'selinux/master'
Mark Brown [Thu, 17 Oct 2013 18:51:12 +0000 (19:51 +0100)]
Merge remote-tracking branch 'security/next'
Mark Brown [Thu, 17 Oct 2013 18:49:02 +0000 (19:49 +0100)]
Merge remote-tracking branch 'regulator/for-next'
Mark Brown [Thu, 17 Oct 2013 18:46:54 +0000 (19:46 +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 [Thu, 17 Oct 2013 18:42:40 +0000 (19:42 +0100)]
Merge remote-tracking branch 'fbdev/for-next'
Mark Brown [Thu, 17 Oct 2013 18:39:43 +0000 (19:39 +0100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Mark Brown [Thu, 17 Oct 2013 18:37:34 +0000 (19:37 +0100)]
Merge remote-tracking branch 'mfd/master'
Mark Brown [Thu, 17 Oct 2013 18:21:34 +0000 (19:21 +0100)]
Merge remote-tracking branch 'md/for-next'
Mark Brown [Thu, 17 Oct 2013 18:17:56 +0000 (19:17 +0100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Mark Brown [Thu, 17 Oct 2013 18:15:46 +0000 (19:15 +0100)]
Merge remote-tracking branch 'mmc/mmc-next'
Mark Brown [Thu, 17 Oct 2013 18:07:57 +0000 (19:07 +0100)]
Merge remote-tracking branch 'block/for-next'
Mark Brown [Thu, 17 Oct 2013 17:59:25 +0000 (18:59 +0100)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
mm/memcontrol.c
Mark Brown [Thu, 17 Oct 2013 14:37:01 +0000 (15:37 +0100)]
Merge remote-tracking branch 'input/next'
Mark Brown [Thu, 17 Oct 2013 14:34:54 +0000 (15:34 +0100)]
Merge remote-tracking branch 'virtio/virtio-next'
Mark Brown [Thu, 17 Oct 2013 14:23:20 +0000 (15:23 +0100)]
Merge remote-tracking branch 'modules/modules-next'
Mark Brown [Thu, 17 Oct 2013 14:21:01 +0000 (15:21 +0100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Mark Brown [Thu, 17 Oct 2013 14:18:52 +0000 (15:18 +0100)]
Merge remote-tracking branch 'sound/for-next'
Mark Brown [Thu, 17 Oct 2013 13:55:09 +0000 (14:55 +0100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Conflicts:
drivers/gpu/drm/tegra/Kconfig
drivers/gpu/drm/tegra/drm.c
Mark Brown [Thu, 17 Oct 2013 13:35:30 +0000 (14:35 +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 [Thu, 17 Oct 2013 13:31:33 +0000 (14:31 +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 [Thu, 17 Oct 2013 13:29:04 +0000 (14:29 +0100)]
Merge remote-tracking branch 'crypto/master'
Mark Brown [Thu, 17 Oct 2013 13:26:47 +0000 (14:26 +0100)]
Merge remote-tracking branch 'l2-mtd/master'
Mark Brown [Thu, 17 Oct 2013 13:23:09 +0000 (14:23 +0100)]
Merge remote-tracking branch 'bluetooth/master'
Mark Brown [Thu, 17 Oct 2013 13:19:57 +0000 (14:19 +0100)]
Merge remote-tracking branch 'wireless-next/master'
Mark Brown [Thu, 17 Oct 2013 13:17:40 +0000 (14:17 +0100)]
Merge remote-tracking branch 'ipsec-next/master'
Mark Brown [Thu, 17 Oct 2013 13:08:44 +0000 (14:08 +0100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/h8300/include/uapi/asm/socket.h
Mark Brown [Thu, 17 Oct 2013 11:54:51 +0000 (12:54 +0100)]
Merge remote-tracking branch 'slave-dma/next'
Mark Brown [Thu, 17 Oct 2013 11:52:02 +0000 (12:52 +0100)]
Merge remote-tracking branch 'dlm/next'
Mark Brown [Thu, 17 Oct 2013 11:49:57 +0000 (12:49 +0100)]
Merge remote-tracking branch 'ubi/linux-next'
Mark Brown [Thu, 17 Oct 2013 11:47:06 +0000 (12:47 +0100)]
Merge remote-tracking branch 'thermal/next'
Mark Brown [Thu, 17 Oct 2013 11:29:39 +0000 (12:29 +0100)]
Merge remote-tracking branch 'idle/next'
Mark Brown [Thu, 17 Oct 2013 11:13:58 +0000 (12:13 +0100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/i2c/i2c-core.c
Mark Brown [Thu, 17 Oct 2013 11:10:49 +0000 (12:10 +0100)]
Merge remote-tracking branch 'libata/for-next'
Mark Brown [Thu, 17 Oct 2013 11:07:55 +0000 (12:07 +0100)]
Merge remote-tracking branch 'kbuild/for-next'
Mark Brown [Thu, 17 Oct 2013 11:05:38 +0000 (12:05 +0100)]
Merge remote-tracking branch 'v4l-dvb/master'
Mark Brown [Thu, 17 Oct 2013 11:03:21 +0000 (12:03 +0100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Mark Brown [Thu, 17 Oct 2013 10:58:57 +0000 (11:58 +0100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Mark Brown [Thu, 17 Oct 2013 10:56:45 +0000 (11:56 +0100)]
Merge remote-tracking branch 'hid/for-next'
Mark Brown [Thu, 17 Oct 2013 10:50:18 +0000 (11:50 +0100)]
Merge remote-tracking branch 'pci/next'
Mark Brown [Thu, 17 Oct 2013 10:35:36 +0000 (11:35 +0100)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/nfs/direct.c
fs/nfs/file.c
Mark Brown [Thu, 17 Oct 2013 10:28:59 +0000 (11:28 +0100)]
Merge remote-tracking branch 'xfs/for-next'
Mark Brown [Thu, 17 Oct 2013 10:23:47 +0000 (11:23 +0100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Mark Brown [Thu, 17 Oct 2013 10:21:26 +0000 (11:21 +0100)]
Merge remote-tracking branch 'nfs/linux-next'
Mark Brown [Thu, 17 Oct 2013 10:19:18 +0000 (11:19 +0100)]
Merge remote-tracking branch 'logfs/master'
Mark Brown [Thu, 17 Oct 2013 10:17:07 +0000 (11:17 +0100)]
Merge remote-tracking branch 'jfs/jfs-next'
Mark Brown [Thu, 17 Oct 2013 10:14:56 +0000 (11:14 +0100)]
Merge remote-tracking branch 'gfs2/master'
Mark Brown [Thu, 17 Oct 2013 09:59:14 +0000 (10:59 +0100)]
Merge remote-tracking branch 'fuse/for-next'
Mark Brown [Thu, 17 Oct 2013 09:45:01 +0000 (10:45 +0100)]
Merge remote-tracking branch 'fscache/fscache'
Mark Brown [Thu, 17 Oct 2013 09:42:56 +0000 (10:42 +0100)]
Merge remote-tracking branch 'f2fs/dev'
Mark Brown [Thu, 17 Oct 2013 09:39:22 +0000 (10:39 +0100)]
Merge remote-tracking branch 'ecryptfs/next'
Mark Brown [Thu, 17 Oct 2013 09:34:52 +0000 (10:34 +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 [Thu, 17 Oct 2013 09:19:24 +0000 (10:19 +0100)]
Merge remote-tracking branch 'ceph/master'
Mark Brown [Thu, 17 Oct 2013 09:04:23 +0000 (10:04 +0100)]
Merge remote-tracking branch 'aio-direct/for-next'
Mark Brown [Thu, 17 Oct 2013 08:59:20 +0000 (09:59 +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 [Thu, 17 Oct 2013 07:45:28 +0000 (08:45 +0100)]
Merge remote-tracking branch 's390/features'
Mark Brown [Thu, 17 Oct 2013 07:42:41 +0000 (08:42 +0100)]
Merge remote-tracking branch 'mpc5xxx/next'
Mark Brown [Thu, 17 Oct 2013 07:27:20 +0000 (08:27 +0100)]
Merge remote-tracking branch 'powerpc/next'
Mark Brown [Thu, 17 Oct 2013 07:25:17 +0000 (08:25 +0100)]
Merge remote-tracking branch 'parisc-hd/for-next'
Mark Brown [Thu, 17 Oct 2013 07:21:46 +0000 (08:21 +0100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Mark Brown [Thu, 17 Oct 2013 07:17:32 +0000 (08:17 +0100)]
Merge remote-tracking branch 'm68k/for-next'
Mark Brown [Thu, 17 Oct 2013 07:15:30 +0000 (08:15 +0100)]
Merge remote-tracking branch 'ia64/next'
Mark Brown [Thu, 17 Oct 2013 07:03:03 +0000 (08:03 +0100)]
Merge remote-tracking branch 'h8300-remove/h8300-remove'
Mark Brown [Thu, 17 Oct 2013 07:00:17 +0000 (08:00 +0100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Mark Brown [Thu, 17 Oct 2013 06:56:47 +0000 (07:56 +0100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Mark Brown [Thu, 17 Oct 2013 06:46:00 +0000 (07:46 +0100)]
Merge remote-tracking branch 'arm/for-next'
Mark Brown [Thu, 17 Oct 2013 06:42:23 +0000 (07:42 +0100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Mark Brown [Thu, 17 Oct 2013 06:33:03 +0000 (07:33 +0100)]
Merge remote-tracking branch 'input-current/for-linus'
Mark Brown [Thu, 17 Oct 2013 06:31:00 +0000 (07:31 +0100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'
Mark Brown [Thu, 17 Oct 2013 06:27:32 +0000 (07:27 +0100)]
Merge remote-tracking branch 'usb.current/usb-linus'
projects / karo-tx-linux.git / log