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