]>
git.karo-electronics.de Git - karo-tx-linux.git/log
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, 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>
Thierry Reding [Mon, 21 Oct 2013 11:55:54 +0000 (13:55 +0200)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Thierry Reding [Mon, 21 Oct 2013 11:55:51 +0000 (13:55 +0200)]
Merge remote-tracking branch 'random/dev'
Conflicts:
drivers/char/random.c
Thierry Reding [Mon, 21 Oct 2013 11:55:40 +0000 (13:55 +0200)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
drivers/clk/Makefile
Thierry Reding [Mon, 21 Oct 2013 11:55:29 +0000 (13:55 +0200)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/fuse/dir.c
Thierry Reding [Mon, 21 Oct 2013 11:54:36 +0000 (13:54 +0200)]
Merge remote-tracking branch 'pwm/for-next'
Conflicts:
arch/arm/mach-omap2/board-zoom-peripherals.c
Thierry Reding [Mon, 21 Oct 2013 11:53:53 +0000 (13:53 +0200)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
MAINTAINERS
Thierry Reding [Mon, 21 Oct 2013 11:53:17 +0000 (13:53 +0200)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c
Thierry Reding [Mon, 21 Oct 2013 11:49:46 +0000 (13:49 +0200)]
Merge remote-tracking branch 'renesas/next'
Thierry Reding [Mon, 21 Oct 2013 11:49:20 +0000 (13:49 +0200)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/mach-kirkwood/board-dt.c
Thierry Reding [Mon, 21 Oct 2013 11:39:04 +0000 (13:39 +0200)]
Merge remote-tracking branch 'imx-mxs/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:39:02 +0000 (13:39 +0200)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Thierry Reding [Mon, 21 Oct 2013 11:38:32 +0000 (13:38 +0200)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
Thierry Reding [Mon, 21 Oct 2013 11:35:23 +0000 (13:35 +0200)]
Merge remote-tracking branch 'gpio/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:35:19 +0000 (13:35 +0200)]
Merge remote-tracking branch 'pinctrl/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:35:12 +0000 (13:35 +0200)]
Merge remote-tracking branch 'target-updates/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:35:10 +0000 (13:35 +0200)]
Merge remote-tracking branch 'scsi/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:35:08 +0000 (13:35 +0200)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Thierry Reding [Mon, 21 Oct 2013 11:35:05 +0000 (13:35 +0200)]
Merge remote-tracking branch 'staging/staging-next'
Thierry Reding [Mon, 21 Oct 2013 11:35:02 +0000 (13:35 +0200)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/musb/davinci.c
Thierry Reding [Mon, 21 Oct 2013 11:34:55 +0000 (13:34 +0200)]
Merge remote-tracking branch 'usb/usb-next'
Thierry Reding [Mon, 21 Oct 2013 11:34:52 +0000 (13:34 +0200)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c
Thierry Reding [Mon, 21 Oct 2013 11:34:41 +0000 (13:34 +0200)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
include/linux/netdevice.h
Thierry Reding [Mon, 21 Oct 2013 11:34:32 +0000 (13:34 +0200)]
Merge remote-tracking branch 'leds/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:34:25 +0000 (13:34 +0200)]
Merge remote-tracking branch 'regmap/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:34:20 +0000 (13:34 +0200)]
Merge remote-tracking branch 'workqueues/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:34:18 +0000 (13:34 +0200)]
Merge remote-tracking branch 'percpu/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:34:17 +0000 (13:34 +0200)]
Merge remote-tracking branch 'xen-tip/linux-next'
Thierry Reding [Mon, 21 Oct 2013 11:34:12 +0000 (13:34 +0200)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Thierry Reding [Mon, 21 Oct 2013 11:34:09 +0000 (13:34 +0200)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/arm/kvm/reset.c
Thierry Reding [Mon, 21 Oct 2013 11:32:20 +0000 (13:32 +0200)]
Merge remote-tracking branch 'rcu/rcu/next'
Thierry Reding [Mon, 21 Oct 2013 11:32:18 +0000 (13:32 +0200)]
Merge remote-tracking branch 'ftrace/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:32:16 +0000 (13:32 +0200)]
Merge remote-tracking branch 'edac-amd/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:32:12 +0000 (13:32 +0200)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
mm/mprotect.c
Thierry Reding [Mon, 21 Oct 2013 11:31:41 +0000 (13:31 +0200)]
Merge remote-tracking branch 'spi/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:31:39 +0000 (13:31 +0200)]
Merge remote-tracking branch 'dt-rh/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:31:38 +0000 (13:31 +0200)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Thierry Reding [Mon, 21 Oct 2013 11:31:31 +0000 (13:31 +0200)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
net/netfilter/xt_set.c
Thierry Reding [Mon, 21 Oct 2013 11:30:09 +0000 (13:30 +0200)]
Merge remote-tracking branch 'iommu/next'
Thierry Reding [Mon, 21 Oct 2013 11:30:04 +0000 (13:30 +0200)]
Merge remote-tracking branch 'selinux/master'
Thierry Reding [Mon, 21 Oct 2013 11:30:03 +0000 (13:30 +0200)]
Merge remote-tracking branch 'security/next'
Thierry Reding [Mon, 21 Oct 2013 11:30:01 +0000 (13:30 +0200)]
Merge remote-tracking branch 'regulator/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:57 +0000 (13:29 +0200)]
Merge remote-tracking branch 'fbdev/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:54 +0000 (13:29 +0200)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:52 +0000 (13:29 +0200)]
Merge remote-tracking branch 'mfd/master'
Thierry Reding [Mon, 21 Oct 2013 11:29:51 +0000 (13:29 +0200)]
Merge remote-tracking branch 'md/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:47 +0000 (13:29 +0200)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:46 +0000 (13:29 +0200)]
Merge remote-tracking branch 'mmc/mmc-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:35 +0000 (13:29 +0200)]
Merge remote-tracking branch 'block/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:32 +0000 (13:29 +0200)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
mm/memcontrol.c
Thierry Reding [Mon, 21 Oct 2013 11:29:24 +0000 (13:29 +0200)]
Merge remote-tracking branch 'input/next'
Thierry Reding [Mon, 21 Oct 2013 11:29:22 +0000 (13:29 +0200)]
Merge remote-tracking branch 'virtio/virtio-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:21 +0000 (13:29 +0200)]
Merge remote-tracking branch 'modules/modules-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:13 +0000 (13:29 +0200)]
Merge remote-tracking branch 'sound-asoc/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:12 +0000 (13:29 +0200)]
Merge remote-tracking branch 'sound/for-next'
Thierry Reding [Mon, 21 Oct 2013 11:29:09 +0000 (13:29 +0200)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Conflicts:
drivers/gpu/drm/tegra/Kconfig
Thierry Reding [Mon, 21 Oct 2013 11:28:55 +0000 (13:28 +0200)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Thierry Reding [Mon, 21 Oct 2013 11:28:01 +0000 (13:28 +0200)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
Thierry Reding [Mon, 21 Oct 2013 10:52:58 +0000 (12:52 +0200)]
Merge remote-tracking branch 'crypto/master'
Thierry Reding [Mon, 21 Oct 2013 10:52:57 +0000 (12:52 +0200)]
Merge remote-tracking branch 'l2-mtd/master'
Thierry Reding [Mon, 21 Oct 2013 10:52:53 +0000 (12:52 +0200)]
Merge remote-tracking branch 'bluetooth/master'
Thierry Reding [Mon, 21 Oct 2013 10:52:07 +0000 (12:52 +0200)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/pcie/drv.c
Thierry Reding [Mon, 21 Oct 2013 10:47:20 +0000 (12:47 +0200)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
drivers/net/usb/qmi_wwan.c
include/net/dst.h
Thierry Reding [Mon, 21 Oct 2013 10:44:51 +0000 (12:44 +0200)]
Merge remote-tracking branch 'slave-dma/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:48 +0000 (12:44 +0200)]
Merge remote-tracking branch 'dlm/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:46 +0000 (12:44 +0200)]
Merge remote-tracking branch 'ubi/linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:43 +0000 (12:44 +0200)]
Merge remote-tracking branch 'thermal/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:38 +0000 (12:44 +0200)]
Merge remote-tracking branch 'idle/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:33 +0000 (12:44 +0200)]
Merge remote-tracking branch 'pm/linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:31 +0000 (12:44 +0200)]
Merge remote-tracking branch 'libata/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:28 +0000 (12:44 +0200)]
Merge remote-tracking branch 'kbuild/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:26 +0000 (12:44 +0200)]
Merge remote-tracking branch 'v4l-dvb/master'
Thierry Reding [Mon, 21 Oct 2013 10:44:25 +0000 (12:44 +0200)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:23 +0000 (12:44 +0200)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:21 +0000 (12:44 +0200)]
Merge remote-tracking branch 'hid/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:20 +0000 (12:44 +0200)]
Merge remote-tracking branch 'pci/next'
Thierry Reding [Mon, 21 Oct 2013 10:44:16 +0000 (12:44 +0200)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/nfs/direct.c
fs/nfs/file.c
Thierry Reding [Mon, 21 Oct 2013 10:44:10 +0000 (12:44 +0200)]
Merge remote-tracking branch 'xfs/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:03 +0000 (12:44 +0200)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Thierry Reding [Mon, 21 Oct 2013 10:44:02 +0000 (12:44 +0200)]
Merge remote-tracking branch 'nfs/linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:57 +0000 (12:43 +0200)]
Merge remote-tracking branch 'logfs/master'
Thierry Reding [Mon, 21 Oct 2013 10:43:55 +0000 (12:43 +0200)]
Merge remote-tracking branch 'jfs/jfs-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:54 +0000 (12:43 +0200)]
Merge remote-tracking branch 'gfs2/master'
Thierry Reding [Mon, 21 Oct 2013 10:43:53 +0000 (12:43 +0200)]
Merge remote-tracking branch 'fuse/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:52 +0000 (12:43 +0200)]
Merge remote-tracking branch 'fscache/fscache'
Thierry Reding [Mon, 21 Oct 2013 10:43:51 +0000 (12:43 +0200)]
Merge remote-tracking branch 'f2fs/dev'
Thierry Reding [Mon, 21 Oct 2013 10:43:50 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ext4/dev'
Thierry Reding [Mon, 21 Oct 2013 10:43:48 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ecryptfs/next'
Thierry Reding [Mon, 21 Oct 2013 10:43:45 +0000 (12:43 +0200)]
Merge remote-tracking branch 'cifs/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:44 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ceph/master'
Thierry Reding [Mon, 21 Oct 2013 10:43:43 +0000 (12:43 +0200)]
Merge remote-tracking branch 'aio-direct/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:36 +0000 (12:43 +0200)]
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
Thierry Reding [Mon, 21 Oct 2013 10:43:15 +0000 (12:43 +0200)]
Merge remote-tracking branch 's390/features'
Thierry Reding [Mon, 21 Oct 2013 10:43:13 +0000 (12:43 +0200)]
Merge remote-tracking branch 'mpc5xxx/next'
Thierry Reding [Mon, 21 Oct 2013 10:43:12 +0000 (12:43 +0200)]
Merge remote-tracking branch 'powerpc/next'
Thierry Reding [Mon, 21 Oct 2013 10:43:11 +0000 (12:43 +0200)]
Merge remote-tracking branch 'parisc-hd/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:08 +0000 (12:43 +0200)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:03 +0000 (12:43 +0200)]
Merge remote-tracking branch 'm68k/for-next'
Thierry Reding [Mon, 21 Oct 2013 10:43:02 +0000 (12:43 +0200)]
Merge remote-tracking branch 'ia64/next'
projects / karo-tx-linux.git / log