]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 19 Sep 2012 04:39:31 +0000 (14:39 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 19 Sep 2012 04:34:58 +0000 (14:34 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/serqt_usb2/serqt_usb2.c
Stephen Rothwell [Wed, 19 Sep 2012 04:16:33 +0000 (14:16 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/kl5kusb105.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
Stephen Rothwell [Wed, 19 Sep 2012 04:08:05 +0000 (14:08 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 19 Sep 2012 04:00:58 +0000 (14:00 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 19 Sep 2012 03:59:07 +0000 (13:59 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 03:57:22 +0000 (13:57 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 03:55:37 +0000 (13:55 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 03:48:26 +0000 (13:48 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Conflicts:
drivers/cpufreq/powernow-k8.c
drivers/hid/hid-picolcd.c
drivers/isdn/mISDN/hwchannel.c
drivers/video/omap2/displays/panel-taal.c
Stephen Rothwell [Wed, 19 Sep 2012 03:27:46 +0000 (13:27 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 03:26:02 +0000 (13:26 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 19 Sep 2012 03:24:21 +0000 (13:24 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c
Stephen Rothwell [Wed, 19 Sep 2012 03:22:38 +0000 (13:22 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Wed, 19 Sep 2012 03:15:21 +0000 (13:15 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Conflicts:
arch/Kconfig
arch/x86/Kconfig
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/sched/core.c
Stephen Rothwell [Wed, 19 Sep 2012 03:08:00 +0000 (13:08 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/Kconfig
arch/s390/Kconfig
Stephen Rothwell [Wed, 19 Sep 2012 03:06:17 +0000 (13:06 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Conflicts:
drivers/mmc/host/mxs-mmc.c
Stephen Rothwell [Wed, 19 Sep 2012 03:04:13 +0000 (13:04 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 03:04:06 +0000 (13:04 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Wed, 19 Sep 2012 03:03:51 +0000 (13:03 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 19 Sep 2012 03:02:15 +0000 (13:02 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 19 Sep 2012 02:54:59 +0000 (12:54 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:48:44 +0000 (12:48 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/video/backlight/88pm860x_bl.c
Stephen Rothwell [Wed, 19 Sep 2012 02:47:03 +0000 (12:47 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:45:26 +0000 (12:45 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 19 Sep 2012 02:43:45 +0000 (12:43 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 19 Sep 2012 02:43:39 +0000 (12:43 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 19 Sep 2012 02:39:15 +0000 (12:39 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 19 Sep 2012 02:37:38 +0000 (12:37 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Stephen Rothwell [Wed, 19 Sep 2012 02:36:03 +0000 (12:36 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:34:28 +0000 (12:34 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:32:50 +0000 (12:32 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 19 Sep 2012 02:25:47 +0000 (12:25 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/tc3589x.c
drivers/regulator/anatop-regulator.c
Stephen Rothwell [Wed, 19 Sep 2012 02:24:09 +0000 (12:24 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:22:34 +0000 (12:22 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:20:55 +0000 (12:20 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:19:18 +0000 (12:19 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:17:36 +0000 (12:17 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 19 Sep 2012 02:11:08 +0000 (12:11 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:06:54 +0000 (12:06 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:05:01 +0000 (12:05 +1000)]
Merge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 02:03:22 +0000 (12:03 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 19 Sep 2012 01:57:26 +0000 (11:57 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/alpha/Kconfig
arch/mips/kernel/module.c
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Wed, 19 Sep 2012 01:55:43 +0000 (11:55 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Wed, 19 Sep 2012 01:53:49 +0000 (11:53 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 01:52:08 +0000 (11:52 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
Stephen Rothwell [Wed, 19 Sep 2012 01:50:25 +0000 (11:50 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Wed, 19 Sep 2012 01:48:45 +0000 (11:48 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 19 Sep 2012 01:47:13 +0000 (11:47 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 19 Sep 2012 01:44:46 +0000 (11:44 +1000)]
Merge commit 'refs/next/
20120918/bluetooth'
Stephen Rothwell [Wed, 19 Sep 2012 01:29:00 +0000 (11:29 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/socket.c
Stephen Rothwell [Wed, 19 Sep 2012 01:17:33 +0000 (11:17 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 19 Sep 2012 01:15:48 +0000 (11:15 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 01:13:47 +0000 (11:13 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
Stephen Rothwell [Wed, 19 Sep 2012 01:12:11 +0000 (11:12 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 19 Sep 2012 01:10:35 +0000 (11:10 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 01:09:02 +0000 (11:09 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 19 Sep 2012 01:08:55 +0000 (11:08 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 19 Sep 2012 01:07:14 +0000 (11:07 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Wed, 19 Sep 2012 01:05:41 +0000 (11:05 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 01:04:01 +0000 (11:04 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 19 Sep 2012 01:02:29 +0000 (11:02 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 01:00:46 +0000 (11:00 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:58:44 +0000 (10:58 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Wed, 19 Sep 2012 00:57:15 +0000 (10:57 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:55:50 +0000 (10:55 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 19 Sep 2012 00:54:23 +0000 (10:54 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:52:56 +0000 (10:52 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 19 Sep 2012 00:51:30 +0000 (10:51 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:50:03 +0000 (10:50 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 19 Sep 2012 00:47:33 +0000 (10:47 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 19 Sep 2012 00:44:17 +0000 (10:44 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 19 Sep 2012 00:40:07 +0000 (10:40 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:38:33 +0000 (10:38 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:37:08 +0000 (10:37 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:35:40 +0000 (10:35 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:34:07 +0000 (10:34 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:32:40 +0000 (10:32 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:31:15 +0000 (10:31 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:29:49 +0000 (10:29 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 19 Sep 2012 00:28:26 +0000 (10:28 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:27:02 +0000 (10:27 +1000)]
Merge remote-tracking branch 'gfs2/master'
Conflicts:
fs/gfs2/rgrp.c
Stephen Rothwell [Wed, 19 Sep 2012 00:25:25 +0000 (10:25 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:23:57 +0000 (10:23 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 19 Sep 2012 00:22:31 +0000 (10:22 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 19 Sep 2012 00:20:58 +0000 (10:20 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:19:35 +0000 (10:19 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 19 Sep 2012 00:18:12 +0000 (10:18 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 19 Sep 2012 00:16:46 +0000 (10:16 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Wed, 19 Sep 2012 00:15:21 +0000 (10:15 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 19 Sep 2012 00:10:16 +0000 (10:10 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 19 Sep 2012 00:08:52 +0000 (10:08 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 19 Sep 2012 00:07:27 +0000 (10:07 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:06:03 +0000 (10:06 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:04:40 +0000 (10:04 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 19 Sep 2012 00:03:18 +0000 (10:03 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 19 Sep 2012 00:01:53 +0000 (10:01 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 18 Sep 2012 23:56:47 +0000 (09:56 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Tue, 18 Sep 2012 23:55:18 +0000 (09:55 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Conflicts:
arch/arm/kernel/hw_breakpoint.c
Stephen Rothwell [Tue, 18 Sep 2012 23:53:52 +0000 (09:53 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 18 Sep 2012 23:50:20 +0000 (09:50 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
projects / karo-tx-linux.git / log