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