]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 21 Sep 2012 05:08:18 +0000 (15:08 +1000)]
Merge remote-tracking branch 'ixp4xx/next'
Conflicts:
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
Stephen Rothwell [Fri, 21 Sep 2012 05:06:35 +0000 (15:06 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 21 Sep 2012 05:01:57 +0000 (15:01 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/i2c/busses/i2c-omap.c
drivers/input/keyboard/omap-keypad.c
drivers/mmc/host/omap.c
drivers/mtd/nand/Kconfig
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/video/omap2/dss/dispc.c
drivers/w1/masters/omap_hdq.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c
Stephen Rothwell [Fri, 21 Sep 2012 04:55:33 +0000 (14:55 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:53:55 +0000 (14:53 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:53:48 +0000 (14:53 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Fri, 21 Sep 2012 04:52:02 +0000 (14:52 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:50:22 +0000 (14:50 +1000)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:48:44 +0000 (14:48 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:47:08 +0000 (14:47 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:42:33 +0000 (14:42 +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 [Fri, 21 Sep 2012 04:40:16 +0000 (14:40 +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 [Fri, 21 Sep 2012 04:37:55 +0000 (14:37 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:30:48 +0000 (14:30 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:28:57 +0000 (14:28 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:27:14 +0000 (14:27 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:25:34 +0000 (14:25 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:18:24 +0000 (14:18 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Conflicts:
drivers/hid/hid-picolcd.c
drivers/isdn/mISDN/hwchannel.c
drivers/video/omap2/displays/panel-taal.c
Stephen Rothwell [Fri, 21 Sep 2012 04:09:51 +0000 (14:09 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:08:04 +0000 (14:08 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Fri, 21 Sep 2012 04:06:23 +0000 (14:06 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c
Stephen Rothwell [Fri, 21 Sep 2012 04:04:39 +0000 (14:04 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Fri, 21 Sep 2012 03:57:24 +0000 (13:57 +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 [Fri, 21 Sep 2012 03:49:59 +0000 (13:49 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/Kconfig
arch/s390/Kconfig
Stephen Rothwell [Fri, 21 Sep 2012 03:48:18 +0000 (13:48 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Conflicts:
drivers/mmc/host/mxs-mmc.c
Stephen Rothwell [Fri, 21 Sep 2012 03:46:15 +0000 (13:46 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 03:46:08 +0000 (13:46 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Fri, 21 Sep 2012 03:45:53 +0000 (13:45 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 21 Sep 2012 03:44:17 +0000 (13:44 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Fri, 21 Sep 2012 03:37:01 +0000 (13:37 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/cpufreq/powernow-k8.c
Stephen Rothwell [Fri, 21 Sep 2012 03:30:42 +0000 (13:30 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/video/backlight/88pm860x_bl.c
Stephen Rothwell [Fri, 21 Sep 2012 03:29:01 +0000 (13:29 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 03:27:24 +0000 (13:27 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 21 Sep 2012 03:25:47 +0000 (13:25 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 21 Sep 2012 03:25:42 +0000 (13:25 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 21 Sep 2012 03:21:17 +0000 (13:21 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 21 Sep 2012 03:19:39 +0000 (13:19 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Stephen Rothwell [Fri, 21 Sep 2012 03:17:59 +0000 (13:17 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 03:16:19 +0000 (13:16 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Fri, 21 Sep 2012 03:14:46 +0000 (13:14 +1000)]
Merge remote-tracking branch 'battery/master'
Conflicts:
include/linux/mfd/88pm860x.h
Stephen Rothwell [Fri, 21 Sep 2012 02:49:47 +0000 (12:49 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/max8925-core.c
drivers/mfd/tc3589x.c
drivers/regulator/anatop-regulator.c
Stephen Rothwell [Fri, 21 Sep 2012 02:48:12 +0000 (12:48 +1000)]
Merge remote-tracking branch 'md/for-next'
Conflicts:
drivers/md/raid0.c
fs/bio.c
Stephen Rothwell [Fri, 21 Sep 2012 02:16:41 +0000 (12:16 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 02:15:03 +0000 (12:15 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 21 Sep 2012 02:13:27 +0000 (12:13 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 21 Sep 2012 02:11:43 +0000 (12:11 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 21 Sep 2012 02:05:14 +0000 (12:05 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 02:00:57 +0000 (12:00 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 01:59:18 +0000 (11:59 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 21 Sep 2012 01:53:22 +0000 (11:53 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Fri, 21 Sep 2012 01:51:44 +0000 (11:51 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Fri, 21 Sep 2012 01:49:52 +0000 (11:49 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 01:48:10 +0000 (11:48 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Fri, 21 Sep 2012 01:46:25 +0000 (11:46 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Fri, 21 Sep 2012 01:44:39 +0000 (11:44 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 21 Sep 2012 01:43:04 +0000 (11:43 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 21 Sep 2012 01:41:24 +0000 (11:41 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 21 Sep 2012 01:30:06 +0000 (11:30 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/usb/qmi_wwan.c
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/socket.c
Stephen Rothwell [Fri, 21 Sep 2012 01:18:05 +0000 (11:18 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 21 Sep 2012 01:16:19 +0000 (11:16 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 01:14:19 +0000 (11:14 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
Stephen Rothwell [Fri, 21 Sep 2012 01:12:43 +0000 (11:12 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 21 Sep 2012 01:11:07 +0000 (11:11 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 01:09:32 +0000 (11:09 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 21 Sep 2012 01:09:25 +0000 (11:09 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Fri, 21 Sep 2012 01:07:44 +0000 (11:07 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Fri, 21 Sep 2012 01:05:58 +0000 (11:05 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 01:04:18 +0000 (11:04 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 21 Sep 2012 01:02:45 +0000 (11:02 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 01:01:03 +0000 (11:01 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:59:01 +0000 (10:59 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Fri, 21 Sep 2012 00:51:57 +0000 (10:51 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:50:33 +0000 (10:50 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 21 Sep 2012 00:49:08 +0000 (10:49 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:47:43 +0000 (10:47 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 21 Sep 2012 00:45:57 +0000 (10:45 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:44:31 +0000 (10:44 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 21 Sep 2012 00:43:07 +0000 (10:43 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 21 Sep 2012 00:40:37 +0000 (10:40 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 21 Sep 2012 00:37:19 +0000 (10:37 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 21 Sep 2012 00:33:07 +0000 (10:33 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:31:34 +0000 (10:31 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:30:08 +0000 (10:30 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:28:42 +0000 (10:28 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:27:09 +0000 (10:27 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:25:41 +0000 (10:25 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:24:15 +0000 (10:24 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:22:51 +0000 (10:22 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 21 Sep 2012 00:21:22 +0000 (10:21 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:19:57 +0000 (10:19 +1000)]
Merge remote-tracking branch 'gfs2/master'
Conflicts:
fs/gfs2/rgrp.c
Stephen Rothwell [Fri, 21 Sep 2012 00:18:26 +0000 (10:18 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:16:54 +0000 (10:16 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 21 Sep 2012 00:15:25 +0000 (10:15 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 21 Sep 2012 00:13:53 +0000 (10:13 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:12:24 +0000 (10:12 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 21 Sep 2012 00:10:56 +0000 (10:10 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 21 Sep 2012 00:05:50 +0000 (10:05 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 21 Sep 2012 00:04:26 +0000 (10:04 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Fri, 21 Sep 2012 00:02:55 +0000 (10:02 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 21 Sep 2012 00:01:30 +0000 (10:01 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
projects / karo-tx-linux.git / log