]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Thierry Reding [Fri, 25 Oct 2013 09:50:26 +0000 (11:50 +0200)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Thierry Reding [Fri, 25 Oct 2013 09:50:22 +0000 (11:50 +0200)]
Merge remote-tracking branch 'random/dev'
Conflicts:
drivers/char/random.c
Thierry Reding [Fri, 25 Oct 2013 09:50:12 +0000 (11:50 +0200)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
drivers/clk/Makefile
Thierry Reding [Fri, 25 Oct 2013 09:50:01 +0000 (11:50 +0200)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/fuse/dir.c
Thierry Reding [Fri, 25 Oct 2013 09:49:51 +0000 (11:49 +0200)]
Merge remote-tracking branch 'pwm/for-next'
Conflicts:
arch/arm/mach-omap2/board-zoom-peripherals.c
Thierry Reding [Fri, 25 Oct 2013 09:49:33 +0000 (11:49 +0200)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
MAINTAINERS
Thierry Reding [Fri, 25 Oct 2013 09:49:23 +0000 (11:49 +0200)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c
Thierry Reding [Fri, 25 Oct 2013 09:49:12 +0000 (11:49 +0200)]
Merge remote-tracking branch 'renesas/next'
Thierry Reding [Fri, 25 Oct 2013 09:49:08 +0000 (11:49 +0200)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/mach-kirkwood/board-dt.c
Thierry Reding [Fri, 25 Oct 2013 09:48:55 +0000 (11:48 +0200)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
Thierry Reding [Fri, 25 Oct 2013 09:48:50 +0000 (11:48 +0200)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Thierry Reding [Fri, 25 Oct 2013 09:48:44 +0000 (11:48 +0200)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/board-mop500.c
Thierry Reding [Fri, 25 Oct 2013 09:48:30 +0000 (11:48 +0200)]
Merge remote-tracking branch 'gpio/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:48:25 +0000 (11:48 +0200)]
Merge remote-tracking branch 'pinctrl/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:48:20 +0000 (11:48 +0200)]
Merge remote-tracking branch 'target-updates/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:48:18 +0000 (11:48 +0200)]
Merge remote-tracking branch 'scsi/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:48:16 +0000 (11:48 +0200)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Thierry Reding [Fri, 25 Oct 2013 09:48:14 +0000 (11:48 +0200)]
Merge remote-tracking branch 'staging/staging-next'
Thierry Reding [Fri, 25 Oct 2013 09:48:10 +0000 (11:48 +0200)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/Kconfig
drivers/usb/musb/davinci.c
Thierry Reding [Fri, 25 Oct 2013 09:48:03 +0000 (11:48 +0200)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c
Thierry Reding [Fri, 25 Oct 2013 09:47:55 +0000 (11:47 +0200)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
include/linux/netdevice.h
Thierry Reding [Fri, 25 Oct 2013 09:47:49 +0000 (11:47 +0200)]
Merge remote-tracking branch 'leds/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:47:42 +0000 (11:47 +0200)]
Merge remote-tracking branch 'regmap/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:47:38 +0000 (11:47 +0200)]
Merge remote-tracking branch 'workqueues/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:47:36 +0000 (11:47 +0200)]
Merge remote-tracking branch 'percpu/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:47:34 +0000 (11:47 +0200)]
Merge remote-tracking branch 'xen-tip/linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:47:26 +0000 (11:47 +0200)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Conflicts:
arch/arm/kvm/reset.c
Thierry Reding [Fri, 25 Oct 2013 09:47:03 +0000 (11:47 +0200)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/arm/kvm/reset.c
Thierry Reding [Fri, 25 Oct 2013 09:43:22 +0000 (11:43 +0200)]
Merge remote-tracking branch 'ftrace/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:43:20 +0000 (11:43 +0200)]
Merge remote-tracking branch 'edac-amd/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:42:33 +0000 (11:42 +0200)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak
Thierry Reding [Fri, 25 Oct 2013 09:37:45 +0000 (11:37 +0200)]
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi.c
Thierry Reding [Fri, 25 Oct 2013 09:37:11 +0000 (11:37 +0200)]
Merge remote-tracking branch 'dt-rh/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:37:08 +0000 (11:37 +0200)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Thierry Reding [Fri, 25 Oct 2013 09:37:02 +0000 (11:37 +0200)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
net/netfilter/xt_set.c
Thierry Reding [Fri, 25 Oct 2013 09:36:48 +0000 (11:36 +0200)]
Merge remote-tracking branch 'iommu/next'
Thierry Reding [Fri, 25 Oct 2013 09:36:43 +0000 (11:36 +0200)]
Merge remote-tracking branch 'security/next'
Thierry Reding [Fri, 25 Oct 2013 09:36:41 +0000 (11:36 +0200)]
Merge remote-tracking branch 'regulator/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:36:37 +0000 (11:36 +0200)]
Merge remote-tracking branch 'fbdev/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:36:35 +0000 (11:36 +0200)]
Merge remote-tracking branch 'battery/master'
Thierry Reding [Fri, 25 Oct 2013 09:36:29 +0000 (11:36 +0200)]
Merge remote-tracking branch 'mfd/master'
Conflicts:
sound/soc/codecs/mc13783.c
Thierry Reding [Fri, 25 Oct 2013 09:36:17 +0000 (11:36 +0200)]
Merge remote-tracking branch 'md/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:36:14 +0000 (11:36 +0200)]
Merge remote-tracking branch 'slab/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:36:13 +0000 (11:36 +0200)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Thierry Reding [Fri, 25 Oct 2013 09:36:11 +0000 (11:36 +0200)]
Merge remote-tracking branch 'mmc/mmc-next'
Thierry Reding [Fri, 25 Oct 2013 09:36:02 +0000 (11:36 +0200)]
Merge remote-tracking branch 'device-mapper/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:35:29 +0000 (11:35 +0200)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
include/linux/blk_types.h
Thierry Reding [Fri, 25 Oct 2013 09:32:33 +0000 (11:32 +0200)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
mm/memcontrol.c
Thierry Reding [Fri, 25 Oct 2013 09:32:25 +0000 (11:32 +0200)]
Merge remote-tracking branch 'input/next'
Thierry Reding [Fri, 25 Oct 2013 09:32:23 +0000 (11:32 +0200)]
Merge remote-tracking branch 'virtio/virtio-next'
Thierry Reding [Fri, 25 Oct 2013 09:32:21 +0000 (11:32 +0200)]
Merge remote-tracking branch 'modules/modules-next'
Thierry Reding [Fri, 25 Oct 2013 09:32:15 +0000 (11:32 +0200)]
Merge remote-tracking branch 'sound-asoc/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:32:13 +0000 (11:32 +0200)]
Merge remote-tracking branch 'sound/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:32:10 +0000 (11:32 +0200)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Conflicts:
drivers/gpu/drm/tegra/Kconfig
Thierry Reding [Fri, 25 Oct 2013 09:32:05 +0000 (11:32 +0200)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:32:02 +0000 (11:32 +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 [Fri, 25 Oct 2013 09:31:52 +0000 (11:31 +0200)]
Merge remote-tracking branch 'crypto/master'
Thierry Reding [Fri, 25 Oct 2013 09:31:51 +0000 (11:31 +0200)]
Merge remote-tracking branch 'l2-mtd/master'
Thierry Reding [Fri, 25 Oct 2013 09:31:49 +0000 (11:31 +0200)]
Merge remote-tracking branch 'mtd/master'
Thierry Reding [Fri, 25 Oct 2013 09:31:47 +0000 (11:31 +0200)]
Merge remote-tracking branch 'bluetooth/master'
Thierry Reding [Fri, 25 Oct 2013 09:31:44 +0000 (11:31 +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 [Fri, 25 Oct 2013 09:31:31 +0000 (11:31 +0200)]
Merge remote-tracking branch 'ipsec-next/master'
Conflicts:
net/xfrm/xfrm_policy.c
Thierry Reding [Fri, 25 Oct 2013 09:31:21 +0000 (11:31 +0200)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
Thierry Reding [Fri, 25 Oct 2013 09:30:48 +0000 (11:30 +0200)]
Merge remote-tracking branch 'slave-dma/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:44 +0000 (11:30 +0200)]
Merge remote-tracking branch 'dlm/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:42 +0000 (11:30 +0200)]
Merge remote-tracking branch 'ubi/linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:40 +0000 (11:30 +0200)]
Merge remote-tracking branch 'thermal/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:35 +0000 (11:30 +0200)]
Merge remote-tracking branch 'idle/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:31 +0000 (11:30 +0200)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/i2c/i2c-core.c
Thierry Reding [Fri, 25 Oct 2013 09:30:24 +0000 (11:30 +0200)]
Merge remote-tracking branch 'libata/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:21 +0000 (11:30 +0200)]
Merge remote-tracking branch 'kbuild/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:19 +0000 (11:30 +0200)]
Merge remote-tracking branch 'v4l-dvb/master'
Thierry Reding [Fri, 25 Oct 2013 09:30:17 +0000 (11:30 +0200)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:14 +0000 (11:30 +0200)]
Merge remote-tracking branch 'hid/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:12 +0000 (11:30 +0200)]
Merge remote-tracking branch 'pci/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:09 +0000 (11:30 +0200)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/nfs/direct.c
fs/nfs/file.c
Thierry Reding [Fri, 25 Oct 2013 09:29:58 +0000 (11:29 +0200)]
Merge remote-tracking branch 'xfs/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:56 +0000 (11:29 +0200)]
Merge remote-tracking branch 'ubifs/linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:53 +0000 (11:29 +0200)]
Merge remote-tracking branch 'v9fs/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:48 +0000 (11:29 +0200)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:47 +0000 (11:29 +0200)]
Merge remote-tracking branch 'nfs/linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:40 +0000 (11:29 +0200)]
Merge remote-tracking branch 'logfs/master'
Thierry Reding [Fri, 25 Oct 2013 09:29:38 +0000 (11:29 +0200)]
Merge remote-tracking branch 'gfs2/master'
Thierry Reding [Fri, 25 Oct 2013 09:29:37 +0000 (11:29 +0200)]
Merge remote-tracking branch 'fuse/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:36 +0000 (11:29 +0200)]
Merge remote-tracking branch 'fscache/fscache'
Thierry Reding [Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)]
Merge remote-tracking branch 'f2fs/dev'
Thierry Reding [Fri, 25 Oct 2013 09:29:34 +0000 (11:29 +0200)]
Merge remote-tracking branch 'ext4/dev'
Thierry Reding [Fri, 25 Oct 2013 09:29:30 +0000 (11:29 +0200)]
Merge remote-tracking branch 'cifs/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:29 +0000 (11:29 +0200)]
Merge remote-tracking branch 'ceph/master'
Thierry Reding [Fri, 25 Oct 2013 09:29:27 +0000 (11:29 +0200)]
Merge remote-tracking branch 'aio-direct/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:21 +0000 (11:29 +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 [Fri, 25 Oct 2013 09:20:17 +0000 (11:20 +0200)]
Merge remote-tracking branch 's390/features'
Thierry Reding [Fri, 25 Oct 2013 09:20:16 +0000 (11:20 +0200)]
Merge remote-tracking branch 'mpc5xxx/next'
Thierry Reding [Fri, 25 Oct 2013 09:20:15 +0000 (11:20 +0200)]
Merge remote-tracking branch 'powerpc/next'
Thierry Reding [Fri, 25 Oct 2013 09:20:14 +0000 (11:20 +0200)]
Merge remote-tracking branch 'parisc-hd/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:20:12 +0000 (11:20 +0200)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:20:09 +0000 (11:20 +0200)]
Merge remote-tracking branch 'm68k/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:20:08 +0000 (11:20 +0200)]
Merge remote-tracking branch 'ia64/next'
Thierry Reding [Fri, 25 Oct 2013 09:20:05 +0000 (11:20 +0200)]
Merge remote-tracking branch 'h8300-remove/h8300-remove'
Conflicts:
drivers/parport/Kconfig
projects / karo-tx-linux.git / log