]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 31 Oct 2012 05:48:32 +0000 (16:48 +1100)]
Merge branch 'akpm-current/current'
Conflicts:
tools/testing/selftests/epoll/test_epoll.c
Stephen Rothwell [Wed, 31 Oct 2012 05:46:13 +0000 (16:46 +1100)]
Merge remote-tracking branch 'drop-experimental/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 05:44:23 +0000 (16:44 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 31 Oct 2012 05:42:43 +0000 (16:42 +1100)]
Merge remote-tracking branch 'random/dev'
Stephen Rothwell [Wed, 31 Oct 2012 05:41:04 +0000 (16:41 +1100)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
arch/arm/include/asm/hardware/sp810.h
Stephen Rothwell [Wed, 31 Oct 2012 05:34:09 +0000 (16:34 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/sparc/kernel/sys_sparc_64.c
Stephen Rothwell [Wed, 31 Oct 2012 05:32:21 +0000 (16:32 +1100)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 05:30:39 +0000 (16:30 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Wed, 31 Oct 2012 05:29:06 +0000 (16:29 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 05:27:28 +0000 (16:27 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
Stephen Rothwell [Wed, 31 Oct 2012 05:25:53 +0000 (16:25 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 31 Oct 2012 05:24:13 +0000 (16:24 +1100)]
Merge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Wed, 31 Oct 2012 05:24:10 +0000 (16:24 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 31 Oct 2012 05:22:31 +0000 (16:22 +1100)]
Merge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 05:20:52 +0000 (16:20 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 05:19:16 +0000 (16:19 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/mach-omap2/drm.c
arch/arm/mach-ux500/cpu-db8500.c
Stephen Rothwell [Wed, 31 Oct 2012 04:41:24 +0000 (15:41 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:41:08 +0000 (15:41 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Wed, 31 Oct 2012 04:39:15 +0000 (15:39 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:32:30 +0000 (15:32 +1100)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:30:52 +0000 (15:30 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:28:56 +0000 (15:28 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:26:49 +0000 (15:26 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:24:26 +0000 (15:24 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:22:49 +0000 (15:22 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:21:11 +0000 (15:21 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:19:23 +0000 (15:19 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:17:29 +0000 (15:17 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:15:52 +0000 (15:15 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:14:15 +0000 (15:14 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:07:46 +0000 (15:07 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 04:05:01 +0000 (15:05 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Stephen Rothwell [Wed, 31 Oct 2012 03:49:43 +0000 (14:49 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Stephen Rothwell [Wed, 31 Oct 2012 03:01:26 +0000 (14:01 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 31 Oct 2012 02:53:54 +0000 (13:53 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 31 Oct 2012 02:52:15 +0000 (13:52 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:50:37 +0000 (13:50 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:48:59 +0000 (13:48 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:47:12 +0000 (13:47 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 31 Oct 2012 02:45:32 +0000 (13:45 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 31 Oct 2012 02:37:50 +0000 (13:37 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:36:11 +0000 (13:36 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:34:34 +0000 (13:34 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:29:25 +0000 (13:29 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 31 Oct 2012 02:27:40 +0000 (13:27 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 31 Oct 2012 02:27:32 +0000 (13:27 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 31 Oct 2012 02:20:39 +0000 (13:20 +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 [Wed, 31 Oct 2012 02:18:48 +0000 (13:18 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:16:55 +0000 (13:16 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:09:46 +0000 (13:09 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:09:37 +0000 (13:09 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:07:59 +0000 (13:07 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 31 Oct 2012 02:06:13 +0000 (13:06 +1100)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 31 Oct 2012 02:04:37 +0000 (13:04 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
drivers/block/floppy.c
init/Kconfig
Stephen Rothwell [Wed, 31 Oct 2012 01:18:09 +0000 (12:18 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 01:16:33 +0000 (12:16 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 31 Oct 2012 01:14:56 +0000 (12:14 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 31 Oct 2012 01:08:11 +0000 (12:08 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 31 Oct 2012 01:06:17 +0000 (12:06 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 01:04:21 +0000 (12:04 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 01:02:41 +0000 (12:02 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 31 Oct 2012 01:00:50 +0000 (12:00 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 31 Oct 2012 00:59:14 +0000 (11:59 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 31 Oct 2012 00:57:36 +0000 (11:57 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 31 Oct 2012 00:55:34 +0000 (11:55 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 31 Oct 2012 00:51:47 +0000 (11:51 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 31 Oct 2012 00:47:50 +0000 (11:47 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 31 Oct 2012 00:46:05 +0000 (11:46 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:44:22 +0000 (11:44 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:42:43 +0000 (11:42 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 31 Oct 2012 00:42:35 +0000 (11:42 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 31 Oct 2012 00:42:11 +0000 (11:42 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:29:27 +0000 (11:29 +1100)]
Merge commit 'refs/next/
20121026/v4l-dvb'
Stephen Rothwell [Wed, 31 Oct 2012 00:18:00 +0000 (11:18 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:16:32 +0000 (11:16 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 31 Oct 2012 00:14:59 +0000 (11:14 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 31 Oct 2012 00:13:23 +0000 (11:13 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:11:53 +0000 (11:11 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:10:17 +0000 (11:10 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:08:45 +0000 (11:08 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:08:38 +0000 (11:08 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:06:51 +0000 (11:06 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:05:18 +0000 (11:05 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 31 Oct 2012 00:03:40 +0000 (11:03 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 31 Oct 2012 00:02:08 +0000 (11:02 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 31 Oct 2012 00:00:30 +0000 (11:00 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 23:58:55 +0000 (10:58 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 23:57:18 +0000 (10:57 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Tue, 30 Oct 2012 23:55:48 +0000 (10:55 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 30 Oct 2012 23:54:21 +0000 (10:54 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 30 Oct 2012 23:52:53 +0000 (10:52 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 30 Oct 2012 23:51:23 +0000 (10:51 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Tue, 30 Oct 2012 23:51:20 +0000 (10:51 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 23:49:54 +0000 (10:49 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 30 Oct 2012 23:48:19 +0000 (10:48 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 23:46:48 +0000 (10:46 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 30 Oct 2012 23:45:16 +0000 (10:45 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 23:43:42 +0000 (10:43 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 23:42:12 +0000 (10:42 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 30 Oct 2012 23:40:45 +0000 (10:40 +1100)]
Merge remote-tracking branch 'arm64/upstream'
projects / karo-tx-linux.git / log