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