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