[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-mips-cvs
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From: linux-mips () linux-mips ! org
Date: 2012-08-29 13:45:08
Message-ID: S1903390Ab2H2NpL/20120829134511Z+234 () eddie ! linux-mips ! org
[Download RAW message or body]
Author: Ralf Baechle <ralf@linux-mips.org> Tue Aug 28 12:28:36 2012 +0200
Commit: fda8cdfba16dc1b891c0f039697ab44c750c9386
Gitweb: http://git.linux-mips.org/g/ralf/linux/fda8cdfba16d
Branch: master
---
Documentation/block/00-INDEX | 10 +-
Documentation/block/cfq-iosched.txt | 77 +++++++++++++
Documentation/block/queue-sysfs.txt | 64 +++++++++++
.../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 8 +
arch/arm/Kconfig | 1
arch/arm/boot/dts/am33xx.dtsi | 5 +
arch/arm/boot/dts/imx51-babbage.dts | 4 -
arch/arm/boot/dts/kirkwood-iconnect.dts | 6 +
arch/arm/boot/dts/twl6030.dtsi | 3 +
arch/arm/configs/u8500_defconfig | 1
arch/arm/mach-dove/common.c | 3 -
arch/arm/mach-exynos/mach-origen.c | 7 +
arch/arm/mach-exynos/mach-smdkv310.c | 7 +
arch/arm/mach-imx/Makefile | 10 +-
arch/arm/mach-imx/clk-imx6q.c | 8 +
arch/arm/mach-imx/head-v7.S | 106 ------------------
arch/arm/mach-imx/headsmp.S | 106 ++++++++++++++++++
arch/arm/mach-imx/hotplug.c | 23 +---
arch/arm/mach-imx/mach-imx6q.c | 4 -
arch/arm/mach-kirkwood/Makefile.boot | 3 -
arch/arm/mach-kirkwood/common.c | 4 -
arch/arm/mach-mmp/sram.c | 2
arch/arm/mach-mv78xx0/addr-map.c | 2
arch/arm/mach-mv78xx0/common.c | 6 +
arch/arm/mach-omap2/Kconfig | 3 -
arch/arm/mach-omap2/board-igep0020.c | 2
arch/arm/mach-omap2/board-omap3evm.c | 1
arch/arm/mach-omap2/common-board-devices.c | 11 --
arch/arm/mach-omap2/common-board-devices.h | 1
arch/arm/mach-omap2/cpuidle44xx.c | 3 -
arch/arm/mach-omap2/mux.h | 1
arch/arm/mach-omap2/opp4xxx_data.c | 2
arch/arm/mach-omap2/pm34xx.c | 19 +--
arch/arm/mach-omap2/sleep44xx.S | 8 +
arch/arm/mach-omap2/twl-common.c | 1
arch/arm/mach-orion5x/common.c | 3 -
arch/arm/mach-s3c24xx/include/mach/dma.h | 3 -
arch/arm/mach-ux500/Kconfig | 1
arch/arm/mach-ux500/board-mop500-msp.c | 10 +-
arch/arm/mach-ux500/board-mop500.c | 4 +
arch/arm/plat-omap/dmtimer.c | 6 +
arch/arm/plat-omap/include/plat/cpu.h | 3 -
arch/arm/plat-omap/include/plat/multi.h | 9 ++
arch/arm/plat-omap/include/plat/uncompress.h | 4 -
arch/arm/plat-orion/common.c | 8 +
arch/arm/plat-orion/include/plat/common.h | 6 +
arch/arm/plat-s3c24xx/dma.c | 2
arch/arm/plat-samsung/devs.c | 29 +++++
arch/arm/plat-samsung/include/plat/hdmi.h | 16 +++
arch/arm/plat-samsung/pm.c | 2
arch/mips/bcm63xx/dev-spi.c | 4 +
.../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 2
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 13 ++
arch/mips/pci/pci-ar724x.c | 22 ++++
arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 7 +
arch/powerpc/configs/85xx/p1023rds_defconfig | 31 ++---
arch/powerpc/configs/corenet32_smp_defconfig | 29 ++---
arch/powerpc/configs/corenet64_smp_defconfig | 1
arch/powerpc/configs/g5_defconfig | 103 ++++++++++++-----
arch/powerpc/configs/mpc83xx_defconfig | 18 +--
arch/powerpc/configs/mpc85xx_defconfig | 33 ++----
arch/powerpc/configs/mpc85xx_smp_defconfig | 32 +----
arch/powerpc/include/asm/cputable.h | 2
arch/powerpc/include/asm/kvm_host.h | 1
arch/powerpc/include/asm/kvm_ppc.h | 12 ++
arch/powerpc/include/asm/mpic_msgr.h | 1
arch/powerpc/kernel/dma-iommu.c | 9 +-
arch/powerpc/kernel/hw_breakpoint.c | 2
arch/powerpc/kernel/kgdb.c | 27 ++++-
arch/powerpc/kernel/syscalls.c | 8 +
arch/powerpc/kvm/book3s_32_mmu_host.c | 3 +
arch/powerpc/kvm/book3s_64_mmu_host.c | 2
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 12 +-
arch/powerpc/kvm/e500_tlb.c | 11 +-
arch/powerpc/lib/copyuser_power7.S | 35 ------
arch/powerpc/lib/memcpy_power7.S | 4 -
arch/powerpc/mm/mem.c | 1
arch/powerpc/perf/core-book3s.c | 2
arch/powerpc/sysdev/fsl_pci.c | 13 +-
arch/powerpc/sysdev/mpic_msgr.c | 3 +
arch/powerpc/xmon/xmon.c | 84 ++++++--------
arch/x86/include/asm/spinlock.h | 3 -
arch/x86/kernel/alternative.c | 2
arch/x86/kernel/irq.c | 2
arch/x86/kernel/microcode_amd.c | 7 +
arch/x86/kvm/emulate.c | 30 ++++-
arch/x86/kvm/mmu.c | 13 ++
arch/x86/kvm/x86.c | 2
arch/x86/xen/enlighten.c | 118 ++------------------
arch/x86/xen/p2m.c | 95 ++++++++++++++++
arch/x86/xen/setup.c | 9 +-
arch/x86/xen/suspend.c | 2
arch/x86/xen/xen-ops.h | 2
block/blk-lib.c | 41 +++++--
block/blk-merge.c | 117 ++++++++++++++------
block/genhd.c | 2
drivers/ata/Kconfig | 2
drivers/ata/ahci.c | 8 +
drivers/ata/ahci.h | 1
drivers/ata/ata_piix.c | 8 +
drivers/ata/libahci.c | 3 -
drivers/ata/libata-acpi.c | 15 +--
drivers/ata/libata-core.c | 3 -
drivers/ata/pata_atiixp.c | 16 +++
drivers/block/drbd/drbd_bitmap.c | 15 ++-
drivers/block/drbd/drbd_int.h | 1
drivers/block/drbd/drbd_main.c | 28 ++---
drivers/block/drbd/drbd_nl.c | 4 -
drivers/block/drbd/drbd_req.c | 36 +++++-
drivers/cpufreq/omap-cpufreq.c | 4 +
drivers/crypto/caam/jr.c | 10 +-
drivers/crypto/hifn_795x.c | 4 -
drivers/hid/hid-core.c | 1
drivers/hwmon/asus_atk0110.c | 6 +
drivers/ide/ide-pm.c | 4 -
drivers/spi/spi-bcm63xx.c | 31 ++++-
drivers/watchdog/booke_wdt.c | 7 +
drivers/xen/platform-pci.c | 15 ---
fs/bio.c | 11 +-
fs/block_dev.c | 3 +
fs/buffer.c | 66 +++++------
fs/direct-io.c | 5 +
fs/jbd/journal.c | 5 +
fs/logfs/dev_bdev.c | 15 +--
fs/logfs/inode.c | 18 +++
fs/logfs/journal.c | 2
fs/logfs/readwrite.c | 1
fs/logfs/segment.c | 2
fs/nfsd/nfs4callback.c | 4 -
fs/nfsd/state.h | 1
fs/quota/dquot.c | 2
fs/reiserfs/bitmap.c | 2
fs/reiserfs/inode.c | 2
fs/ubifs/debug.h | 2
fs/ubifs/lpt.c | 5 +
fs/ubifs/recovery.c | 2
fs/ubifs/replay.c | 3 -
fs/ubifs/super.c | 3 -
fs/udf/inode.c | 5 +
fs/udf/super.c | 7 +
fs/xfs/xfs_discard.c | 6 +
fs/xfs/xfs_ialloc.c | 17 ++-
fs/xfs/xfs_rtalloc.c | 2
include/linux/blkdev.h | 14 ++
include/linux/cpuidle.h | 4 +
include/linux/ktime.h | 7 -
include/linux/mv643xx_eth.h | 2
include/linux/time.h | 22 +++-
include/xen/events.h | 2
kernel/fork.c | 4 -
kernel/time/timekeeping.c | 37 +++++-
kernel/trace/trace_syscalls.c | 4 +
mm/filemap.c | 7 -
mm/mmap.c | 5 -
net/sunrpc/svc_xprt.c | 10 +-
net/sunrpc/svcsock.c | 2
tools/perf/util/python-ext-sources | 2
157 files changed, 1305 insertions(+), 830 deletions(-)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic