]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:45:46 +0000 (14:45 +1100)]
Merge remote-tracking branch 'tegra/for-next'

12 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:44:07 +0000 (14:44 +1100)]
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/boot/dts/exynos4210.dtsi

12 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 30 Oct 2012 03:29:24 +0000 (14:29 +1100)]
Merge remote-tracking branch 'renesas/next'

12 years agoMerge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Tue, 30 Oct 2012 03:27:38 +0000 (14:27 +1100)]
Merge remote-tracking branch 'ixp4xx/next'

12 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:27:33 +0000 (14:27 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

12 years agoMerge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:25:51 +0000 (14:25 +1100)]
Merge remote-tracking branch 'cortex/for-next'

12 years agoMerge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:24:07 +0000 (14:24 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'

12 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:22:22 +0000 (14:22 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/mach-ux500/cpu-db8500.c

12 years agoMerge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:20:34 +0000 (14:20 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'

12 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:19:43 +0000 (14:19 +1100)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c

12 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:17:40 +0000 (14:17 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

12 years agoMerge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:10:53 +0000 (14:10 +1100)]
Merge remote-tracking branch 'tmem/linux-next'

12 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:09:14 +0000 (14:09 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'

12 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:07:21 +0000 (14:07 +1100)]
Merge remote-tracking branch 'staging/staging-next'

12 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:05:10 +0000 (14:05 +1100)]
Merge remote-tracking branch 'usb/usb-next'

12 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:02:52 +0000 (14:02 +1100)]
Merge remote-tracking branch 'tty/tty-next'

12 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 30 Oct 2012 03:01:14 +0000 (14:01 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'

12 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:59:28 +0000 (13:59 +1100)]
Merge remote-tracking branch 'leds/for-next'

12 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:57:40 +0000 (13:57 +1100)]
Merge remote-tracking branch 'regmap/for-next'

12 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:55:42 +0000 (13:55 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'

12 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:54:04 +0000 (13:54 +1100)]
Merge remote-tracking branch 'workqueues/for-next'

12 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:52:28 +0000 (13:52 +1100)]
Merge remote-tracking branch 'percpu/for-next'

12 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:50:38 +0000 (13:50 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

12 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:48:47 +0000 (13:48 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

12 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:47:06 +0000 (13:47 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h

12 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 30 Oct 2012 02:39:36 +0000 (13:39 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'

12 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 30 Oct 2012 02:32:08 +0000 (13:32 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

12 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:30:27 +0000 (13:30 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'

12 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:28:50 +0000 (13:28 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'

12 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:27:10 +0000 (13:27 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

12 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Tue, 30 Oct 2012 02:25:20 +0000 (13:25 +1100)]
Merge remote-tracking branch 'edac/linux_next'

12 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:23:40 +0000 (13:23 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c

12 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:15:54 +0000 (13:15 +1100)]
Merge remote-tracking branch 'pm/linux-next'

12 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:14:10 +0000 (13:14 +1100)]
Merge remote-tracking branch 'trivial/for-next'

12 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 02:12:31 +0000 (13:12 +1100)]
Merge remote-tracking branch 'osd/linux-next'

12 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 30 Oct 2012 02:07:20 +0000 (13:07 +1100)]
Merge remote-tracking branch 'iommu/next'

12 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 30 Oct 2012 02:05:37 +0000 (13:05 +1100)]
Merge remote-tracking branch 'watchdog/master'

12 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Tue, 30 Oct 2012 02:05:31 +0000 (13:05 +1100)]
Merge remote-tracking branch 'selinux/master'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 30 Oct 2012 01:58:35 +0000 (12:58 +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

12 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:56:49 +0000 (12:56 +1100)]
Merge remote-tracking branch 'regulator/for-next'

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:54:56 +0000 (12:54 +1100)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:47:47 +0000 (12:47 +1100)]
Merge remote-tracking branch 'slab/for-next'

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:47:38 +0000 (12:47 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:46:03 +0000 (12:46 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

12 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Tue, 30 Oct 2012 01:44:17 +0000 (12:44 +1100)]
Merge branch 'quilt/device-mapper'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:42:32 +0000 (12:42 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig

12 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:38:11 +0000 (12:38 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 30 Oct 2012 01:36:22 +0000 (12:36 +1100)]
Merge remote-tracking branch 'input/next'

12 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:34:42 +0000 (12:34 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

12 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:27:51 +0000 (12:27 +1100)]
Merge remote-tracking branch 'modules/modules-next'

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:26:05 +0000 (12:26 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:24:14 +0000 (12:24 +1100)]
Merge remote-tracking branch 'sound/for-next'

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 30 Oct 2012 01:22:33 +0000 (12:22 +1100)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 30 Oct 2012 01:20:51 +0000 (12:20 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

12 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 30 Oct 2012 01:19:13 +0000 (12:19 +1100)]
Merge remote-tracking branch 'mtd/master'

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 30 Oct 2012 01:17:31 +0000 (12:17 +1100)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Tue, 30 Oct 2012 01:15:26 +0000 (12:15 +1100)]
Merge remote-tracking branch 'wireless-next/master'

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 30 Oct 2012 01:11:39 +0000 (12:11 +1100)]
Merge remote-tracking branch 'net-next/master'

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 30 Oct 2012 01:07:41 +0000 (12:07 +1100)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:05:55 +0000 (12:05 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

12 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:04:11 +0000 (12:04 +1100)]
Merge remote-tracking branch 'ubi/linux-next'

12 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 30 Oct 2012 01:02:30 +0000 (12:02 +1100)]
Merge remote-tracking branch 'thermal/next'

