]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 8 Nov 2012 03:52:14 +0000 (14:52 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/arm/kernel/process.c
arch/sparc/kernel/sys_sparc_64.c
Stephen Rothwell [Thu, 8 Nov 2012 03:50:20 +0000 (14:50 +1100)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:48:40 +0000 (14:48 +1100)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:47:01 +0000 (14:47 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Thu, 8 Nov 2012 03:45:22 +0000 (14:45 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:43:38 +0000 (14:43 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
Stephen Rothwell [Thu, 8 Nov 2012 03:41:54 +0000 (14:41 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 8 Nov 2012 03:40:09 +0000 (14:40 +1100)]
Merge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Thu, 8 Nov 2012 03:40:06 +0000 (14:40 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:38:29 +0000 (14:38 +1100)]
Merge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:36:51 +0000 (14:36 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:35:09 +0000 (14:35 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-ux500/board-mop500-audio.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/pinctrl/pinctrl-nomadik.c
Stephen Rothwell [Thu, 8 Nov 2012 03:33:24 +0000 (14:33 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:33:08 +0000 (14:33 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Thu, 8 Nov 2012 03:31:10 +0000 (14:31 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:29:24 +0000 (14:29 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:27:32 +0000 (14:27 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/telephony/Kconfig
Stephen Rothwell [Thu, 8 Nov 2012 03:23:02 +0000 (14:23 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/early/ehci-dbgp.c
Stephen Rothwell [Thu, 8 Nov 2012 03:20:39 +0000 (14:20 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/omap-serial.c
Stephen Rothwell [Thu, 8 Nov 2012 03:18:57 +0000 (14:18 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:17:21 +0000 (14:17 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:15:37 +0000 (14:15 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:13:45 +0000 (14:13 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:12:08 +0000 (14:12 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:10:27 +0000 (14:10 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:04:01 +0000 (14:04 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 03:03:50 +0000 (14:03 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/uapi/asm/epapr_hcalls.h
Stephen Rothwell [Thu, 8 Nov 2012 03:01:05 +0000 (14:01 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:53:39 +0000 (13:53 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 8 Nov 2012 02:46:09 +0000 (13:46 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 8 Nov 2012 02:44:34 +0000 (13:44 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:42:54 +0000 (13:42 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:41:09 +0000 (13:41 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:39:24 +0000 (13:39 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 8 Nov 2012 02:37:45 +0000 (13:37 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Thu, 8 Nov 2012 02:30:10 +0000 (13:30 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/x86/pci/acpi.c
Stephen Rothwell [Thu, 8 Nov 2012 02:28:22 +0000 (13:28 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:26:39 +0000 (13:26 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:21:29 +0000 (13:21 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 8 Nov 2012 02:19:39 +0000 (13:19 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 8 Nov 2012 02:19:33 +0000 (13:19 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 8 Nov 2012 02:12:41 +0000 (13:12 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c
Stephen Rothwell [Thu, 8 Nov 2012 02:10:55 +0000 (13:10 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:09:10 +0000 (13:09 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:07:30 +0000 (13:07 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 02:00:09 +0000 (13:00 +1100)]
Merge remote-tracking branch 'slab/for-next'
Conflicts:
mm/slob.c
Stephen Rothwell [Thu, 8 Nov 2012 01:59:58 +0000 (12:59 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:58:25 +0000 (12:58 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:56:40 +0000 (12:56 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
drivers/block/floppy.c
init/Kconfig
Stephen Rothwell [Thu, 8 Nov 2012 01:50:38 +0000 (12:50 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:49:00 +0000 (12:49 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 8 Nov 2012 01:47:23 +0000 (12:47 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:40:38 +0000 (12:40 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:38:58 +0000 (12:38 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:37:04 +0000 (12:37 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:35:19 +0000 (12:35 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:33:42 +0000 (12:33 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 8 Nov 2012 01:32:05 +0000 (12:32 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 8 Nov 2012 01:30:24 +0000 (12:30 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 8 Nov 2012 01:28:49 +0000 (12:28 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 8 Nov 2012 01:26:47 +0000 (12:26 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 8 Nov 2012 01:19:28 +0000 (12:19 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 8 Nov 2012 01:15:29 +0000 (12:15 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 8 Nov 2012 01:13:44 +0000 (12:13 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:08:34 +0000 (12:08 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:06:59 +0000 (12:06 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 8 Nov 2012 01:05:25 +0000 (12:05 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 01:03:48 +0000 (12:03 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 8 Nov 2012 01:03:40 +0000 (12:03 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Thu, 8 Nov 2012 00:57:12 +0000 (11:57 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Thu, 8 Nov 2012 00:57:00 +0000 (11:57 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:53:50 +0000 (11:53 +1100)]
Merge commit 'refs/next/
20121026/v4l-dvb'
Stephen Rothwell [Thu, 8 Nov 2012 00:48:29 +0000 (11:48 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:46:59 +0000 (11:46 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 8 Nov 2012 00:46:58 +0000 (11:46 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:45:30 +0000 (11:45 +1100)]
Merge branch 'i2c/master'
Stephen Rothwell [Thu, 8 Nov 2012 00:43:54 +0000 (11:43 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:40:30 +0000 (11:40 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 8 Nov 2012 00:39:03 +0000 (11:39 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:37:31 +0000 (11:37 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:35:51 +0000 (11:35 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:35:44 +0000 (11:35 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:33:53 +0000 (11:33 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:32:17 +0000 (11:32 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:30:38 +0000 (11:30 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 8 Nov 2012 00:29:07 +0000 (11:29 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 8 Nov 2012 00:27:28 +0000 (11:27 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:25:53 +0000 (11:25 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:24:12 +0000 (11:24 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Thu, 8 Nov 2012 00:22:44 +0000 (11:22 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 8 Nov 2012 00:21:17 +0000 (11:21 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 8 Nov 2012 00:19:45 +0000 (11:19 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 8 Nov 2012 00:18:16 +0000 (11:18 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 8 Nov 2012 00:18:14 +0000 (11:18 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:16:43 +0000 (11:16 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Thu, 8 Nov 2012 00:15:13 +0000 (11:15 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:13:44 +0000 (11:13 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Thu, 8 Nov 2012 00:12:15 +0000 (11:12 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 8 Nov 2012 00:10:40 +0000 (11:10 +1100)]
Merge remote-tracking branch 'cris/for-next'
projects / karo-tx-linux.git / log