]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 7 Jan 2014 05:28:29 +0000 (16:28 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Conflicts:
drivers/target/target_core_tpg.c
Stephen Rothwell [Tue, 7 Jan 2014 05:26:37 +0000 (16:26 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 05:25:27 +0000 (16:25 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 7 Jan 2014 05:23:38 +0000 (16:23 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/imx-drm/imx-drm-core.c
Stephen Rothwell [Tue, 7 Jan 2014 05:15:11 +0000 (16:15 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 7 Jan 2014 05:04:45 +0000 (16:04 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:54:26 +0000 (15:54 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:53:21 +0000 (15:53 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:52:03 +0000 (15:52 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:51:12 +0000 (15:51 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:42:20 +0000 (15:42 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'
Conflicts:
arch/arm/include/asm/xen/page.h
Stephen Rothwell [Tue, 7 Jan 2014 04:36:46 +0000 (15:36 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:35:57 +0000 (15:35 +1100)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:34:46 +0000 (15:34 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:32:57 +0000 (15:32 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:31:58 +0000 (15:31 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:31:03 +0000 (15:31 +1100)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Conflicts:
drivers/clocksource/clksrc-of.c
Stephen Rothwell [Tue, 7 Jan 2014 04:20:37 +0000 (15:20 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/acpi/acpi_extlog.c
drivers/acpi/processor_idle.c
Stephen Rothwell [Tue, 7 Jan 2014 04:03:35 +0000 (15:03 +1100)]
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi-mpc512x-psc.c
Stephen Rothwell [Tue, 7 Jan 2014 04:02:35 +0000 (15:02 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 04:02:28 +0000 (15:02 +1100)]
Merge remote-tracking branch 'audit/master'
Stephen Rothwell [Tue, 7 Jan 2014 03:54:10 +0000 (14:54 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/gpu/drm/qxl/Kconfig
Stephen Rothwell [Tue, 7 Jan 2014 03:48:46 +0000 (14:48 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Tue, 7 Jan 2014 03:48:39 +0000 (14:48 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 7 Jan 2014 03:47:35 +0000 (14:47 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 7 Jan 2014 03:46:26 +0000 (14:46 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
drivers/char/tpm/tpm_ppi.c
Stephen Rothwell [Tue, 7 Jan 2014 03:30:31 +0000 (14:30 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 03:29:09 +0000 (14:29 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 7 Jan 2014 03:27:54 +0000 (14:27 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Tue, 7 Jan 2014 03:26:34 +0000 (14:26 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 03:26:31 +0000 (14:26 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Conflicts:
kernel/debug/debug_core.h
Stephen Rothwell [Tue, 7 Jan 2014 02:41:42 +0000 (13:41 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 7 Jan 2014 02:40:36 +0000 (13:40 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'
Conflicts:
drivers/md/dm-thin.c
Stephen Rothwell [Tue, 7 Jan 2014 02:31:35 +0000 (13:31 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h
Stephen Rothwell [Tue, 7 Jan 2014 02:25:57 +0000 (13:25 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 02:24:41 +0000 (13:24 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 7 Jan 2014 02:23:52 +0000 (13:23 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 7 Jan 2014 02:16:08 +0000 (13:16 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Conflicts:
Documentation/module-signing.txt
Stephen Rothwell [Tue, 7 Jan 2014 02:14:23 +0000 (13:14 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 02:13:02 +0000 (13:13 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
sound/soc/fsl/fsl_ssi.c
Stephen Rothwell [Tue, 7 Jan 2014 02:11:43 +0000 (13:11 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 02:10:26 +0000 (13:10 +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 [Tue, 7 Jan 2014 02:08:39 +0000 (13:08 +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 [Tue, 7 Jan 2014 01:58:15 +0000 (12:58 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 7 Jan 2014 01:57:20 +0000 (12:57 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 7 Jan 2014 01:56:26 +0000 (12:56 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 01:51:19 +0000 (12:51 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/ieee802154/6lowpan.c
Stephen Rothwell [Tue, 7 Jan 2014 01:35:59 +0000 (12:35 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Tue, 7 Jan 2014 01:34:37 +0000 (12:34 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 7 Jan 2014 01:24:10 +0000 (12:24 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 7 Jan 2014 01:18:48 +0000 (12:18 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
Stephen Rothwell [Tue, 7 Jan 2014 01:17:55 +0000 (12:17 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Tue, 7 Jan 2014 01:17:06 +0000 (12:17 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Tue, 7 Jan 2014 01:15:54 +0000 (12:15 +1100)]
Merge remote-tracking branch 'thermal/next'
Conflicts:
drivers/cpufreq/Kconfig
Stephen Rothwell [Tue, 7 Jan 2014 01:15:02 +0000 (12:15 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Tue, 7 Jan 2014 01:04:54 +0000 (12:04 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 7 Jan 2014 01:03:53 +0000 (12:03 +1100)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 01:03:01 +0000 (12:03 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 01:00:55 +0000 (12:00 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 7 Jan 2014 01:00:07 +0000 (12:00 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:59:19 +0000 (11:59 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Tue, 7 Jan 2014 00:58:30 +0000 (11:58 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:57:28 +0000 (11:57 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:48:34 +0000 (11:48 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 7 Jan 2014 00:47:11 +0000 (11:47 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:46:21 +0000 (11:46 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:45:10 +0000 (11:45 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:43:46 +0000 (11:43 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:42:28 +0000 (11:42 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 7 Jan 2014 00:41:38 +0000 (11:41 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:40:49 +0000 (11:40 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 7 Jan 2014 00:39:59 +0000 (11:39 +1100)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 7 Jan 2014 00:39:10 +0000 (11:39 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 7 Jan 2014 00:38:10 +0000 (11:38 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 7 Jan 2014 00:37:15 +0000 (11:37 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 7 Jan 2014 00:36:27 +0000 (11:36 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 7 Jan 2014 00:35:34 +0000 (11:35 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Tue, 7 Jan 2014 00:34:44 +0000 (11:34 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 7 Jan 2014 00:32:18 +0000 (11:32 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 7 Jan 2014 00:31:02 +0000 (11:31 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Conflicts:
arch/powerpc/boot/dts/mpc5125twr.dts
Stephen Rothwell [Tue, 7 Jan 2014 00:22:20 +0000 (11:22 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 7 Jan 2014 00:21:31 +0000 (11:21 +1100)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:20:41 +0000 (11:20 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 7 Jan 2014 00:19:52 +0000 (11:19 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:19:04 +0000 (11:19 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 7 Jan 2014 00:18:16 +0000 (11:18 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:17:27 +0000 (11:17 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:16:10 +0000 (11:16 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:15:08 +0000 (11:15 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 7 Jan 2014 00:14:16 +0000 (11:14 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:05:21 +0000 (11:05 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Tue, 7 Jan 2014 00:05:14 +0000 (11:05 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:05:07 +0000 (11:05 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:04:10 +0000 (11:04 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 7 Jan 2014 00:03:13 +0000 (11:03 +1100)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:02:14 +0000 (11:02 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 7 Jan 2014 00:02:11 +0000 (11:02 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 6 Jan 2014 23:56:45 +0000 (10:56 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig.debug
Stephen Rothwell [Mon, 6 Jan 2014 23:55:27 +0000 (10:55 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 23:54:41 +0000 (10:54 +1100)]
Merge remote-tracking branch 'arc/for-next'
projects / karo-tx-linux.git / log