]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 20 Dec 2013 05:15:39 +0000 (16:15 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Fri, 20 Dec 2013 05:13:54 +0000 (16:13 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/imx-drm/imx-drm-core.c
Stephen Rothwell [Fri, 20 Dec 2013 04:56:43 +0000 (15:56 +1100)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/phy/Kconfig
Stephen Rothwell [Fri, 20 Dec 2013 04:49:43 +0000 (15:49 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/host/ohci-at91.c
Stephen Rothwell [Fri, 20 Dec 2013 04:38:21 +0000 (15:38 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:28:14 +0000 (15:28 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:27:24 +0000 (15:27 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:26:09 +0000 (15:26 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:25:19 +0000 (15:25 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:15:04 +0000 (15:15 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:14:01 +0000 (15:14 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:13:04 +0000 (15:13 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:12:15 +0000 (15:12 +1100)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:11:13 +0000 (15:11 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:10:10 +0000 (15:10 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 04:09:17 +0000 (15:09 +1100)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Conflicts:
drivers/clocksource/clksrc-of.c
Stephen Rothwell [Fri, 20 Dec 2013 03:49:59 +0000 (14:49 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 20 Dec 2013 03:48:29 +0000 (14:48 +1100)]
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi-mpc512x-psc.c
Stephen Rothwell [Fri, 20 Dec 2013 03:42:21 +0000 (14:42 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 03:42:15 +0000 (14:42 +1100)]
Merge remote-tracking branch 'audit/master'
Stephen Rothwell [Fri, 20 Dec 2013 03:34:06 +0000 (14:34 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 03:28:48 +0000 (14:28 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Fri, 20 Dec 2013 03:28:41 +0000 (14:28 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 20 Dec 2013 03:27:51 +0000 (14:27 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 20 Dec 2013 03:26:46 +0000 (14:26 +1100)]
Merge remote-tracking branch 'selinux/master'
Conflicts:
security/selinux/hooks.c
Stephen Rothwell [Fri, 20 Dec 2013 03:25:37 +0000 (14:25 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 03:24:16 +0000 (14:24 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 20 Dec 2013 03:23:01 +0000 (14:23 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Fri, 20 Dec 2013 03:22:55 +0000 (14:22 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 03:22:51 +0000 (14:22 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Conflicts:
kernel/debug/debug_core.h
Stephen Rothwell [Fri, 20 Dec 2013 03:17:03 +0000 (14:17 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'
Conflicts:
drivers/md/dm-thin.c
Stephen Rothwell [Fri, 20 Dec 2013 03:08:13 +0000 (14:08 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/f2fs/data.c
fs/f2fs/segment.c
fs/logfs/dev_bdev.c
include/trace/events/f2fs.h
Stephen Rothwell [Fri, 20 Dec 2013 02:25:34 +0000 (13:25 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 02:24:21 +0000 (13:24 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 20 Dec 2013 02:23:33 +0000 (13:23 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 20 Dec 2013 02:15:55 +0000 (13:15 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Conflicts:
Documentation/module-signing.txt
Stephen Rothwell [Fri, 20 Dec 2013 02:14:46 +0000 (13:14 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Conflicts:
sound/soc/fsl/fsl_ssi.c
Stephen Rothwell [Fri, 20 Dec 2013 01:36:34 +0000 (12:36 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 01:35:23 +0000 (12:35 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 01:34:11 +0000 (12:34 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_pm.c
Stephen Rothwell [Fri, 20 Dec 2013 01:32:25 +0000 (12:32 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/intel_pm.c
drivers/staging/imx-drm/imx-drm-core.c
Stephen Rothwell [Fri, 20 Dec 2013 01:22:11 +0000 (12:22 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 20 Dec 2013 01:21:18 +0000 (12:21 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 20 Dec 2013 01:20:08 +0000 (12:20 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 01:17:21 +0000 (12:17 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 20 Dec 2013 01:15:40 +0000 (12:15 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 20 Dec 2013 01:10:47 +0000 (12:10 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Fri, 20 Dec 2013 01:04:08 +0000 (12:04 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 20 Dec 2013 00:59:53 +0000 (11:59 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:54:56 +0000 (11:54 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
Stephen Rothwell [Fri, 20 Dec 2013 00:54:01 +0000 (11:54 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:53:11 +0000 (11:53 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:52:19 +0000 (11:52 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:50:17 +0000 (11:50 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:48:55 +0000 (11:48 +1100)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:47:59 +0000 (11:47 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:46:52 +0000 (11:46 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 20 Dec 2013 00:46:03 +0000 (11:46 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:45:15 +0000 (11:45 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Fri, 20 Dec 2013 00:44:14 +0000 (11:44 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:35:18 +0000 (11:35 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:33:57 +0000 (11:33 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:33:08 +0000 (11:33 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:31:59 +0000 (11:31 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:30:37 +0000 (11:30 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:29:18 +0000 (11:29 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 20 Dec 2013 00:28:28 +0000 (11:28 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 20 Dec 2013 00:27:37 +0000 (11:27 +1100)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 20 Dec 2013 00:26:49 +0000 (11:26 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 20 Dec 2013 00:25:47 +0000 (11:25 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 20 Dec 2013 00:24:53 +0000 (11:24 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 20 Dec 2013 00:24:06 +0000 (11:24 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:23:13 +0000 (11:23 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:22:24 +0000 (11:22 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Fri, 20 Dec 2013 00:21:35 +0000 (11:21 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 20 Dec 2013 00:20:40 +0000 (11:20 +1100)]
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
Stephen Rothwell [Fri, 20 Dec 2013 00:19:47 +0000 (11:19 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 20 Dec 2013 00:18:34 +0000 (11:18 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:10:00 +0000 (11:10 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:09:09 +0000 (11:09 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Fri, 20 Dec 2013 00:08:21 +0000 (11:08 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:07:33 +0000 (11:07 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:06:45 +0000 (11:06 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:05:57 +0000 (11:05 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:04:42 +0000 (11:04 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 20 Dec 2013 00:03:40 +0000 (11:03 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Fri, 20 Dec 2013 00:02:49 +0000 (11:02 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:53:55 +0000 (10:53 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Thu, 19 Dec 2013 23:48:59 +0000 (10:48 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:48:11 +0000 (10:48 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:47:22 +0000 (10:47 +1100)]
Merge remote-tracking branch 'renesas/next'
Conflicts:
drivers/clk/Makefile
Stephen Rothwell [Thu, 19 Dec 2013 23:46:26 +0000 (10:46 +1100)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:45:29 +0000 (10:45 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:45:26 +0000 (10:45 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:45:23 +0000 (10:45 +1100)]
Merge remote-tracking branch 'cortex-m/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:44:37 +0000 (10:44 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:43:46 +0000 (10:43 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:42:33 +0000 (10:42 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:41:47 +0000 (10:41 +1100)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Thu, 19 Dec 2013 23:36:34 +0000 (10:36 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
projects / karo-tx-linux.git / log