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