12 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:02:23 +0000 (12:02 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 01:01:59 +0000 (12:01 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge commit 'refs/next/20121026/v4l-dvb'
Stephen Rothwell [Tue, 30 Oct 2012 01:00:05 +0000 (12:00 +1100)]
Merge commit 'refs/next/20121026/v4l-dvb'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:53:19 +0000 (11:53 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 30 Oct 2012 00:51:43 +0000 (11:51 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Tue, 30 Oct 2012 00:50:14 +0000 (11:50 +1100)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:48:33 +0000 (11:48 +1100)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:47:03 +0000 (11:47 +1100)]
Merge remote-tracking branch 'vfs/for-next'

12 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:45:23 +0000 (11:45 +1100)]
Merge remote-tracking branch 'xfs/for-next'

12 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:43:50 +0000 (11:43 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

12 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:43:43 +0000 (11:43 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:41:54 +0000 (11:41 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:40:18 +0000 (11:40 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 30 Oct 2012 00:38:42 +0000 (11:38 +1100)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 30 Oct 2012 00:37:12 +0000 (11:37 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:35:31 +0000 (11:35 +1100)]
Merge remote-tracking branch 'fuse/for-next'

12 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:33:54 +0000 (11:33 +1100)]
Merge remote-tracking branch 'cifs/for-next'

12 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Tue, 30 Oct 2012 00:32:18 +0000 (11:32 +1100)]
Merge remote-tracking branch 'ceph/master'

12 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 30 Oct 2012 00:30:47 +0000 (11:30 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 30 Oct 2012 00:29:18 +0000 (11:29 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 30 Oct 2012 00:27:43 +0000 (11:27 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Tue, 30 Oct 2012 00:26:13 +0000 (11:26 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:26:10 +0000 (11:26 +1100)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 30 Oct 2012 00:24:43 +0000 (11:24 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:23:15 +0000 (11:23 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 30 Oct 2012 00:21:42 +0000 (11:21 +1100)]
Merge remote-tracking branch 'microblaze/next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:20:10 +0000 (11:20 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:18:36 +0000 (11:18 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 30 Oct 2012 00:17:04 +0000 (11:17 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Tue, 30 Oct 2012 00:15:37 +0000 (11:15 +1100)]
Merge remote-tracking branch 'arm64/upstream'

12 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:14:10 +0000 (11:14 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'

12 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 30 Oct 2012 00:12:36 +0000 (11:12 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 30 Oct 2012 00:11:07 +0000 (11:11 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Tue, 30 Oct 2012 00:09:40 +0000 (11:09 +1100)]
Merge remote-tracking branch 'asm-generic/master'

12 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Tue, 30 Oct 2012 00:07:39 +0000 (11:07 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'

12 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Tue, 30 Oct 2012 00:07:28 +0000 (11:07 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

12 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 30 Oct 2012 00:07:19 +0000 (11:07 +1100)]
Merge remote-tracking branch 'crypto-current/master'

12 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 30 Oct 2012 00:07:09 +0000 (11:07 +1100)]
Merge remote-tracking branch 'input-current/for-linus'