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