]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 31 Aug 2011 03:52:26 +0000 (13:52 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Wed, 31 Aug 2011 03:50:57 +0000 (13:50 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 03:49:36 +0000 (13:49 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Wed, 31 Aug 2011 03:48:16 +0000 (13:48 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Wed, 31 Aug 2011 03:46:46 +0000 (13:46 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 03:45:27 +0000 (13:45 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 03:44:02 +0000 (13:44 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 31 Aug 2011 03:38:36 +0000 (13:38 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Wed, 31 Aug 2011 03:32:46 +0000 (13:32 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Wed, 31 Aug 2011 03:31:20 +0000 (13:31 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 31 Aug 2011 03:24:55 +0000 (13:24 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 31 Aug 2011 03:19:06 +0000 (13:19 +1000)]
Revert "Merge branch 'x86/spinlocks' into auto-latest"
This reverts commit
6f8fa39c81f12d98540598db42a1eaff65bba0ce, reversing
changes made to
4977f9bf2d9b511d36199ab3451a2592d6bc3793.
Stephen Rothwell [Wed, 31 Aug 2011 03:10:11 +0000 (13:10 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/mm/fault.c
Stephen Rothwell [Wed, 31 Aug 2011 03:09:52 +0000 (13:09 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
drivers/of/base.c
Stephen Rothwell [Wed, 31 Aug 2011 03:08:31 +0000 (13:08 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Wed, 31 Aug 2011 03:06:47 +0000 (13:06 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Wed, 31 Aug 2011 03:04:03 +0000 (13:04 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 03:02:41 +0000 (13:02 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:56:22 +0000 (12:56 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
arch/s390/include/asm/thread_info.h
drivers/mfd/twl4030-irq.c
Stephen Rothwell [Wed, 31 Aug 2011 02:54:57 +0000 (12:54 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:53:35 +0000 (12:53 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:52:16 +0000 (12:52 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 31 Aug 2011 02:50:49 +0000 (12:50 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 31 Aug 2011 02:50:09 +0000 (12:50 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:47:36 +0000 (12:47 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Wed, 31 Aug 2011 02:46:13 +0000 (12:46 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:44:49 +0000 (12:44 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:43:27 +0000 (12:43 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:42:03 +0000 (12:42 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:35:43 +0000 (12:35 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:35:34 +0000 (12:35 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:34:13 +0000 (12:34 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:34:06 +0000 (12:34 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Wed, 31 Aug 2011 02:32:21 +0000 (12:32 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 31 Aug 2011 02:30:51 +0000 (12:30 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 31 Aug 2011 02:24:58 +0000 (12:24 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:23:13 +0000 (12:23 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 31 Aug 2011 02:21:54 +0000 (12:21 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Wed, 31 Aug 2011 02:20:37 +0000 (12:20 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 31 Aug 2011 02:19:20 +0000 (12:19 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:17:54 +0000 (12:17 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 02:12:36 +0000 (12:12 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 31 Aug 2011 02:11:18 +0000 (12:11 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
drivers/mtd/maps/lantiq-flash.c
Stephen Rothwell [Wed, 31 Aug 2011 02:09:53 +0000 (12:09 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 31 Aug 2011 02:08:20 +0000 (12:08 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
Stephen Rothwell [Wed, 31 Aug 2011 02:02:48 +0000 (12:02 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
Stephen Rothwell [Wed, 31 Aug 2011 01:57:49 +0000 (11:57 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/amba-pl08x.c
Stephen Rothwell [Wed, 31 Aug 2011 01:55:42 +0000 (11:55 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:55:38 +0000 (11:55 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:55:32 +0000 (11:55 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:54:08 +0000 (11:54 +1000)]
Merge remote-tracking branch 'acpi/test'
Stephen Rothwell [Wed, 31 Aug 2011 01:52:49 +0000 (11:52 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 31 Aug 2011 01:52:44 +0000 (11:52 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:51:21 +0000 (11:51 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:50:01 +0000 (11:50 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Wed, 31 Aug 2011 01:48:48 +0000 (11:48 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Wed, 31 Aug 2011 01:47:37 +0000 (11:47 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:46:25 +0000 (11:46 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 31 Aug 2011 01:45:07 +0000 (11:45 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Wed, 31 Aug 2011 01:43:55 +0000 (11:43 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 31 Aug 2011 01:42:39 +0000 (11:42 +1000)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Stephen Rothwell [Wed, 31 Aug 2011 01:41:23 +0000 (11:41 +1000)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:40:11 +0000 (11:40 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:38:59 +0000 (11:38 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:37:34 +0000 (11:37 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:31:40 +0000 (11:31 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:30:26 +0000 (11:30 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:29:13 +0000 (11:29 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:28:00 +0000 (11:28 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:26:42 +0000 (11:26 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 31 Aug 2011 01:25:25 +0000 (11:25 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:24:12 +0000 (11:24 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:23:01 +0000 (11:23 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:21:51 +0000 (11:21 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 31 Aug 2011 01:20:40 +0000 (11:20 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 31 Aug 2011 01:19:27 +0000 (11:19 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Wed, 31 Aug 2011 01:18:16 +0000 (11:18 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 31 Aug 2011 01:17:05 +0000 (11:17 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 31 Aug 2011 01:15:49 +0000 (11:15 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 31 Aug 2011 01:14:37 +0000 (11:14 +1000)]
Merge remote-tracking branch '4xx/next'
Stephen Rothwell [Wed, 31 Aug 2011 01:13:25 +0000 (11:13 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 31 Aug 2011 01:12:09 +0000 (11:12 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:10:53 +0000 (11:10 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:09:43 +0000 (11:09 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:08:31 +0000 (11:08 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Wed, 31 Aug 2011 01:07:14 +0000 (11:07 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 01:06:02 +0000 (11:06 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 31 Aug 2011 01:04:51 +0000 (11:04 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Wed, 31 Aug 2011 01:03:38 +0000 (11:03 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
Stephen Rothwell [Wed, 31 Aug 2011 00:58:21 +0000 (10:58 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-u300/Makefile.boot
Stephen Rothwell [Wed, 31 Aug 2011 00:57:03 +0000 (10:57 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
Stephen Rothwell [Wed, 31 Aug 2011 00:55:45 +0000 (10:55 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 31 Aug 2011 00:54:20 +0000 (10:54 +1000)]
Merge remote-tracking branch 'md-current/for-linus'
Stephen Rothwell [Wed, 31 Aug 2011 00:54:17 +0000 (10:54 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 31 Aug 2011 00:54:14 +0000 (10:54 +1000)]
Merge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Wed, 31 Aug 2011 00:54:13 +0000 (10:54 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 31 Aug 2011 00:54:12 +0000 (10:54 +1000)]
Merge remote-tracking branch 'net-current/master'
Stephen Rothwell [Wed, 31 Aug 2011 00:54:11 +0000 (10:54 +1000)]
Merge remote-tracking branch 'scsi-rc-fixes/master'
Wang Sheng-Hui [Mon, 29 Aug 2011 07:55:59 +0000 (15:55 +0800)]
virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx
Based on the layout description in the comments, take account of
the *_event_idx in functions vring_init and vring_size.
Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Marcos Paulo Souza [Wed, 31 Aug 2011 00:43:55 +0000 (10:43 +1000)]
Removed the email for support and fixes for orphaned ip2 driver.
Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
projects / karo-tx-linux.git / log