diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 3942 |
1 files changed, 3942 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..6e65f817b44b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3942 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f878133 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 +Merging origin/master +$ git merge origin/master +Updating f878133..581548d +Fast-forward + CREDITS | 4 +- + Documentation/ABI/testing/sysfs-class-led | 9 + + Documentation/DocBook/mtdnand.tmpl | 2 +- + Documentation/cgroups/blkio-controller.txt | 27 + + Documentation/cgroups/cgroup_event_listener.c | 2 +- + Documentation/cgroups/cgroups.txt | 8 +- + Documentation/cgroups/memcg_test.txt | 2 +- + Documentation/email-clients.txt | 50 +- + Documentation/feature-removal-schedule.txt | 24 + + Documentation/filesystems/porting | 9 + + Documentation/gpio.txt | 2 +- + Documentation/hwmon/adm9240 | 2 +- + Documentation/hwmon/ads7828 | 2 +- + Documentation/hwmon/dme1737 | 12 +- + Documentation/hwmon/w83627hf | 22 + + Documentation/hwmon/w83793 | 2 +- + Documentation/input/ff.txt | 4 +- + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/iostats.txt | 2 +- + Documentation/kdump/kdump.txt | 15 +- + Documentation/kernel-parameters.txt | 9 +- + Documentation/ko_KR/HOWTO | 4 +- + Documentation/kprobes.txt | 2 +- + Documentation/kvm/api.txt | 180 +- + Documentation/kvm/cpuid.txt | 3 + + Documentation/kvm/msr.txt | 36 +- + Documentation/lguest/lguest.txt | 7 +- + Documentation/magic-number.txt | 2 +- + Documentation/networking/bridge.txt | 4 +- + Documentation/networking/caif/spi_porting.txt | 2 +- + Documentation/networking/dccp.txt | 4 +- + Documentation/networking/generic_netlink.txt | 2 +- + Documentation/nfc/nfc-pn544.txt | 114 + + Documentation/powerpc/booting-without-of.txt | 2 +- + Documentation/pps/pps.txt | 46 + + Documentation/scheduler/00-INDEX | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + Documentation/serial/tty.txt | 2 +- + Documentation/sound/alsa/ALSA-Configuration.txt | 20 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 1 - + Documentation/sysctl/00-INDEX | 2 - + Documentation/sysctl/kernel.txt | 14 + + Documentation/timers/timer_stats.txt | 2 +- + Documentation/trace/events.txt | 8 +- + Documentation/w1/slaves/00-INDEX | 2 + + Documentation/w1/slaves/w1_ds2423 | 47 + + Documentation/x86/boot.txt | 6 +- + Documentation/xz.txt | 121 + + Documentation/zh_CN/HOWTO | 4 +- + Documentation/zh_CN/SubmittingDrivers | 2 +- + MAINTAINERS | 66 +- + arch/alpha/kernel/time.c | 2 +- + arch/arm/common/it8152.c | 2 +- + arch/arm/common/vic.c | 2 +- + arch/arm/mach-at91/board-ecbat91.c | 6 +- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +- + arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +- + arch/arm/mach-bcmring/dma.c | 2 +- + arch/arm/mach-bcmring/include/csp/dmacHw.h | 2 +- + arch/arm/mach-bcmring/include/csp/tmrHw.h | 4 +- + .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +- + .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 2 +- + arch/arm/mach-davinci/pm.c | 2 +- + arch/arm/mach-gemini/include/mach/hardware.h | 2 +- + arch/arm/mach-imx/mach-pcm038.c | 4 +- + arch/arm/mach-imx/pm-imx27.c | 2 +- + arch/arm/mach-kirkwood/openrd-setup.c | 2 +- + arch/arm/mach-lpc32xx/pm.c | 2 +- + arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 4 +- + arch/arm/mach-mx3/mach-mx31moboard.c | 4 +- + arch/arm/mach-omap1/pm.c | 2 +- + arch/arm/mach-omap2/Makefile | 3 + + arch/arm/mach-omap2/board-3430sdp.c | 12 +- + arch/arm/mach-omap2/board-3630sdp.c | 1 + + arch/arm/mach-omap2/board-am3517evm.c | 23 +- + arch/arm/mach-omap2/board-cm-t35.c | 23 +- + arch/arm/mach-omap2/board-devkit8000.c | 26 +- + arch/arm/mach-omap2/board-igep0020.c | 12 +- + arch/arm/mach-omap2/board-omap3beagle.c | 12 +- + arch/arm/mach-omap2/board-omap3evm.c | 12 +- + arch/arm/mach-omap2/board-omap3stalker.c | 23 +- + arch/arm/mach-omap2/board-zoom-display.c | 168 + + arch/arm/mach-omap2/board-zoom-peripherals.c | 49 +- + arch/arm/mach-omap2/board-zoom.c | 1 + + arch/arm/mach-omap2/cpuidle34xx.c | 2 +- + arch/arm/mach-omap2/include/mach/board-zoom.h | 3 + + arch/arm/mach-omap2/pm24xx.c | 2 +- + arch/arm/mach-omap2/pm34xx.c | 2 +- + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-pnx4008/pm.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/pm.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 2 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- + arch/arm/mach-s3c64xx/clock.c | 2 +- + arch/arm/mach-s3c64xx/dev-audio.c | 75 +- + arch/arm/mach-s3c64xx/dma.c | 2 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-s5p6442/dev-audio.c | 44 +- + arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 +- + arch/arm/mach-s5p64x0/dev-audio.c | 55 +- + arch/arm/mach-s5pc100/dev-audio.c | 56 +- + arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + + arch/arm/mach-s5pv210/clock.c | 10 +- + arch/arm/mach-s5pv210/dev-audio.c | 58 +- + arch/arm/mach-s5pv310/Kconfig | 1 + + arch/arm/mach-s5pv310/Makefile | 3 +- + arch/arm/mach-s5pv310/dev-audio.c | 364 ++ + arch/arm/mach-s5pv310/dma.c | 168 + + arch/arm/mach-s5pv310/include/mach/dma.h | 26 + + arch/arm/mach-s5pv310/include/mach/irqs.h | 3 + + arch/arm/mach-s5pv310/include/mach/map.h | 21 + + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-shmobile/board-ap4evb.c | 13 +- + arch/arm/mach-shmobile/board-g4evm.c | 15 + + arch/arm/mach-shmobile/board-mackerel.c | 35 +- + .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 7 + + .../mach-shmobile/include/mach/head-mackerel.txt | 7 + + arch/arm/mach-shmobile/intc-sh7367.c | 6 +- + arch/arm/mach-shmobile/intc-sh7372.c | 4 +- + arch/arm/mach-shmobile/intc-sh7377.c | 4 +- + arch/arm/mach-shmobile/setup-sh7367.c | 14 + + arch/arm/mach-shmobile/setup-sh7372.c | 14 + + arch/arm/mach-shmobile/setup-sh7377.c | 16 + + arch/arm/mach-shmobile/setup-sh73a0.c | 18 + + arch/arm/mach-spear3xx/spear300.c | 4 +- + arch/arm/mach-spear3xx/spear310.c | 2 +- + arch/arm/mach-spear3xx/spear320.c | 2 +- + arch/arm/mach-spear3xx/spear3xx.c | 6 +- + arch/arm/mach-spear6xx/spear6xx.c | 4 +- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-u300/include/mach/coh901318.h | 4 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 153 +- + arch/arm/mach-ux500/board-mop500-regulators.h | 19 + + arch/arm/mach-ux500/board-mop500.c | 3 + + arch/arm/mm/flush.c | 1 - + arch/arm/plat-mxc/include/mach/irqs.h | 2 +- + arch/arm/plat-omap/include/plat/display.h | 9 + + arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +- + .../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 + + arch/arm/plat-s3c24xx/devs.c | 19 +- + arch/arm/plat-samsung/Makefile | 1 + + arch/arm/plat-samsung/dev-asocdma.c | 25 + + arch/arm/plat-samsung/include/plat/audio.h | 24 + + arch/arm/plat-samsung/include/plat/devs.h | 11 +- + arch/arm/plat-samsung/pm.c | 2 +- + arch/avr32/mach-at32ap/pm.c | 2 +- + arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +- + arch/blackfin/mach-common/pm.c | 2 +- + arch/cris/arch-v32/lib/nand_init.S | 2 +- + arch/cris/include/asm/etraxgpio.h | 2 +- + arch/cris/kernel/time.c | 2 +- + arch/h8300/Kconfig.debug | 2 +- + arch/ia64/include/asm/kvm_host.h | 4 + + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/perfmon.c | 6 +- + arch/ia64/kvm/kvm-ia64.c | 30 +- + arch/ia64/kvm/mmio.c | 2 +- + arch/m68k/ifpsp060/src/fpsp.S | 2 +- + arch/m68k/include/asm/m548xgpt.h | 2 + + arch/m68k/mac/psc.c | 2 +- + arch/mips/alchemy/common/power.c | 2 +- + arch/mips/alchemy/devboards/pm.c | 2 +- + arch/mips/dec/time.c | 2 +- + arch/mips/include/asm/mach-powertv/ioremap.h | 2 +- + arch/mips/include/asm/mc146818-time.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 4 +- + arch/mips/jz4740/gpio.c | 2 +- + arch/mips/jz4740/pm.c | 2 +- + arch/mips/loongson/common/pm.c | 2 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/pci/pcie-octeon.c | 2 +- + arch/mips/powertv/memory.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/mn10300/Kconfig | 6 +- + arch/mn10300/kernel/rtc.c | 2 +- + arch/powerpc/include/asm/8xx_immap.h | 4 +- + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/powerpc.c | 20 +- + arch/powerpc/oprofile/op_model_cell.c | 2 +- + arch/powerpc/platforms/52xx/lite5200_pm.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +- + arch/powerpc/platforms/83xx/suspend-asm.S | 6 +- + arch/powerpc/platforms/83xx/suspend.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- + arch/powerpc/platforms/ps3/device-init.c | 4 +- + arch/powerpc/platforms/ps3/interrupt.c | 2 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/suspend.c | 2 +- + arch/powerpc/sysdev/fsl_pmc.c | 2 +- + arch/powerpc/sysdev/fsl_rio.c | 1 - + arch/s390/kvm/kvm-s390.c | 23 +- + arch/sh/boards/Kconfig | 18 + + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-apsh4a3a.c | 175 + + arch/sh/boards/board-apsh4ad0a.c | 125 + + arch/sh/boards/board-edosk7705.c | 2 +- + arch/sh/boards/board-edosk7760.c | 2 +- + arch/sh/boards/board-sh7785lcr.c | 2 +- + arch/sh/boards/mach-ap325rxa/setup.c | 16 + + arch/sh/boards/mach-cayman/setup.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 2 + + arch/sh/boards/mach-hp6xx/pm.c | 2 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 + + arch/sh/boards/mach-landisk/irq.c | 59 +- + arch/sh/boards/mach-landisk/setup.c | 4 +- + arch/sh/boards/mach-migor/setup.c | 2 + + arch/sh/boards/mach-r2d/setup.c | 2 +- + arch/sh/boards/mach-sdk7786/setup.c | 4 +- + arch/sh/boards/mach-se/7206/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 8 + + arch/sh/boards/mach-se/7751/setup.c | 2 +- + arch/sh/boards/mach-sh03/rtc.c | 2 +- + arch/sh/boards/mach-sh03/setup.c | 2 +- + arch/sh/boot/romimage/mmcif-sh7724.c | 7 +- + arch/sh/configs/apsh4a3a_defconfig | 102 + + arch/sh/configs/apsh4ad0a_defconfig | 133 + + arch/sh/configs/sh7757lcr_defconfig | 11 +- + arch/sh/drivers/pci/fixups-landisk.c | 28 +- + arch/sh/include/asm/io.h | 61 +- + arch/sh/include/asm/machvec.h | 1 + + arch/sh/include/asm/pgtable_32.h | 15 +- + arch/sh/include/asm/processor.h | 2 +- + arch/sh/include/asm/processor_32.h | 6 +- + arch/sh/include/mach-landisk/mach/iodata_landisk.h | 6 +- + arch/sh/kernel/cpu/proc.c | 2 +- + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 6 + + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 2 + + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 16 + + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 8 + + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 8 + + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 5 + + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 6 + + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 6 + + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 6 +- + arch/sh/kernel/cpu/sh4/probe.c | 6 + + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 2 + + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 36 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 8 + + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 33 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 26 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 8 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 16 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 16 +- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 + + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 6 + + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 20 + + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 12 + + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 12 + + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 12 + + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 6 + + arch/sh/kernel/cpu/sh5/setup-sh5.c | 2 + + arch/sh/kernel/cpu/shmobile/pm.c | 2 +- + arch/sh/mm/cache-sh5.c | 2 +- + arch/sh/mm/init.c | 10 +- + arch/sh/tools/mach-types | 3 + + arch/sparc/kernel/traps_64.c | 2 +- + arch/um/Kconfig.um | 2 +- + arch/um/drivers/line.c | 4 +- + arch/um/drivers/mmapper_kern.c | 9 +- + arch/x86/Kconfig | 12 +- + arch/x86/boot/compressed/Makefile | 5 +- + arch/x86/boot/compressed/misc.c | 4 + + arch/x86/boot/compressed/mkpiggy.c | 2 +- + arch/x86/crypto/aesni-intel_asm.S | 1832 +++++++++- + arch/x86/crypto/aesni-intel_glue.c | 540 +++- + arch/x86/include/asm/boot.h | 6 +- + arch/x86/include/asm/irq.h | 3 + + arch/x86/include/asm/kvm_emulate.h | 35 +- + arch/x86/include/asm/kvm_host.h | 99 +- + arch/x86/include/asm/kvm_para.h | 24 + + arch/x86/include/asm/olpc.h | 10 +- + arch/x86/include/asm/olpc_ofw.h | 9 + + arch/x86/include/asm/pgalloc.h | 2 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/prom.h | 1 + + arch/x86/include/asm/svm.h | 57 +- + arch/x86/include/asm/traps.h | 1 + + arch/x86/include/asm/vmx.h | 15 + + arch/x86/kernel/amd_iommu.c | 4 +- + arch/x86/kernel/entry_32.S | 10 + + arch/x86/kernel/entry_64.S | 3 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/i387.c | 1 + + arch/x86/kernel/irq.c | 10 + + arch/x86/kernel/kvm.c | 317 ++ + arch/x86/kernel/kvmclock.c | 13 +- + arch/x86/kernel/rtc.c | 2 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/emulate.c | 367 +- + arch/x86/kvm/kvm_cache_regs.h | 22 + + arch/x86/kvm/lapic.c | 3 +- + arch/x86/kvm/mmu.c | 251 +- + arch/x86/kvm/mmu_audit.c | 39 +- + arch/x86/kvm/paging_tmpl.h | 147 +- + arch/x86/kvm/svm.c | 865 +++-- + arch/x86/kvm/trace.h | 17 +- + arch/x86/kvm/vmx.c | 156 +- + arch/x86/kvm/x86.c | 474 ++- + arch/x86/mm/init_32.c | 2 + + arch/x86/platform/mrst/early_printk_mrst.c | 2 +- + arch/x86/platform/olpc/Makefile | 1 + + arch/x86/platform/olpc/olpc_dt.c | 183 + + arch/x86/platform/olpc/olpc_ofw.c | 5 + + block/blk-cgroup.c | 4 - + block/blk-core.c | 40 +- + block/blk-ioc.c | 5 +- + block/blk-merge.c | 3 +- + block/cfq-iosched.c | 114 +- + block/genhd.c | 550 +++- + block/ioctl.c | 5 +- + crypto/Kconfig | 34 +- + crypto/Makefile | 17 +- + crypto/af_alg.c | 483 +++ + crypto/algif_hash.c | 319 ++ + crypto/algif_skcipher.c | 632 +++ + crypto/authenc.c | 22 +- + crypto/cast5.c | 74 +- + crypto/crypto_wq.c | 3 +- + crypto/deflate.c | 3 +- + crypto/eseqiv.c | 18 +- + crypto/gcm.c | 19 +- + crypto/pcrypt.c | 3 +- + crypto/rmd128.c | 3 +- + crypto/rmd160.c | 3 +- + crypto/rmd256.c | 3 +- + crypto/rmd320.c | 3 +- + crypto/shash.c | 8 +- + crypto/tcrypt.c | 11 + + crypto/testmgr.c | 24 + + crypto/testmgr.h | 361 ++ + crypto/zlib.c | 3 +- + drivers/Kconfig | 2 + + drivers/Makefile | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/apei/einj.c | 2 +- + drivers/acpi/apei/erst.c | 2 +- + drivers/acpi/sleep.c | 8 +- + drivers/acpi/video.c | 2 +- + drivers/ata/libata-core.c | 4 +- + drivers/ata/sata_vsc.c | 2 +- + drivers/atm/idt77252.h | 2 +- + drivers/atm/iphase.c | 4 +- + drivers/base/bus.c | 2 +- + drivers/base/power/main.c | 2 +- + drivers/block/cciss.c | 23 +- + drivers/block/cciss.h | 4 +- + drivers/block/cciss_cmd.h | 2 +- + drivers/block/drbd/drbd_int.h | 2 - + drivers/block/drbd/drbd_main.c | 7 +- + drivers/block/drbd/drbd_nl.c | 105 +- + drivers/block/floppy.c | 15 +- + drivers/block/loop.c | 6 +- + drivers/block/pktcdvd.c | 22 +- + drivers/block/rbd.c | 19 +- + drivers/cdrom/cdrom.c | 56 +- + drivers/char/Kconfig | 9 - + drivers/char/Makefile | 1 - + drivers/char/hw_random/via-rng.c | 10 +- + drivers/char/ramoops.c | 13 +- + drivers/char/raw.c | 14 +- + drivers/crypto/mv_cesa.c | 2 +- + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/omap-aes.c | 260 +- + drivers/crypto/omap-sham.c | 374 +- + drivers/crypto/padlock-aes.c | 2 +- + drivers/crypto/padlock-sha.c | 8 +- + drivers/dca/dca-core.c | 2 - + drivers/dma/intel_mid_dma.c | 6 +- + drivers/edac/amd8131_edac.h | 2 +- + drivers/edac/cell_edac.c | 4 +- + drivers/edac/edac_core.h | 2 +- + drivers/edac/i7core_edac.c | 6 +- + drivers/edac/ppc4xx_edac.c | 6 +- + drivers/firewire/ohci.c | 2 +- + drivers/gpio/Kconfig | 14 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/adp5588-gpio.c | 39 +- + drivers/gpio/cs5535-gpio.c | 52 + + drivers/gpio/langwell_gpio.c | 16 +- + drivers/gpio/max732x.c | 38 +- + drivers/gpio/ml_ioh_gpio.c | 352 ++ + drivers/gpio/pca953x.c | 38 +- + drivers/gpio/pl061.c | 28 +- + drivers/gpio/stmpe-gpio.c | 36 +- + drivers/gpio/sx150x.c | 46 +- + drivers/gpio/tc3589x-gpio.c | 36 +- + drivers/gpio/timbgpio.c | 30 +- + drivers/gpio/vr41xx_giu.c | 48 +- + drivers/gpio/wm8994-gpio.c | 24 + + drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 4 +- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/hid/Kconfig | 17 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-cando.c | 2 + + drivers/hid/hid-core.c | 7 +- + drivers/hid/hid-ids.h | 7 + + drivers/hid/hid-input.c | 17 +- + drivers/hid/hid-mosart.c | 1 + + drivers/hid/hid-multitouch.c | 516 +++ + drivers/hid/usbhid/hid-quirks.c | 1 - + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/adm9240.c | 32 +- + drivers/hwmon/ads7828.c | 4 +- + drivers/hwmon/dme1737.c | 189 +- + drivers/hwmon/emc1403.c | 16 +- + drivers/hwmon/fschmd.c | 5 +- + drivers/hwmon/it87.c | 30 +- + drivers/hwmon/lm78.c | 14 +- + drivers/hwmon/pc87360.c | 53 +- + drivers/hwmon/pc87427.c | 26 +- + drivers/hwmon/via686a.c | 14 +- + drivers/hwmon/w83781d.c | 29 +- + drivers/hwmon/w83792d.c | 44 +- + drivers/hwmon/w83793.c | 38 +- + drivers/hwmon/w83795.c | 4 +- + drivers/i2c/busses/Kconfig | 8 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-bfin-twi.c | 24 +- + drivers/i2c/busses/i2c-eg20t.c | 900 +++++ + drivers/i2c/busses/i2c-iop3xx.c | 6 +- + drivers/i2c/busses/i2c-iop3xx.h | 2 +- + drivers/i2c/busses/i2c-mv64xxx.c | 45 +- + drivers/i2c/busses/i2c-nomadik.c | 10 +- + drivers/i2c/busses/i2c-ocores.c | 145 +- + drivers/i2c/busses/i2c-omap.c | 10 +- + drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 - + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/input/joystick/Kconfig | 10 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/as5011.c | 367 ++ + drivers/input/keyboard/Kconfig | 12 - + drivers/input/keyboard/Makefile | 1 - + drivers/input/keyboard/aaed2000_kbd.c | 186 - + drivers/input/serio/Kconfig | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 21 + + drivers/input/serio/i8042.c | 6 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/input/touchscreen/ad7879-i2c.c | 17 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 15 +- + drivers/input/touchscreen/eeti_ts.c | 16 +- + drivers/input/touchscreen/mcs5000_ts.c | 17 +- + drivers/input/touchscreen/migor_ts.c | 12 +- + drivers/input/touchscreen/wacom_w8001.c | 182 +- + drivers/isdn/gigaset/bas-gigaset.c | 4 +- + drivers/isdn/gigaset/ser-gigaset.c | 4 +- + drivers/isdn/gigaset/usb-gigaset.c | 4 +- + drivers/isdn/hardware/mISDN/ipac.h | 4 +- + drivers/isdn/hardware/mISDN/isar.h | 2 +- + drivers/isdn/mISDN/dsp_cmx.c | 2 +- + drivers/leds/leds-lp5521.c | 57 +- + drivers/leds/leds-lp5523.c | 59 +- + drivers/leds/leds-pca9532.c | 66 +- + drivers/leds/ledtrig-backlight.c | 61 +- + drivers/macintosh/via-pmu-backlight.c | 4 +- + drivers/macintosh/via-pmu.c | 2 +- + drivers/md/dm-table.c | 20 +- + drivers/md/dm.c | 6 +- + drivers/md/md.c | 16 +- + drivers/media/video/cx18/cx23418.h | 2 +- + drivers/media/video/cx25840/cx25840-ir.c | 2 +- + drivers/media/video/davinci/vpif.h | 2 +- + drivers/media/video/davinci/vpss.c | 2 +- + drivers/media/video/omap/omap_vout.c | 2 +- + drivers/media/video/saa7164/saa7164-core.c | 4 +- + drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- + drivers/media/video/tvp7002.c | 2 +- + drivers/media/video/via-camera.c | 2 - + drivers/memstick/core/memstick.c | 19 +- + drivers/memstick/core/mspro_block.c | 151 +- + drivers/memstick/host/jmb38x_ms.c | 120 +- + drivers/message/fusion/lsi/mpi_log_sas.h | 2 +- + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/mfd/wm8994-core.c | 93 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/arm-charlcd.c | 2 +- + drivers/misc/vmw_balloon.c | 13 +- + drivers/mmc/card/block.c | 2 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/au1xmmc.c | 2 +- + drivers/mmc/host/sdricoh_cs.c | 4 +- + drivers/mtd/devices/block2mtd.c | 10 +- + drivers/mtd/mtdchar.c | 2 +- + drivers/mtd/mtdoops.c | 5 + + drivers/mtd/nand/nand_base.c | 2 +- + drivers/net/bnx2x/bnx2x.h | 4 +- + drivers/net/bnx2x/bnx2x_main.c | 2 +- + drivers/net/bnx2x/bnx2x_reg.h | 2 +- + drivers/net/bonding/bond_3ad.c | 6 +- + drivers/net/chelsio/subr.c | 2 +- + drivers/net/cxgb3/mc5.c | 2 +- + drivers/net/cxgb3/t3_hw.c | 2 +- + drivers/net/e1000/e1000_hw.h | 2 +- + drivers/net/e1000/e1000_main.c | 2 +- + drivers/net/e1000e/82571.c | 2 +- + drivers/net/e1000e/ich8lan.c | 2 +- + drivers/net/e1000e/phy.c | 2 +- + drivers/net/eepro.c | 2 +- + drivers/net/irda/donauboe.h | 2 +- + drivers/net/ixgbe/ixgbe_82599.c | 4 +- + drivers/net/ll_temac_main.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/tehuti.c | 6 +- + drivers/net/tun.c | 2 +- + drivers/net/via-velocity.c | 2 +- + drivers/net/vxge/vxge-traffic.h | 2 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wimax/i2400m/driver.c | 2 +- + drivers/net/wimax/i2400m/i2400m.h | 4 +- + drivers/net/wireless/ath/ath5k/reg.h | 6 +- + drivers/net/wireless/b43/phy_g.c | 2 +- + drivers/net/wireless/b43legacy/phy.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-legacy.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- + drivers/net/wireless/prism54/islpci_dev.c | 6 +- + drivers/net/wireless/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- + drivers/net/wireless/wl1251/acx.h | 4 +- + drivers/net/wireless/wl1251/wl1251.h | 2 +- + drivers/net/wireless/wl12xx/acx.h | 4 +- + drivers/net/wireless/wl12xx/wl12xx.h | 4 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/nfc/Kconfig | 30 + + drivers/nfc/Makefile | 5 + + drivers/nfc/pn544.c | 891 ++++ + drivers/pcmcia/m32r_cfc.h | 2 +- + drivers/pcmcia/m32r_pcc.h | 2 +- + drivers/pcmcia/m8xx_pcmcia.c | 2 +- + drivers/platform/x86/acer-wmi.c | 2 +- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/asus_acpi.c | 2 +- + drivers/platform/x86/dell-laptop.c | 2 +- + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/platform/x86/fujitsu-laptop.c | 2 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 2 +- + drivers/power/s3c_adc_battery.c | 4 +- + drivers/pps/Kconfig | 11 + + drivers/pps/Makefile | 3 +- + drivers/pps/clients/Kconfig | 7 + + drivers/pps/clients/Makefile | 1 + + drivers/pps/clients/pps-ktimer.c | 44 +- + drivers/pps/clients/pps-ldisc.c | 59 +- + drivers/pps/clients/pps_parport.c | 258 ++ + drivers/pps/generators/Kconfig | 13 + + drivers/pps/generators/Makefile | 9 + + drivers/pps/generators/pps_gen_parport.c | 282 ++ + drivers/pps/kapi.c | 210 +- + drivers/pps/kc.c | 122 + + drivers/pps/kc.h | 46 + + drivers/pps/pps.c | 156 +- + drivers/rapidio/rio-scan.c | 160 +- + drivers/rapidio/rio-sysfs.c | 4 +- + drivers/rapidio/rio.c | 76 +- + drivers/rapidio/switches/idt_gen2.c | 95 +- + drivers/rapidio/switches/idtcps.c | 6 +- + drivers/rapidio/switches/tsi568.c | 13 +- + drivers/rapidio/switches/tsi57x.c | 56 +- + drivers/regulator/88pm8607.c | 3 +- + drivers/regulator/Kconfig | 22 + + drivers/regulator/Makefile | 3 + + drivers/regulator/ab3100.c | 5 +- + drivers/regulator/ab8500.c | 453 ++- + drivers/regulator/core.c | 462 ++- + drivers/regulator/da903x.c | 17 +- + drivers/regulator/isl6271a-regulator.c | 8 +- + drivers/regulator/lp3971.c | 10 +- + drivers/regulator/lp3972.c | 10 +- + drivers/regulator/max1586.c | 30 +- + drivers/regulator/max8649.c | 3 +- + drivers/regulator/max8660.c | 14 +- + drivers/regulator/max8925-regulator.c | 3 +- + drivers/regulator/max8952.c | 3 +- + drivers/regulator/max8998.c | 8 +- + drivers/regulator/mc13783-regulator.c | 385 +-- + drivers/regulator/mc13892-regulator.c | 635 +++ + drivers/regulator/mc13xxx-regulator-core.c | 241 ++ + drivers/regulator/mc13xxx.h | 101 + + drivers/regulator/pcap-regulator.c | 7 +- + drivers/regulator/pcf50633-regulator.c | 5 +- + drivers/regulator/tps65023-regulator.c | 9 +- + drivers/regulator/tps6507x-regulator.c | 10 +- + drivers/regulator/tps6524x-regulator.c | 693 ++++ + drivers/regulator/tps6586x-regulator.c | 15 +- + drivers/regulator/twl-regulator.c | 11 +- + drivers/regulator/wm831x-dcdc.c | 31 +- + drivers/regulator/wm831x-ldo.c | 59 +- + drivers/regulator/wm8350-regulator.c | 24 +- + drivers/regulator/wm8400-regulator.c | 8 +- + drivers/regulator/wm8994-regulator.c | 45 +- + drivers/rtc/rtc-cmos.c | 16 +- + drivers/rtc/rtc-max6902.c | 3 +- + drivers/rtc/rtc-omap.c | 6 +- + drivers/s390/block/dasd_genhd.c | 2 +- + drivers/s390/net/lcs.c | 2 +- + drivers/s390/scsi/zfcp_cfdc.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- + drivers/scsi/aic94xx/aic94xx_reg_def.h | 4 +- + drivers/scsi/aic94xx/aic94xx_scb.c | 2 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 6 +- + drivers/scsi/bfa/bfa_fcpim.c | 2 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/dc395x.c | 8 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/scsi_lib.c | 13 +- + drivers/scsi/scsi_netlink.c | 2 +- + drivers/scsi/scsi_sysfs.c | 6 +- + drivers/scsi/sd.c | 10 +- + drivers/scsi/sr.c | 174 +- + drivers/scsi/sr.h | 3 +- + drivers/scsi/sr_ioctl.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/serial/sh-sci.c | 102 +- + drivers/serial/sh-sci.h | 153 - + drivers/spi/atmel_spi.c | 4 +- + drivers/spi/spidev.c | 2 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/cs5535_gpio/Kconfig | 11 + + drivers/staging/cs5535_gpio/Makefile | 1 + + drivers/staging/cs5535_gpio/TODO | 6 + + .../{char => staging/cs5535_gpio}/cs5535_gpio.c | 0 + drivers/staging/msm/msm_fb_bl.c | 2 +- + drivers/staging/olpc_dcon/TODO | 1 - + drivers/staging/olpc_dcon/olpc_dcon.c | 5 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 20 - + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 168 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 4 +- + drivers/staging/pohmelfs/net.c | 2 +- + drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- + drivers/staging/smbfs/dir.c | 13 - + drivers/staging/smbfs/inode.c | 4 + + drivers/staging/smbfs/proto.h | 2 + + drivers/telephony/ixj.c | 6 +- + drivers/usb/gadget/imx_udc.c | 2 +- + drivers/usb/gadget/langwell_udc.c | 4 +- + drivers/usb/gadget/storage_common.c | 7 +- + drivers/usb/host/fhci-hcd.c | 4 +- + drivers/usb/host/fhci-tds.c | 4 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/misc/adutux.c | 2 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/misc/ldusb.c | 2 +- + drivers/usb/musb/musb_gadget.c | 4 +- + drivers/usb/wusbcore/wa-rpipe.c | 2 +- + drivers/video/Kconfig | 18 +- + drivers/video/atmel_lcdfb.c | 2 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/atyfb_base.c | 2 +- + drivers/video/aty/radeon_backlight.c | 2 +- + drivers/video/backlight/88pm860x_bl.c | 2 +- + drivers/video/backlight/l4f00242t03.c | 106 +- + drivers/video/backlight/max8925_bl.c | 2 +- + drivers/video/console/vgacon.c | 3 +- + drivers/video/imxfb.c | 2 +- + drivers/video/matrox/matroxfb_base.c | 70 +- + drivers/video/modedb.c | 420 +- + drivers/video/nuc900fb.c | 5 +- + drivers/video/nvidia/nv_backlight.c | 2 +- + drivers/video/omap2/displays/Kconfig | 27 +- + drivers/video/omap2/displays/Makefile | 5 +- + drivers/video/omap2/displays/panel-generic-dpi.c | 365 ++ + drivers/video/omap2/displays/panel-generic.c | 174 - + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 325 ++ + .../video/omap2/displays/panel-sharp-lq043t1dg01.c | 165 - + drivers/video/omap2/displays/panel-taal.c | 2 +- + .../video/omap2/displays/panel-toppoly-tdo35s.c | 164 - + drivers/video/omap2/dss/dispc.c | 636 ++- + drivers/video/omap2/dss/dpi.c | 40 +- + drivers/video/omap2/dss/dsi.c | 27 +- + drivers/video/omap2/dss/dss.h | 35 +- + drivers/video/omap2/dss/dss_features.c | 66 +- + drivers/video/omap2/dss/dss_features.h | 10 +- + drivers/video/omap2/dss/manager.c | 80 +- + drivers/video/omap2/dss/overlay.c | 55 +- + drivers/video/omap2/dss/rfbi.c | 20 +- + drivers/video/omap2/dss/sdi.c | 24 +- + drivers/video/omap2/omapfb/omapfb-main.c | 5 +- + drivers/video/riva/fbdev.c | 2 +- + drivers/video/s3c2410fb.c | 5 +- + drivers/video/sh_mobile_hdmi.c | 98 +- + drivers/video/sstfb.c | 2 +- + drivers/video/vt8500lcdfb.c | 28 + + drivers/w1/slaves/Kconfig | 11 + + drivers/w1/slaves/Makefile | 1 + + drivers/w1/slaves/w1_ds2423.c | 166 + + drivers/w1/w1_family.h | 1 + + drivers/watchdog/Kconfig | 56 +- + drivers/watchdog/Makefile | 6 +- + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/alim7101_wdt.c | 2 +- + drivers/watchdog/ath79_wdt.c | 305 ++ + drivers/watchdog/booke_wdt.c | 35 +- + drivers/watchdog/f71808e_wdt.c | 78 +- + drivers/watchdog/iTCO_wdt.c | 12 +- + drivers/watchdog/ks8695_wdt.c | 2 +- + drivers/watchdog/m548x_wdt.c | 227 ++ + drivers/watchdog/nv_tco.c | 512 +++ + drivers/watchdog/nv_tco.h | 64 + + drivers/watchdog/sp5100_tco.c | 480 +++ + drivers/watchdog/sp5100_tco.h | 41 + + drivers/watchdog/w83627hf_wdt.c | 8 +- + firmware/ihex2fw.c | 9 +- + fs/9p/v9fs_vfs.h | 1 - + fs/9p/vfs_dentry.c | 2 +- + fs/9p/vfs_inode.c | 5 - + fs/9p/vfs_super.c | 8 +- + fs/adfs/dir.c | 1 - + fs/adfs/super.c | 4 +- + fs/affs/affs.h | 1 + + fs/affs/namei.c | 3 +- + fs/affs/super.c | 6 +- + fs/afs/dir.c | 4 +- + fs/afs/internal.h | 1 + + fs/afs/super.c | 1 + + fs/aio.c | 29 +- + fs/anon_inodes.c | 27 +- + fs/befs/endian.h | 16 +- + fs/befs/linuxvfs.c | 2 +- + fs/binfmt_elf.c | 23 +- + fs/bio-integrity.c | 7 +- + fs/block_dev.c | 743 ++--- + fs/btrfs/export.c | 12 +- + fs/btrfs/inode.c | 6 +- + fs/btrfs/super.c | 1 + + fs/btrfs/volumes.c | 28 +- + fs/btrfs/volumes.h | 2 +- + fs/ceph/Makefile | 23 +- + fs/ceph/debugfs.c | 9 +- + fs/ceph/dir.c | 20 + + fs/ceph/export.c | 2 +- + fs/ceph/inode.c | 4 + + fs/ceph/mds_client.c | 56 +- + fs/ceph/mds_client.h | 2 +- + fs/ceph/super.c | 13 +- + fs/ceph/super.h | 2 + + fs/char_dev.c | 15 +- + fs/cifs/cifsfs.c | 6 + + fs/cifs/dir.c | 25 +- + fs/cifs/inode.c | 8 - + fs/cifs/link.c | 4 - + fs/cifs/readdir.c | 5 - + fs/coda/cache.c | 5 +- + fs/coda/cnode.c | 3 +- + {include/linux => fs/coda}/coda_cache.h | 0 + {include/linux => fs/coda}/coda_fs_i.h | 0 + fs/coda/coda_linux.c | 3 +- + {include/linux => fs/coda}/coda_linux.h | 4 +- + fs/coda/dir.c | 9 +- + fs/coda/file.c | 3 +- + fs/coda/inode.c | 8 +- + fs/coda/pioctl.c | 4 +- + fs/coda/psdev.c | 4 +- + fs/coda/symlink.c | 4 +- + fs/coda/upcall.c | 5 +- + fs/configfs/configfs_internal.h | 1 + + fs/configfs/dir.c | 6 +- + fs/configfs/mount.c | 1 + + fs/cramfs/inode.c | 110 +- + fs/dcache.c | 9 +- + fs/ecryptfs/inode.c | 1 - + fs/ecryptfs/main.c | 155 +- + fs/eventpoll.c | 20 +- + fs/ext3/super.c | 12 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/extents.c | 8 +- + fs/ext4/inode.c | 9 +- + fs/ext4/super.c | 12 +- + fs/fat/fat.h | 3 +- + fs/fat/inode.c | 13 +- + fs/fat/namei_msdos.c | 27 +- + fs/fat/namei_vfat.c | 27 +- + fs/fuse/dir.c | 1 - + fs/fuse/inode.c | 10 +- + fs/gfs2/export.c | 13 +- + fs/gfs2/ops_fstype.c | 10 +- + fs/gfs2/ops_inode.c | 6 +- + fs/hfs/dir.c | 2 - + fs/hfs/super.c | 3 +- + fs/hfsplus/dir.c | 1 - + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/dentry.c | 7 +- + fs/hpfs/dir.c | 1 - + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/super.c | 2 +- + fs/isofs/inode.c | 13 +- + fs/isofs/namei.c | 2 - + fs/jbd/transaction.c | 2 +- + fs/jbd2/transaction.c | 2 +- + fs/jfs/jfs_logmgr.c | 17 +- + fs/jfs/namei.c | 10 +- + fs/jfs/super.c | 6 +- + fs/libfs.c | 4 +- + fs/logfs/dev_bdev.c | 7 +- + fs/minix/namei.c | 2 - + fs/namei.c | 7 +- + fs/ncpfs/dir.c | 19 +- + fs/ncpfs/file.c | 3 +- + fs/ncpfs/inode.c | 6 +- + fs/ncpfs/ioctl.c | 4 +- + fs/ncpfs/mmap.c | 4 +- + fs/ncpfs/ncp_fs.h | 98 + + {include/linux => fs/ncpfs}/ncp_fs_i.h | 0 + {include/linux => fs/ncpfs}/ncp_fs_sb.h | 24 +- + fs/ncpfs/ncplib_kernel.c | 2 +- + fs/ncpfs/ncplib_kernel.h | 2 - + fs/ncpfs/ncpsign_kernel.c | 1 + + fs/ncpfs/ncpsign_kernel.h | 2 - + fs/ncpfs/sock.c | 2 +- + fs/ncpfs/symlink.c | 4 +- + fs/nfs/dir.c | 4 - + fs/nfs/getroot.c | 6 - + fs/nfs/super.c | 1 + + fs/nfsd/vfs.c | 5 - + fs/nilfs2/super.c | 8 +- + fs/notify/fanotify/Kconfig | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/export.c | 6 +- + fs/ocfs2/file.c | 8 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/namei.c | 5 - + fs/ocfs2/suballoc.c | 2 +- + fs/ocfs2/super.c | 1 + + fs/open.c | 7 +- + fs/partitions/check.c | 106 +- + fs/pipe.c | 14 +- + fs/proc/Makefile | 2 +- + fs/proc/array.c | 28 +- + fs/proc/base.c | 53 +- + fs/proc/{proc_console.c => consoles.c} | 4 +- + fs/proc/devices.c | 4 +- + fs/proc/generic.c | 17 +- + fs/proc/inode.c | 7 +- + fs/proc/internal.h | 5 +- + fs/proc/kcore.c | 2 +- + fs/proc/page.c | 2 +- + fs/proc/proc_tty.c | 26 +- + fs/proc/softirqs.c | 6 +- + fs/proc/stat.c | 2 +- + fs/proc/task_mmu.c | 5 +- + fs/proc/task_nommu.c | 7 +- + fs/read_write.c | 27 +- + fs/reiserfs/journal.c | 21 +- + fs/reiserfs/prints.c | 4 +- + fs/select.c | 2 + + fs/splice.c | 43 +- + fs/super.c | 19 +- + fs/sysv/namei.c | 1 - + fs/sysv/super.c | 8 +- + fs/xfs/linux-2.6/xfs_iops.c | 7 +- + fs/xfs/linux-2.6/xfs_super.c | 7 +- + include/acpi/actbl1.h | 2 +- + include/asm-generic/gpio.h | 10 +- + include/asm-generic/vmlinux.lds.h | 3 +- + include/crypto/if_alg.h | 92 + + {drivers => include}/crypto/padlock.h | 8 +- + include/crypto/scatterwalk.h | 15 + + include/linux/Kbuild | 1 + + include/linux/binfmts.h | 5 +- + include/linux/blkdev.h | 5 +- + include/linux/cdev.h | 2 - + include/linux/cdrom.h | 6 + + include/linux/ceph/ceph_fs.h | 16 +- + include/linux/ceph/messenger.h | 5 - + include/linux/cgroup.h | 2 +- + include/linux/cramfs_fs.h | 2 + + include/linux/cs5535.h | 6 + + include/linux/decompress/inflate.h | 3 - + include/linux/decompress/mm.h | 6 +- + include/linux/decompress/unxz.h | 19 + + include/linux/falloc.h | 1 + + include/linux/firewire-cdev.h | 2 +- + include/linux/fs.h | 31 +- + include/linux/genhd.h | 45 +- + include/linux/gpio.h | 26 +- + include/linux/hid.h | 6 +- + include/linux/if_alg.h | 40 + + include/linux/input.h | 1 + + include/linux/input/as5011.h | 20 + + include/linux/kernel.h | 19 +- + include/linux/kmsg_dump.h | 4 + + include/linux/kvm.h | 1 + + include/linux/kvm_host.h | 101 +- + include/linux/kvm_types.h | 7 + + include/linux/leds-lp5521.h | 1 + + include/linux/leds-lp5523.h | 1 + + include/linux/mfd/ab8500.h | 5 +- + include/linux/mfd/core.h | 2 +- + include/linux/mfd/mc13783.h | 67 +- + include/linux/mfd/mc13892.h | 39 + + include/linux/mfd/wm8994/core.h | 8 + + include/linux/mfd/wm8994/pdata.h | 17 + + include/linux/mfd/wm8994/registers.h | 302 ++ + include/linux/mmc/sh_mmcif.h | 37 +- + include/linux/ncp_fs.h | 100 - + include/linux/ncp_mount.h | 22 - + include/linux/nfc/pn544.h | 97 + + include/linux/pci_ids.h | 2 + + include/linux/poll.h | 2 +- + include/linux/pps.h | 7 + + include/linux/pps_kernel.h | 61 +- + include/linux/printk.h | 248 +- + include/linux/regulator/ab8500.h | 24 +- + include/linux/regulator/consumer.h | 1 + + include/linux/regulator/driver.h | 19 +- + include/linux/rio.h | 100 +- + include/linux/rio_drv.h | 72 +- + include/linux/rio_ids.h | 2 + + include/linux/romfs_fs.h | 3 + + include/linux/sched.h | 2 +- + include/linux/serial_core.h | 5 +- + include/linux/serial_sci.h | 22 + + include/linux/socket.h | 5 +- + include/linux/suspend.h | 8 +- + include/linux/time.h | 2 + + include/linux/timex.h | 1 + + include/linux/toshiba.h | 2 + + include/linux/tty_ldisc.h | 7 +- + include/linux/u64_stats_sync.h | 12 +- + include/linux/unaligned/packed_struct.h | 6 +- + include/linux/user_namespace.h | 2 +- + include/linux/xz.h | 264 ++ + include/media/davinci/vpss.h | 2 +- + include/net/sctp/user.h | 4 +- + include/scsi/fc/fc_fcp.h | 4 +- + include/scsi/scsi.h | 1 + + include/sound/alc5623.h | 15 + + include/sound/asound.h | 3 + + include/sound/control.h | 4 +- + include/sound/hdsp.h | 1 + + include/sound/minors.h | 4 +- + include/sound/pcm.h | 1 + + include/sound/soc-dai.h | 4 +- + include/sound/soc-dapm.h | 99 +- + include/sound/soc.h | 116 +- + include/trace/events/asoc.h | 235 ++ + include/trace/events/block.h | 12 +- + include/trace/events/kvm.h | 121 + + include/trace/events/regulator.h | 141 + + init/Kconfig | 22 +- + kernel/Makefile | 2 +- + kernel/audit.c | 2 +- + kernel/cgroup.c | 30 +- + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/hrtimer.c | 2 +- + kernel/kexec.c | 2 +- + kernel/latencytop.c | 23 +- + kernel/perf_event.c | 2 +- + kernel/power/hibernate.c | 4 +- + kernel/power/suspend.c | 4 +- + kernel/power/swap.c | 7 +- + kernel/printk.c | 30 +- + kernel/sched.c | 2 +- + kernel/smp.c | 19 + + kernel/softirq.c | 19 - + kernel/sys.c | 6 + + kernel/sysctl.c | 31 +- + kernel/sysctl_binary.c | 2 +- + kernel/taskstats.c | 2 +- + kernel/time.c | 4 +- + kernel/time/clocksource.c | 2 +- + kernel/time/ntp.c | 425 ++- + kernel/time/timekeeping.c | 43 + + kernel/trace/blktrace.c | 37 +- + kernel/trace/trace_entries.h | 2 +- + kernel/user_namespace.c | 15 +- + lib/Kconfig | 6 + + lib/Makefile | 6 +- + lib/decompress.c | 5 + + lib/decompress_bunzip2.c | 8 +- + lib/decompress_inflate.c | 23 +- + lib/decompress_unlzma.c | 85 +- + lib/decompress_unlzo.c | 105 +- + lib/decompress_unxz.c | 397 ++ + lib/flex_array.c | 10 + + lib/hexdump.c | 2 + + lib/nlattr.c | 2 +- + lib/swiotlb.c | 2 +- + lib/vsprintf.c | 38 +- + lib/xz/Kconfig | 59 + + lib/xz/Makefile | 5 + + lib/xz/xz_crc32.c | 59 + + lib/xz/xz_dec_bcj.c | 561 +++ + lib/xz/xz_dec_lzma2.c | 1171 ++++++ + lib/xz/xz_dec_stream.c | 821 ++++ + lib/xz/xz_dec_syms.c | 26 + + lib/xz/xz_dec_test.c | 220 + + lib/xz/xz_lzma2.h | 204 + + lib/xz/xz_private.h | 156 + + lib/xz/xz_stream.h | 62 + + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + mm/rmap.c | 2 +- + mm/sparse-vmemmap.c | 2 +- + mm/swapfile.c | 7 +- + net/Kconfig | 4 +- + net/ceph/ceph_hash.c | 3 + + net/ceph/messenger.c | 46 +- + net/ceph/osdmap.c | 4 +- + net/core/dev.c | 2 +- + net/core/sock.c | 6 +- + net/dccp/Kconfig | 4 +- + net/decnet/dn_dev.c | 2 +- + net/ipv4/Kconfig | 4 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv6/af_inet6.c | 2 +- + net/sched/Kconfig | 2 +- + net/socket.c | 30 +- + scripts/Makefile.lib | 28 + + scripts/checkpatch.pl | 19 +- + scripts/gen_initramfs_list.sh | 2 + + scripts/get_maintainer.pl | 45 +- + scripts/mod/modpost.c | 2 +- + scripts/xz_wrap.sh | 23 + + security/apparmor/include/match.h | 2 +- + sound/ac97_bus.c | 4 +- + sound/aoa/codecs/onyx.c | 1 - + sound/aoa/core/gpio-feature.c | 7 +- + sound/aoa/core/gpio-pmf.c | 7 +- + sound/core/control.c | 28 +- + sound/core/init.c | 2 +- + sound/core/oss/pcm_oss.c | 4 +- + sound/core/pcm_lib.c | 22 + + sound/core/pcm_native.c | 5 +- + sound/core/seq/seq.c | 4 + + sound/core/sound.c | 18 +- + sound/core/timer.c | 7 +- + sound/drivers/ml403-ac97cr.c | 4 +- + sound/i2c/other/ak4113.c | 5 +- + sound/i2c/other/ak4114.c | 5 +- + sound/isa/opl3sa2.c | 2 +- + sound/pci/Kconfig | 23 +- + sound/pci/ac97/ac97_codec.c | 6 +- + sound/pci/azt3328.c | 406 +- + sound/pci/bt87x.c | 10 +- + sound/pci/ca0106/ca0106.h | 2 +- + sound/pci/ca0106/ca0106_main.c | 2 +- + sound/pci/cmipci.c | 25 +- + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/emu10k1/p16v.h | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/hda/hda_codec.c | 3 + + sound/pci/hda/hda_intel.c | 9 +- + sound/pci/hda/patch_analog.c | 72 +- + sound/pci/hda/patch_conexant.c | 108 +- + sound/pci/hda/patch_hdmi.c | 92 +- + sound/pci/hda/patch_realtek.c | 703 ++-- + sound/pci/hda/patch_sigmatel.c | 17 +- + sound/pci/hda/patch_via.c | 3 +- + sound/pci/ice1712/delta.c | 49 +- + sound/pci/ice1712/delta.h | 11 + + sound/pci/oxygen/Makefile | 4 +- + sound/pci/oxygen/cs4245.h | 107 + + sound/pci/oxygen/hifier.c | 239 -- + sound/pci/oxygen/oxygen.c | 356 ++- + sound/pci/oxygen/oxygen.h | 19 +- + sound/pci/oxygen/oxygen_io.c | 4 +- + sound/pci/oxygen/oxygen_lib.c | 71 +- + sound/pci/oxygen/oxygen_mixer.c | 110 +- + sound/pci/oxygen/oxygen_pcm.c | 55 +- + sound/pci/oxygen/oxygen_regs.h | 16 +- + sound/pci/oxygen/xonar.h | 2 + + sound/pci/oxygen/xonar_cs43xx.c | 84 +- + sound/pci/oxygen/xonar_dg.c | 572 +++ + sound/pci/oxygen/xonar_dg.h | 8 + + sound/pci/oxygen/xonar_hdmi.c | 2 +- + sound/pci/oxygen/xonar_lib.c | 6 +- + sound/pci/oxygen/xonar_pcm179x.c | 473 ++-- + sound/pci/oxygen/xonar_wm87x6.c | 317 ++- + sound/pci/rme9652/hdsp.c | 538 +++- + sound/pci/rme9652/hdspm.c | 6 +- + sound/pci/ymfpci/ymfpci_main.c | 12 +- + sound/ppc/snd_ps3.c | 2 +- + sound/soc/Kconfig | 17 +- + sound/soc/Makefile | 2 +- + sound/soc/atmel/playpaq_wm8510.c | 12 +- + sound/soc/atmel/sam9g20_wm8731.c | 18 +- + sound/soc/atmel/snd-soc-afeb9260.c | 14 +- + sound/soc/au1x/db1200.c | 1 - + sound/soc/blackfin/bf5xx-ad1836.c | 1 - + sound/soc/blackfin/bf5xx-ad193x.c | 1 - + sound/soc/blackfin/bf5xx-ad73311.c | 1 - + sound/soc/blackfin/bf5xx-ssm2602.c | 1 - + sound/soc/codecs/88pm860x-codec.c | 30 +- + sound/soc/codecs/Kconfig | 20 + + sound/soc/codecs/Makefile | 12 +- + sound/soc/codecs/ad1836.c | 7 +- + sound/soc/codecs/ad193x.c | 8 +- + sound/soc/codecs/ad1980.c | 1 - + sound/soc/codecs/ak4535.c | 20 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 11 +- + sound/soc/codecs/alc5623.c | 1117 +++++ + sound/soc/codecs/alc5623.h | 161 + + sound/soc/codecs/cq93vc.c | 4 +- + sound/soc/codecs/cs4270.c | 162 +- + sound/soc/codecs/cs42l51.c | 7 +- + sound/soc/codecs/cx20442.c | 16 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/dmic.c | 81 + + sound/soc/codecs/jz4740.c | 11 +- + sound/soc/codecs/max98088.c | 15 +- + sound/soc/codecs/ssm2602.c | 10 +- + sound/soc/codecs/stac9766.c | 2 +- + sound/soc/codecs/tlv320aic23.c | 10 +- + sound/soc/codecs/tlv320aic26.c | 5 +- + sound/soc/codecs/tlv320aic3x.c | 71 +- + sound/soc/codecs/tlv320dac33.c | 334 +- + sound/soc/codecs/tpa6130a2.c | 99 +- + sound/soc/codecs/tpa6130a2.h | 1 + + sound/soc/codecs/twl4030.c | 56 +- + sound/soc/codecs/twl6040.c | 859 ++++- + sound/soc/codecs/twl6040.h | 8 + + sound/soc/codecs/uda134x.c | 3 +- + sound/soc/codecs/uda1380.c | 15 +- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm2000.c | 6 +- + sound/soc/codecs/wm8350.c | 105 +- + sound/soc/codecs/wm8400.c | 12 +- + sound/soc/codecs/wm8510.c | 12 +- + sound/soc/codecs/wm8523.c | 12 +- + sound/soc/codecs/wm8580.c | 23 +- + sound/soc/codecs/wm8711.c | 11 +- + sound/soc/codecs/wm8728.c | 12 +- + sound/soc/codecs/wm8731.c | 102 +- + sound/soc/codecs/wm8737.c | 754 ++++ + sound/soc/codecs/wm8737.h | 322 ++ + sound/soc/codecs/wm8741.c | 10 +- + sound/soc/codecs/wm8750.c | 13 +- + sound/soc/codecs/wm8753.c | 49 +- + sound/soc/codecs/wm8770.c | 749 ++++ + sound/soc/codecs/wm8770.h | 51 + + sound/soc/codecs/wm8776.c | 10 +- + sound/soc/codecs/wm8804.c | 7 +- + sound/soc/codecs/wm8900.c | 13 +- + sound/soc/codecs/wm8903.c | 222 +- + sound/soc/codecs/wm8903.h | 25 - + sound/soc/codecs/wm8904.c | 36 +- + sound/soc/codecs/wm8940.c | 8 +- + sound/soc/codecs/wm8955.c | 12 +- + sound/soc/codecs/wm8960.c | 29 +- + sound/soc/codecs/wm8961.c | 13 +- + sound/soc/codecs/wm8962.c | 41 +- + sound/soc/codecs/wm8971.c | 30 +- + sound/soc/codecs/wm8974.c | 13 +- + sound/soc/codecs/wm8978.c | 13 +- + sound/soc/codecs/wm8985.c | 12 +- + sound/soc/codecs/wm8988.c | 11 +- + sound/soc/codecs/wm8990.c | 12 +- + sound/soc/codecs/wm8993.c | 21 +- + sound/soc/codecs/wm8994-tables.c | 3147 +++++++++++++++ + sound/soc/codecs/wm8994.c | 2544 ++++-------- + sound/soc/codecs/wm8994.h | 14 + + sound/soc/codecs/wm8995.c | 1818 +++++++++ + sound/soc/codecs/wm8995.h | 4269 ++++++++++++++++++++ + sound/soc/codecs/wm9081.c | 15 +- + sound/soc/codecs/wm9090.c | 18 +- + sound/soc/codecs/wm9705.c | 7 +- + sound/soc/codecs/wm9712.c | 10 +- + sound/soc/codecs/wm9713.c | 9 +- + sound/soc/codecs/wm_hubs.c | 108 +- + sound/soc/codecs/wm_hubs.h | 3 + + sound/soc/davinci/davinci-evm.c | 23 +- + sound/soc/davinci/davinci-sffsdr.c | 1 - + sound/soc/ep93xx/ep93xx-i2s.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/ep93xx/snappercl15.c | 6 +- + sound/soc/imx/eukrea-tlv320.c | 1 - + sound/soc/imx/imx-ssi.c | 4 +- + sound/soc/imx/phycore-ac97.c | 1 - + sound/soc/imx/wm1133-ev1.c | 8 +- + sound/soc/jz4740/jz4740-i2s.c | 1 - + sound/soc/jz4740/qi_lb60.c | 14 +- + sound/soc/kirkwood/Kconfig | 11 +- + sound/soc/kirkwood/Makefile | 2 + + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- + sound/soc/kirkwood/kirkwood-t5325.c | 141 + + sound/soc/nuc900/nuc900-audio.c | 1 - + sound/soc/omap/am3517evm.c | 14 +- + sound/soc/omap/ams-delta.c | 82 +- + sound/soc/omap/igep0020.c | 1 - + sound/soc/omap/n810.c | 44 +- + sound/soc/omap/omap-mcbsp.c | 35 +- + sound/soc/omap/omap-mcbsp.h | 4 + + sound/soc/omap/omap2evm.c | 1 - + sound/soc/omap/omap3beagle.c | 1 - + sound/soc/omap/omap3evm.c | 1 - + sound/soc/omap/omap3pandora.c | 45 +- + sound/soc/omap/osk5912.c | 14 +- + sound/soc/omap/overo.c | 1 - + sound/soc/omap/rx51.c | 27 +- + sound/soc/omap/sdp3430.c | 44 +- + sound/soc/omap/sdp4430.c | 57 +- + sound/soc/omap/zoom2.c | 36 +- + sound/soc/pxa/corgi.c | 52 +- + sound/soc/pxa/e740_wm9705.c | 30 +- + sound/soc/pxa/e750_wm9705.c | 30 +- + sound/soc/pxa/e800_wm9712.c | 8 +- + sound/soc/pxa/em-x270.c | 1 - + sound/soc/pxa/magician.c | 36 +- + sound/soc/pxa/mioa701_wm9713.c | 18 +- + sound/soc/pxa/palm27x.c | 34 +- + sound/soc/pxa/poodle.c | 26 +- + sound/soc/pxa/raumfeld.c | 1 - + sound/soc/pxa/saarb.c | 18 +- + sound/soc/pxa/spitz.c | 70 +- + sound/soc/pxa/tavorevb3.c | 18 +- + sound/soc/pxa/tosa.c | 38 +- + sound/soc/pxa/z2.c | 16 +- + sound/soc/pxa/zylonite.c | 12 +- + sound/soc/s3c24xx/Kconfig | 171 - + sound/soc/s3c24xx/Makefile | 55 - + sound/soc/s3c24xx/aquila_wm8994.c | 295 -- + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 -- + sound/soc/s3c24xx/s3c64xx-i2s.c | 242 -- + sound/soc/s3c24xx/s3c64xx-i2s.h | 41 - + sound/soc/s6000/s6105-ipcam.c | 42 +- + sound/soc/samsung/Kconfig | 171 + + sound/soc/samsung/Makefile | 55 + + sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} | 22 +- + sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} | 8 +- + sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} | 134 +- + sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} | 2 +- + sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 66 +- + .../rx1950_uda1380.c => samsung/h1940_uda1380.c} | 249 +- + sound/soc/samsung/i2s.c | 1258 ++++++ + sound/soc/samsung/i2s.h | 29 + + sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 26 +- + sound/soc/{s3c24xx => samsung}/lm4857.h | 0 + sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 9 +- + .../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 72 +- + sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 130 +- + sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} | 6 +- + sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} | 2 +- + sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0 + sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 17 +- + sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 4 +- + sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +- + sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 4 +- + sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +- + sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 2 +- + sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0 + sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 5 +- + sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +- + .../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 24 +- + .../s3c24xx_simtec_tlv320aic23.c | 22 +- + sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 5 +- + sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 64 +- + sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 9 +- + sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 27 +- + .../smdk64xx_wm8580.c => samsung/smdk_wm8580.c} | 174 +- + sound/soc/samsung/smdk_wm8994.c | 176 + + sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 26 +- + sound/soc/{s3c24xx => samsung}/spdif.c | 4 +- + sound/soc/{s3c24xx => samsung}/spdif.h | 2 +- + sound/soc/sh/Kconfig | 4 +- + sound/soc/sh/fsi-ak4642.c | 140 +- + sound/soc/sh/fsi-da7210.c | 2 +- + sound/soc/sh/fsi.c | 273 +- + sound/soc/sh/migor.c | 8 +- + sound/soc/sh/sh7760-ac97.c | 3 +- + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_dai.c | 2 +- + sound/soc/sh/siu_pcm.c | 2 +- + sound/soc/soc-cache.c | 1065 +++++- + sound/soc/soc-core.c | 575 ++- + sound/soc/soc-dapm.c | 860 +++-- + sound/soc/soc-jack.c | 31 +- + sound/usb/format.c | 5 +- + sound/usb/midi.c | 19 +- + sound/usb/mixer.c | 11 +- + sound/usb/quirks-table.h | 4 +- + sound/usb/usx2y/us122l.c | 41 +- + usr/Kconfig | 18 + + usr/Makefile | 5 +- + virt/kvm/Kconfig | 3 + + virt/kvm/assigned-dev.c | 125 +- + virt/kvm/async_pf.c | 216 + + virt/kvm/async_pf.h | 36 + + virt/kvm/eventfd.c | 91 +- + virt/kvm/irq_comm.c | 7 +- + virt/kvm/kvm_main.c | 334 ++- + 1310 files changed, 55753 insertions(+), 15929 deletions(-) + create mode 100644 Documentation/nfc/nfc-pn544.txt + create mode 100644 Documentation/w1/slaves/w1_ds2423 + create mode 100644 Documentation/xz.txt + create mode 100644 arch/arm/mach-omap2/board-zoom-display.c + create mode 100644 arch/arm/mach-s5pv310/dev-audio.c + create mode 100644 arch/arm/mach-s5pv310/dma.c + create mode 100644 arch/arm/mach-s5pv310/include/mach/dma.h + create mode 100644 arch/arm/mach-ux500/board-mop500-regulators.h + create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h + create mode 100644 arch/arm/plat-samsung/dev-asocdma.c + create mode 100644 arch/sh/boards/board-apsh4a3a.c + create mode 100644 arch/sh/boards/board-apsh4ad0a.c + create mode 100644 arch/sh/configs/apsh4a3a_defconfig + create mode 100644 arch/sh/configs/apsh4ad0a_defconfig + create mode 100644 arch/x86/include/asm/prom.h + create mode 100644 arch/x86/platform/olpc/olpc_dt.c + create mode 100644 crypto/af_alg.c + create mode 100644 crypto/algif_hash.c + create mode 100644 crypto/algif_skcipher.c + create mode 100644 drivers/gpio/ml_ioh_gpio.c + create mode 100644 drivers/hid/hid-multitouch.c + create mode 100644 drivers/i2c/busses/i2c-eg20t.c + create mode 100644 drivers/input/joystick/as5011.c + delete mode 100644 drivers/input/keyboard/aaed2000_kbd.c + create mode 100644 drivers/nfc/Kconfig + create mode 100644 drivers/nfc/Makefile + create mode 100644 drivers/nfc/pn544.c + create mode 100644 drivers/pps/clients/pps_parport.c + create mode 100644 drivers/pps/generators/Kconfig + create mode 100644 drivers/pps/generators/Makefile + create mode 100644 drivers/pps/generators/pps_gen_parport.c + create mode 100644 drivers/pps/kc.c + create mode 100644 drivers/pps/kc.h + create mode 100644 drivers/regulator/mc13892-regulator.c + create mode 100644 drivers/regulator/mc13xxx-regulator-core.c + create mode 100644 drivers/regulator/mc13xxx.h + create mode 100644 drivers/regulator/tps6524x-regulator.c + create mode 100644 drivers/staging/cs5535_gpio/Kconfig + create mode 100644 drivers/staging/cs5535_gpio/Makefile + create mode 100644 drivers/staging/cs5535_gpio/TODO + rename drivers/{char => staging/cs5535_gpio}/cs5535_gpio.c (100%) + create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c + delete mode 100644 drivers/video/omap2/displays/panel-generic.c + create mode 100644 drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c + delete mode 100644 drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c + delete mode 100644 drivers/video/omap2/displays/panel-toppoly-tdo35s.c + create mode 100644 drivers/w1/slaves/w1_ds2423.c + create mode 100644 drivers/watchdog/ath79_wdt.c + create mode 100644 drivers/watchdog/m548x_wdt.c + create mode 100644 drivers/watchdog/nv_tco.c + create mode 100644 drivers/watchdog/nv_tco.h + create mode 100644 drivers/watchdog/sp5100_tco.c + create mode 100644 drivers/watchdog/sp5100_tco.h + rename {include/linux => fs/coda}/coda_cache.h (100%) + rename {include/linux => fs/coda}/coda_fs_i.h (100%) + rename {include/linux => fs/coda}/coda_linux.h (97%) + create mode 100644 fs/ncpfs/ncp_fs.h + rename {include/linux => fs/ncpfs}/ncp_fs_i.h (100%) + rename {include/linux => fs/ncpfs}/ncp_fs_sb.h (86%) + rename fs/proc/{proc_console.c => consoles.c} (96%) + create mode 100644 include/crypto/if_alg.h + rename {drivers => include}/crypto/padlock.h (82%) + create mode 100644 include/linux/decompress/unxz.h + create mode 100644 include/linux/if_alg.h + create mode 100644 include/linux/input/as5011.h + create mode 100644 include/linux/mfd/mc13892.h + create mode 100644 include/linux/nfc/pn544.h + create mode 100644 include/linux/xz.h + create mode 100644 include/sound/alc5623.h + create mode 100644 include/trace/events/asoc.h + create mode 100644 include/trace/events/regulator.h + create mode 100644 lib/decompress_unxz.c + create mode 100644 lib/xz/Kconfig + create mode 100644 lib/xz/Makefile + create mode 100644 lib/xz/xz_crc32.c + create mode 100644 lib/xz/xz_dec_bcj.c + create mode 100644 lib/xz/xz_dec_lzma2.c + create mode 100644 lib/xz/xz_dec_stream.c + create mode 100644 lib/xz/xz_dec_syms.c + create mode 100644 lib/xz/xz_dec_test.c + create mode 100644 lib/xz/xz_lzma2.h + create mode 100644 lib/xz/xz_private.h + create mode 100644 lib/xz/xz_stream.h + create mode 100644 scripts/xz_wrap.sh + create mode 100644 sound/pci/oxygen/cs4245.h + delete mode 100644 sound/pci/oxygen/hifier.c + create mode 100644 sound/pci/oxygen/xonar_dg.c + create mode 100644 sound/pci/oxygen/xonar_dg.h + create mode 100644 sound/soc/codecs/alc5623.c + create mode 100644 sound/soc/codecs/alc5623.h + create mode 100644 sound/soc/codecs/dmic.c + create mode 100644 sound/soc/codecs/wm8737.c + create mode 100644 sound/soc/codecs/wm8737.h + create mode 100644 sound/soc/codecs/wm8770.c + create mode 100644 sound/soc/codecs/wm8770.h + create mode 100644 sound/soc/codecs/wm8994-tables.c + create mode 100644 sound/soc/codecs/wm8995.c + create mode 100644 sound/soc/codecs/wm8995.h + create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c + delete mode 100644 sound/soc/s3c24xx/Kconfig + delete mode 100644 sound/soc/s3c24xx/Makefile + delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h + create mode 100644 sound/soc/samsung/Kconfig + create mode 100644 sound/soc/samsung/Makefile + rename sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} (96%) + rename sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} (73%) + rename sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} (74%) + rename sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} (97%) + rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (84%) + copy sound/soc/{s3c24xx/rx1950_uda1380.c => samsung/h1940_uda1380.c} (56%) + create mode 100644 sound/soc/samsung/i2s.c + create mode 100644 sound/soc/samsung/i2s.h + rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (88%) + rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%) + rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (92%) + rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (88%) + rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (83%) + rename sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} (99%) + rename sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} (99%) + rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%) + rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (95%) + rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%) + rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (98%) + rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (87%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (86%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (99%) + rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (82%) + rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (92%) + rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (92%) + rename sound/soc/{s3c24xx/smdk64xx_wm8580.c => samsung/smdk_wm8580.c} (55%) + create mode 100644 sound/soc/samsung/smdk_wm8994.c + rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (87%) + rename sound/soc/{s3c24xx => samsung}/spdif.c (99%) + rename sound/soc/{s3c24xx => samsung}/spdif.h (94%) + create mode 100644 virt/kvm/async_pf.c + create mode 100644 virt/kvm/async_pf.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/include/asm/bitops.h | 2 +- + arch/arm/include/asm/sched_clock.h | 2 ++ + arch/arm/kernel/process.c | 2 ++ + arch/arm/kernel/sched_clock.c | 9 +++++++-- + arch/arm/kernel/setup.c | 6 ++++-- + arch/arm/kernel/smp_twd.c | 2 +- + arch/arm/kernel/time.c | 4 ++++ + arch/arm/lib/delay.S | 4 ++++ + arch/arm/mach-integrator/cpu.c | 2 +- + drivers/video/ep93xx-fb.c | 6 +++--- + 10 files changed, 29 insertions(+), 10 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging drivers/net/ucc_geth.c +Merge made by recursive. + Documentation/DocBook/80211.tmpl | 21 +++++++++++-- + drivers/net/bfin_mac.c | 2 +- + drivers/net/bna/bnad_ethtool.c | 1 - + drivers/net/ucc_geth.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 3 ++ + drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 ++ + drivers/net/wireless/ath/ath9k/htc.h | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 37 ++++++++++++++++------- + drivers/net/wireless/ath/ath9k/hw.c | 5 ++- + drivers/net/wireless/hostap/hostap_cs.c | 15 ++++------ + drivers/net/wireless/ipw2x00/ipw2200.c | 7 ++++ + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/ssb/scan.c | 10 ++++++ + include/linux/nl80211.h | 20 +++++++++--- + include/linux/skbuff.h | 15 +++++++++ + include/net/cfg80211.h | 2 + + include/net/mac80211.h | 14 +++++++++ + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 10 ------ + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 10 ++++++ + include/net/red.h | 1 - + net/ax25/af_ax25.c | 2 +- + net/core/skbuff.c | 2 + + net/ethernet/eth.c | 2 +- + net/ipv6/ip6_output.c | 3 ++ + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 8 ++++- + net/netfilter/nf_conntrack_netlink.c | 3 +- + 26 files changed, 152 insertions(+), 50 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/iwmc3200wifi/netdev.c | 2 ++ + drivers/net/wireless/rt2x00/rt2x00firmware.c | 1 + + include/linux/ieee80211.h | 2 +- + net/mac80211/agg-rx.c | 11 ++--------- + net/mac80211/main.c | 12 +++++++++++- + 5 files changed, 17 insertions(+), 11 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 50 ++++++++++---------- + drivers/Makefile | 3 +- + drivers/char/Kconfig | 2 +- + drivers/char/Makefile | 13 ----- + drivers/tty/Makefile | 2 + + drivers/tty/hvc/Makefile | 13 +++++ + drivers/{char => tty/hvc}/hvc_beat.c | 0 + drivers/{char => tty/hvc}/hvc_console.c | 0 + drivers/{char => tty/hvc}/hvc_console.h | 0 + drivers/{char => tty/hvc}/hvc_dcc.c | 0 + drivers/{char => tty/hvc}/hvc_irq.c | 0 + drivers/{char => tty/hvc}/hvc_iseries.c | 0 + drivers/{char => tty/hvc}/hvc_iucv.c | 0 + drivers/{char => tty/hvc}/hvc_rtas.c | 0 + drivers/{char => tty/hvc}/hvc_tile.c | 0 + drivers/{char => tty/hvc}/hvc_udbg.c | 0 + drivers/{char => tty/hvc}/hvc_vio.c | 0 + drivers/{char => tty/hvc}/hvc_xen.c | 0 + drivers/{char => tty/hvc}/hvcs.c | 0 + drivers/{char => tty/hvc}/hvsi.c | 0 + drivers/{char => tty/hvc}/virtio_console.c | 0 + drivers/{ => tty}/serial/21285.c | 0 + drivers/{ => tty}/serial/68328serial.c | 0 + drivers/{ => tty}/serial/68328serial.h | 0 + drivers/{ => tty}/serial/68360serial.c | 0 + drivers/{ => tty}/serial/8250.c | 0 + drivers/{ => tty}/serial/8250.h | 0 + drivers/{ => tty}/serial/8250_accent.c | 0 + drivers/{ => tty}/serial/8250_acorn.c | 0 + drivers/{ => tty}/serial/8250_boca.c | 0 + drivers/{ => tty}/serial/8250_early.c | 0 + drivers/{ => tty}/serial/8250_exar_st16c554.c | 0 + drivers/{ => tty}/serial/8250_fourport.c | 0 + drivers/{ => tty}/serial/8250_gsc.c | 0 + drivers/{ => tty}/serial/8250_hp300.c | 0 + drivers/{ => tty}/serial/8250_hub6.c | 0 + drivers/{ => tty}/serial/8250_mca.c | 0 + drivers/{ => tty}/serial/8250_pci.c | 0 + drivers/{ => tty}/serial/8250_pnp.c | 0 + drivers/{ => tty}/serial/Kconfig | 0 + drivers/{ => tty}/serial/Makefile | 0 + drivers/{ => tty}/serial/altera_jtaguart.c | 0 + drivers/{ => tty}/serial/altera_uart.c | 0 + drivers/{ => tty}/serial/amba-pl010.c | 0 + drivers/{ => tty}/serial/amba-pl011.c | 0 + drivers/{ => tty}/serial/apbuart.c | 0 + drivers/{ => tty}/serial/apbuart.h | 0 + drivers/{ => tty}/serial/atmel_serial.c | 0 + drivers/{ => tty}/serial/bcm63xx_uart.c | 0 + drivers/{ => tty}/serial/bfin_5xx.c | 0 + drivers/{ => tty}/serial/bfin_sport_uart.c | 0 + drivers/{ => tty}/serial/bfin_sport_uart.h | 0 + drivers/{ => tty}/serial/clps711x.c | 0 + drivers/{ => tty}/serial/cpm_uart/Makefile | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart.h | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c | 0 + drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h | 0 + drivers/{ => tty}/serial/crisv10.c | 0 + drivers/{ => tty}/serial/crisv10.h | 0 + drivers/{ => tty}/serial/dz.c | 0 + drivers/{ => tty}/serial/dz.h | 0 + drivers/{ => tty}/serial/icom.c | 0 + drivers/{ => tty}/serial/icom.h | 0 + drivers/{ => tty}/serial/ifx6x60.c | 0 + drivers/{ => tty}/serial/ifx6x60.h | 0 + drivers/{ => tty}/serial/imx.c | 0 + drivers/{ => tty}/serial/ioc3_serial.c | 0 + drivers/{ => tty}/serial/ioc4_serial.c | 0 + drivers/{ => tty}/serial/ip22zilog.c | 0 + drivers/{ => tty}/serial/ip22zilog.h | 0 + drivers/{ => tty}/serial/jsm/Makefile | 0 + drivers/{ => tty}/serial/jsm/jsm.h | 0 + drivers/{ => tty}/serial/jsm/jsm_driver.c | 0 + drivers/{ => tty}/serial/jsm/jsm_neo.c | 0 + drivers/{ => tty}/serial/jsm/jsm_tty.c | 0 + drivers/{ => tty}/serial/kgdboc.c | 0 + drivers/{ => tty}/serial/m32r_sio.c | 0 + drivers/{ => tty}/serial/m32r_sio.h | 0 + drivers/{ => tty}/serial/m32r_sio_reg.h | 0 + drivers/{ => tty}/serial/max3100.c | 0 + drivers/{ => tty}/serial/max3107-aava.c | 0 + drivers/{ => tty}/serial/max3107.c | 0 + drivers/{ => tty}/serial/max3107.h | 0 + drivers/{ => tty}/serial/mcf.c | 0 + drivers/{ => tty}/serial/mfd.c | 0 + drivers/{ => tty}/serial/mpc52xx_uart.c | 0 + drivers/{ => tty}/serial/mpsc.c | 0 + drivers/{ => tty}/serial/mrst_max3110.c | 0 + drivers/{ => tty}/serial/mrst_max3110.h | 0 + drivers/{ => tty}/serial/msm_serial.c | 0 + drivers/{ => tty}/serial/msm_serial.h | 0 + drivers/{ => tty}/serial/mux.c | 0 + drivers/{ => tty}/serial/netx-serial.c | 0 + drivers/{ => tty}/serial/nwpserial.c | 0 + drivers/{ => tty}/serial/of_serial.c | 0 + drivers/{ => tty}/serial/omap-serial.c | 0 + drivers/{ => tty}/serial/pch_uart.c | 0 + drivers/{ => tty}/serial/pmac_zilog.c | 0 + drivers/{ => tty}/serial/pmac_zilog.h | 0 + drivers/{ => tty}/serial/pnx8xxx_uart.c | 0 + drivers/{ => tty}/serial/pxa.c | 0 + drivers/{ => tty}/serial/s3c2400.c | 0 + drivers/{ => tty}/serial/s3c2410.c | 0 + drivers/{ => tty}/serial/s3c2412.c | 0 + drivers/{ => tty}/serial/s3c2440.c | 0 + drivers/{ => tty}/serial/s3c24a0.c | 0 + drivers/{ => tty}/serial/s3c6400.c | 0 + drivers/{ => tty}/serial/s5pv210.c | 0 + drivers/{ => tty}/serial/sa1100.c | 0 + drivers/{ => tty}/serial/samsung.c | 0 + drivers/{ => tty}/serial/samsung.h | 0 + drivers/{ => tty}/serial/sb1250-duart.c | 0 + drivers/{ => tty}/serial/sc26xx.c | 0 + drivers/{ => tty}/serial/serial_core.c | 0 + drivers/{ => tty}/serial/serial_cs.c | 0 + drivers/{ => tty}/serial/serial_ks8695.c | 0 + drivers/{ => tty}/serial/serial_lh7a40x.c | 0 + drivers/{ => tty}/serial/serial_txx9.c | 0 + drivers/{ => tty}/serial/sh-sci.c | 0 + drivers/{ => tty}/serial/sh-sci.h | 0 + drivers/{ => tty}/serial/sn_console.c | 0 + drivers/{ => tty}/serial/suncore.c | 0 + drivers/{ => tty}/serial/suncore.h | 0 + drivers/{ => tty}/serial/sunhv.c | 0 + drivers/{ => tty}/serial/sunsab.c | 0 + drivers/{ => tty}/serial/sunsab.h | 0 + drivers/{ => tty}/serial/sunsu.c | 0 + drivers/{ => tty}/serial/sunzilog.c | 0 + drivers/{ => tty}/serial/sunzilog.h | 0 + drivers/{ => tty}/serial/timbuart.c | 0 + drivers/{ => tty}/serial/timbuart.h | 0 + drivers/{ => tty}/serial/uartlite.c | 0 + drivers/{ => tty}/serial/ucc_uart.c | 0 + drivers/{ => tty}/serial/vr41xx_siu.c | 0 + drivers/{ => tty}/serial/vt8500_serial.c | 0 + drivers/{ => tty}/serial/zs.c | 0 + drivers/{ => tty}/serial/zs.h | 0 + 140 files changed, 42 insertions(+), 41 deletions(-) + create mode 100644 drivers/tty/hvc/Makefile + rename drivers/{char => tty/hvc}/hvc_beat.c (100%) + rename drivers/{char => tty/hvc}/hvc_console.c (100%) + rename drivers/{char => tty/hvc}/hvc_console.h (100%) + rename drivers/{char => tty/hvc}/hvc_dcc.c (100%) + rename drivers/{char => tty/hvc}/hvc_irq.c (100%) + rename drivers/{char => tty/hvc}/hvc_iseries.c (100%) + rename drivers/{char => tty/hvc}/hvc_iucv.c (100%) + rename drivers/{char => tty/hvc}/hvc_rtas.c (100%) + rename drivers/{char => tty/hvc}/hvc_tile.c (100%) + rename drivers/{char => tty/hvc}/hvc_udbg.c (100%) + rename drivers/{char => tty/hvc}/hvc_vio.c (100%) + rename drivers/{char => tty/hvc}/hvc_xen.c (100%) + rename drivers/{char => tty/hvc}/hvcs.c (100%) + rename drivers/{char => tty/hvc}/hvsi.c (100%) + rename drivers/{char => tty/hvc}/virtio_console.c (100%) + rename drivers/{ => tty}/serial/21285.c (100%) + rename drivers/{ => tty}/serial/68328serial.c (100%) + rename drivers/{ => tty}/serial/68328serial.h (100%) + rename drivers/{ => tty}/serial/68360serial.c (100%) + rename drivers/{ => tty}/serial/8250.c (100%) + rename drivers/{ => tty}/serial/8250.h (100%) + rename drivers/{ => tty}/serial/8250_accent.c (100%) + rename drivers/{ => tty}/serial/8250_acorn.c (100%) + rename drivers/{ => tty}/serial/8250_boca.c (100%) + rename drivers/{ => tty}/serial/8250_early.c (100%) + rename drivers/{ => tty}/serial/8250_exar_st16c554.c (100%) + rename drivers/{ => tty}/serial/8250_fourport.c (100%) + rename drivers/{ => tty}/serial/8250_gsc.c (100%) + rename drivers/{ => tty}/serial/8250_hp300.c (100%) + rename drivers/{ => tty}/serial/8250_hub6.c (100%) + rename drivers/{ => tty}/serial/8250_mca.c (100%) + rename drivers/{ => tty}/serial/8250_pci.c (100%) + rename drivers/{ => tty}/serial/8250_pnp.c (100%) + rename drivers/{ => tty}/serial/Kconfig (100%) + rename drivers/{ => tty}/serial/Makefile (100%) + rename drivers/{ => tty}/serial/altera_jtaguart.c (100%) + rename drivers/{ => tty}/serial/altera_uart.c (100%) + rename drivers/{ => tty}/serial/amba-pl010.c (100%) + rename drivers/{ => tty}/serial/amba-pl011.c (100%) + rename drivers/{ => tty}/serial/apbuart.c (100%) + rename drivers/{ => tty}/serial/apbuart.h (100%) + rename drivers/{ => tty}/serial/atmel_serial.c (100%) + rename drivers/{ => tty}/serial/bcm63xx_uart.c (100%) + rename drivers/{ => tty}/serial/bfin_5xx.c (100%) + rename drivers/{ => tty}/serial/bfin_sport_uart.c (100%) + rename drivers/{ => tty}/serial/bfin_sport_uart.h (100%) + rename drivers/{ => tty}/serial/clps711x.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/Makefile (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart.h (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c (100%) + rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h (100%) + rename drivers/{ => tty}/serial/crisv10.c (100%) + rename drivers/{ => tty}/serial/crisv10.h (100%) + rename drivers/{ => tty}/serial/dz.c (100%) + rename drivers/{ => tty}/serial/dz.h (100%) + rename drivers/{ => tty}/serial/icom.c (100%) + rename drivers/{ => tty}/serial/icom.h (100%) + rename drivers/{ => tty}/serial/ifx6x60.c (100%) + rename drivers/{ => tty}/serial/ifx6x60.h (100%) + rename drivers/{ => tty}/serial/imx.c (100%) + rename drivers/{ => tty}/serial/ioc3_serial.c (100%) + rename drivers/{ => tty}/serial/ioc4_serial.c (100%) + rename drivers/{ => tty}/serial/ip22zilog.c (100%) + rename drivers/{ => tty}/serial/ip22zilog.h (100%) + rename drivers/{ => tty}/serial/jsm/Makefile (100%) + rename drivers/{ => tty}/serial/jsm/jsm.h (100%) + rename drivers/{ => tty}/serial/jsm/jsm_driver.c (100%) + rename drivers/{ => tty}/serial/jsm/jsm_neo.c (100%) + rename drivers/{ => tty}/serial/jsm/jsm_tty.c (100%) + rename drivers/{ => tty}/serial/kgdboc.c (100%) + rename drivers/{ => tty}/serial/m32r_sio.c (100%) + rename drivers/{ => tty}/serial/m32r_sio.h (100%) + rename drivers/{ => tty}/serial/m32r_sio_reg.h (100%) + rename drivers/{ => tty}/serial/max3100.c (100%) + rename drivers/{ => tty}/serial/max3107-aava.c (100%) + rename drivers/{ => tty}/serial/max3107.c (100%) + rename drivers/{ => tty}/serial/max3107.h (100%) + rename drivers/{ => tty}/serial/mcf.c (100%) + rename drivers/{ => tty}/serial/mfd.c (100%) + rename drivers/{ => tty}/serial/mpc52xx_uart.c (100%) + rename drivers/{ => tty}/serial/mpsc.c (100%) + rename drivers/{ => tty}/serial/mrst_max3110.c (100%) + rename drivers/{ => tty}/serial/mrst_max3110.h (100%) + rename drivers/{ => tty}/serial/msm_serial.c (100%) + rename drivers/{ => tty}/serial/msm_serial.h (100%) + rename drivers/{ => tty}/serial/mux.c (100%) + rename drivers/{ => tty}/serial/netx-serial.c (100%) + rename drivers/{ => tty}/serial/nwpserial.c (100%) + rename drivers/{ => tty}/serial/of_serial.c (100%) + rename drivers/{ => tty}/serial/omap-serial.c (100%) + rename drivers/{ => tty}/serial/pch_uart.c (100%) + rename drivers/{ => tty}/serial/pmac_zilog.c (100%) + rename drivers/{ => tty}/serial/pmac_zilog.h (100%) + rename drivers/{ => tty}/serial/pnx8xxx_uart.c (100%) + rename drivers/{ => tty}/serial/pxa.c (100%) + rename drivers/{ => tty}/serial/s3c2400.c (100%) + rename drivers/{ => tty}/serial/s3c2410.c (100%) + rename drivers/{ => tty}/serial/s3c2412.c (100%) + rename drivers/{ => tty}/serial/s3c2440.c (100%) + rename drivers/{ => tty}/serial/s3c24a0.c (100%) + rename drivers/{ => tty}/serial/s3c6400.c (100%) + rename drivers/{ => tty}/serial/s5pv210.c (100%) + rename drivers/{ => tty}/serial/sa1100.c (100%) + rename drivers/{ => tty}/serial/samsung.c (100%) + rename drivers/{ => tty}/serial/samsung.h (100%) + rename drivers/{ => tty}/serial/sb1250-duart.c (100%) + rename drivers/{ => tty}/serial/sc26xx.c (100%) + rename drivers/{ => tty}/serial/serial_core.c (100%) + rename drivers/{ => tty}/serial/serial_cs.c (100%) + rename drivers/{ => tty}/serial/serial_ks8695.c (100%) + rename drivers/{ => tty}/serial/serial_lh7a40x.c (100%) + rename drivers/{ => tty}/serial/serial_txx9.c (100%) + rename drivers/{ => tty}/serial/sh-sci.c (100%) + rename drivers/{ => tty}/serial/sh-sci.h (100%) + rename drivers/{ => tty}/serial/sn_console.c (100%) + rename drivers/{ => tty}/serial/suncore.c (100%) + rename drivers/{ => tty}/serial/suncore.h (100%) + rename drivers/{ => tty}/serial/sunhv.c (100%) + rename drivers/{ => tty}/serial/sunsab.c (100%) + rename drivers/{ => tty}/serial/sunsab.h (100%) + rename drivers/{ => tty}/serial/sunsu.c (100%) + rename drivers/{ => tty}/serial/sunzilog.c (100%) + rename drivers/{ => tty}/serial/sunzilog.h (100%) + rename drivers/{ => tty}/serial/timbuart.c (100%) + rename drivers/{ => tty}/serial/timbuart.h (100%) + rename drivers/{ => tty}/serial/uartlite.c (100%) + rename drivers/{ => tty}/serial/ucc_uart.c (100%) + rename drivers/{ => tty}/serial/vr41xx_siu.c (100%) + rename drivers/{ => tty}/serial/vt8500_serial.c (100%) + rename drivers/{ => tty}/serial/zs.c (100%) + rename drivers/{ => tty}/serial/zs.h (100%) +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Auto-merging drivers/md/md.c +Merge made by recursive. + drivers/md/bitmap.c | 12 ++- + drivers/md/md.c | 197 +++++++++++++++++++++++++++++++-------------------- + drivers/md/md.h | 13 +++- + drivers/md/raid1.c | 33 ++++----- + drivers/md/raid10.c | 17 +++-- + drivers/md/raid5.c | 16 +++-- + 6 files changed, 172 insertions(+), 116 deletions(-) +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +$ git revert 66cb76666d69502fe982990b2cff5b6d607fd3b1 +Finished one revert. +[master 133c309] Revert "sanitize ecryptfs ->mount()" + 2 files changed, 88 insertions(+), 68 deletions(-) +Merging arm/devel +$ git merge arm/devel +Merge made by recursive. + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 24 ++++++++++++++---------- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/lib/uaccess_with_memcpy.c | 7 ++++++- + arch/arm/mm/dma-mapping.c | 11 ++++++++++- + arch/arm/mm/fault-armv.c | 7 ++++++- + arch/arm/mm/fault.c | 29 +++++++++++++++++++++++++---- + arch/arm/mm/idmap.c | 35 +++++++++++++++++++++++++++++------ + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 22 ++++++++++++++++++---- + arch/arm/mm/pgd.c | 24 ++++++++++++++++++++---- + 11 files changed, 131 insertions(+), 33 deletions(-) +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Removing arch/arm/mach-mxs/devices/platform-duart.c +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/mach-mx27_3ds.c | 10 +++- + arch/arm/mach-mx5/Kconfig | 5 ++ + arch/arm/mach-mx5/board-mx51_3ds.c | 5 +- + arch/arm/mach-mx5/board-mx53_evk.c | 51 ++++++++++++++++++++ + arch/arm/mach-mx5/clock-mx51-mx53.c | 11 ++++- + arch/arm/mach-mx5/devices-imx51.h | 8 +++ + arch/arm/mach-mx5/devices-imx53.h | 18 +++++++ + arch/arm/mach-mx5/devices.c | 19 ------- + arch/arm/mach-mx5/devices.h | 1 - + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 5 +- + arch/arm/mach-mxs/Kconfig | 4 +- + arch/arm/mach-mxs/clock-mx23.c | 12 ++++- + arch/arm/mach-mxs/clock-mx28.c | 13 +++++- + arch/arm/mach-mxs/devices-mx23.h | 4 +- + arch/arm/mach-mxs/devices-mx28.h | 4 +- + arch/arm/mach-mxs/devices.c | 17 ++++++- + arch/arm/mach-mxs/devices/Kconfig | 3 +- + arch/arm/mach-mxs/devices/Makefile | 2 +- + arch/arm/mach-mxs/devices/amba-duart.c | 40 +++++++++++++++ + arch/arm/mach-mxs/devices/platform-duart.c | 48 ------------------ + arch/arm/mach-mxs/devices/platform-fec.c | 2 +- + arch/arm/mach-mxs/include/mach/devices-common.h | 11 ++--- + arch/arm/mach-mxs/mach-mx28evk.c | 26 +++++++++- + arch/arm/plat-mxc/devices/Kconfig | 2 +- + arch/arm/plat-mxc/devices/platform-fec.c | 5 ++ + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 9 ++++ + arch/arm/plat-mxc/devices/platform-imx-keypad.c | 5 ++ + arch/arm/plat-mxc/devices/platform-mxc_pwm.c | 9 ++++ + .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 12 +++++ + arch/arm/plat-mxc/devices/platform-spi_imx.c | 12 +++++ + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 1 - + arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 + + arch/arm/plat-mxc/include/mach/mx51.h | 6 +- + arch/arm/plat-mxc/include/mach/mx53.h | 28 +++++----- + 35 files changed, 289 insertions(+), 121 deletions(-) + create mode 100644 arch/arm/mach-mxs/devices/amba-duart.c + delete mode 100644 arch/arm/mach-mxs/devices/platform-duart.c +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Resolved 'arch/arm/mach-omap2/board-omap3beagle.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/board-igep0020.c +Auto-merging arch/arm/mach-omap2/board-omap3beagle.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3beagle.c +Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c +Auto-merging arch/arm/mm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0e7da5b] Merge remote branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap2/board-4430sdp.c | 10 ++- + arch/arm/mach-omap2/board-igep0020.c | 33 ++++++++++ + arch/arm/mach-omap2/board-igep0030.c | 85 ++++++++++++++++++++++---- + arch/arm/mach-omap2/board-omap3beagle.c | 60 ++++++++++++++++-- + arch/arm/mach-omap2/board-omap4panda.c | 10 +++ + arch/arm/mach-omap2/board-zoom-peripherals.c | 4 +- + arch/arm/mach-omap2/clock3xxx_data.c | 2 +- + arch/arm/mach-omap2/clockdomain.h | 2 - + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/mux34xx.c | 4 +- + arch/arm/mach-omap2/mux44xx.c | 6 +- + arch/arm/mach-omap2/omap_twl.c | 10 ++- + arch/arm/mach-omap2/pm_bus.c | 4 +- + arch/arm/mach-omap2/prm2xxx_3xxx.h | 63 +++++++++++++++++++- + arch/arm/mach-omap2/sr_device.c | 1 + + arch/arm/mach-omap2/wd_timer.c | 2 + + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-omap/gpio.c | 12 +++- + arch/arm/plat-omap/include/plat/voltage.h | 17 ++++- + 20 files changed, 280 insertions(+), 51 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c2440/mach-rx1950.c +Merge made by recursive. + arch/arm/mach-s3c2410/h1940-bluetooth.c | 11 +- + arch/arm/mach-s3c2410/include/mach/h1940.h | 3 + + arch/arm/mach-s3c2410/mach-h1940.c | 302 ++++++++++++++++++++++++++-- + arch/arm/mach-s3c2440/mach-rx1950.c | 57 ++++++ + 4 files changed, 356 insertions(+), 17 deletions(-) +Merging s5p/for-next +$ git merge s5p/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mach-s3c64xx/dma.c +Auto-merging arch/arm/mach-s5pv310/cpu.c +Removing arch/arm/mach-s5pv310/include/mach/regs-srom.h +Auto-merging arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-samsung/Makefile +Auto-merging arch/arm/plat-samsung/include/plat/devs.h +Auto-merging arch/arm/plat-samsung/pm.c +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/mach-s3c2410/bast-irq.c | 22 +- + arch/arm/mach-s3c2410/include/mach/irqs.h | 4 +- + arch/arm/mach-s3c2410/include/mach/map.h | 4 +- + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 + + arch/arm/mach-s3c2412/irq.c | 50 +- + arch/arm/mach-s3c2416/Kconfig | 12 + + arch/arm/mach-s3c2416/Makefile | 4 + + arch/arm/mach-s3c2416/clock.c | 18 +- + arch/arm/mach-s3c2416/irq.c | 76 ++-- + arch/arm/mach-s3c2416/mach-smdk2416.c | 23 + + arch/arm/mach-s3c2416/s3c2416.c | 5 + + arch/arm/mach-s3c2416/setup-sdhci-gpio.c | 34 ++ + arch/arm/mach-s3c2416/setup-sdhci.c | 61 ++ + arch/arm/mach-s3c2440/irq.c | 18 +- + arch/arm/mach-s3c2440/s3c244x-irq.c | 18 +- + arch/arm/mach-s3c2443/Kconfig | 3 +- + arch/arm/mach-s3c2443/clock.c | 4 +- + arch/arm/mach-s3c2443/irq.c | 95 ++-- + arch/arm/mach-s3c2443/mach-smdk2443.c | 9 +- + arch/arm/mach-s3c2443/s3c2443.c | 7 + + arch/arm/mach-s3c64xx/clock.c | 19 +- + arch/arm/mach-s3c64xx/dma.c | 1 + + arch/arm/mach-s3c64xx/irq-eint.c | 37 +- + arch/arm/mach-s5p6442/clock.c | 16 +- + arch/arm/mach-s5p6442/include/mach/map.h | 3 + + arch/arm/mach-s5p6442/mach-smdk6442.c | 10 + + arch/arm/mach-s5p6442/setup-i2c0.c | 5 +- + arch/arm/mach-s5p64x0/Makefile | 4 +- + arch/arm/mach-s5p64x0/clock-s5p6440.c | 22 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 34 +- + arch/arm/mach-s5p64x0/dev-audio.c | 123 ++++- + arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} | 221 +++++++- + arch/arm/mach-s5p64x0/include/mach/map.h | 5 + + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 57 +-- + arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 + + arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 + + arch/arm/mach-s5pc100/clock.c | 16 +- + arch/arm/mach-s5pc100/include/mach/map.h | 2 + + arch/arm/mach-s5pv210/Kconfig | 2 + + arch/arm/mach-s5pv210/clock.c | 25 +- + arch/arm/mach-s5pv210/cpu.c | 5 - + arch/arm/mach-s5pv210/include/mach/irqs.h | 3 +- + arch/arm/mach-s5pv210/include/mach/map.h | 6 + + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 5 +- + arch/arm/mach-s5pv210/mach-smdkc110.c | 1 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 139 +++++- + arch/arm/mach-s5pv310/Kconfig | 21 + + arch/arm/mach-s5pv310/Makefile | 6 +- + arch/arm/mach-s5pv310/clock.c | 77 ++- + arch/arm/mach-s5pv310/cpu.c | 21 +- + arch/arm/mach-s5pv310/cpufreq.c | 580 ++++++++++++++++++++ + arch/arm/mach-s5pv310/dev-pd.c | 139 +++++ + arch/arm/mach-s5pv310/dev-sysmmu.c | 187 +++++++ + arch/arm/mach-s5pv310/include/mach/irqs.h | 34 +- + arch/arm/mach-s5pv310/include/mach/map.h | 29 + + arch/arm/mach-s5pv310/include/mach/regs-clock.h | 80 +++- + arch/arm/mach-s5pv310/include/mach/regs-mem.h | 23 + + arch/arm/mach-s5pv310/include/mach/regs-pmu.h | 30 + + arch/arm/mach-s5pv310/include/mach/regs-srom.h | 50 -- + arch/arm/mach-s5pv310/include/mach/regs-sysmmu.h | 24 + + arch/arm/mach-s5pv310/include/mach/sysmmu.h | 119 ++++ + arch/arm/mach-s5pv310/irq-combiner.c | 32 +- + arch/arm/mach-s5pv310/irq-eint.c | 55 +- + arch/arm/mach-s5pv310/mach-smdkc210.c | 52 ++- + arch/arm/mach-s5pv310/mach-smdkv310.c | 52 ++- + arch/arm/mach-s5pv310/mach-universal_c210.c | 80 +++ + arch/arm/plat-s3c24xx/devs.c | 1 - + arch/arm/plat-s3c24xx/include/plat/irq.h | 4 +- + arch/arm/plat-s3c24xx/irq-pm.c | 9 +- + arch/arm/plat-s3c24xx/irq.c | 182 +++---- + arch/arm/plat-s3c24xx/s3c2443-clock.c | 2 +- + arch/arm/plat-s5p/Kconfig | 26 + + arch/arm/plat-s5p/Makefile | 3 + + arch/arm/plat-s5p/cpu.c | 5 + + arch/arm/plat-s5p/dev-csis0.c | 34 ++ + arch/arm/plat-s5p/dev-csis1.c | 34 ++ + arch/arm/plat-s5p/include/plat/csis.h | 28 + + arch/arm/plat-s5p/include/plat/map-s5p.h | 1 + + arch/arm/plat-s5p/include/plat/regs-srom.h | 54 ++ + arch/arm/plat-s5p/include/plat/sysmmu.h | 23 + + arch/arm/plat-s5p/irq-eint.c | 86 ++-- + arch/arm/plat-s5p/irq-gpioint.c | 50 +- + arch/arm/plat-s5p/irq-pm.c | 6 +- + arch/arm/plat-s5p/sysmmu.c | 328 +++++++++++ + arch/arm/plat-samsung/Kconfig | 14 + + arch/arm/plat-samsung/Makefile | 4 + + arch/arm/plat-samsung/clock.c | 92 +++ + arch/arm/plat-samsung/dev-nand.c | 2 - + arch/arm/plat-samsung/gpio-config.c | 42 ++ + arch/arm/plat-samsung/gpiolib.c | 7 + + arch/arm/plat-samsung/include/plat/clock.h | 3 + + arch/arm/plat-samsung/include/plat/devs.h | 8 + + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-core.h | 2 + + arch/arm/plat-samsung/include/plat/pd.h | 30 + + arch/arm/plat-samsung/include/plat/pm.h | 4 +- + arch/arm/plat-samsung/include/plat/sdhci.h | 35 ++ + arch/arm/plat-samsung/irq-uart.c | 40 +- + arch/arm/plat-samsung/irq-vic-timer.c | 26 +- + arch/arm/plat-samsung/pd.c | 95 ++++ + arch/arm/plat-samsung/pm.c | 6 +- + drivers/tty/serial/samsung.c | 4 +- + 103 files changed, 3494 insertions(+), 721 deletions(-) + create mode 100644 arch/arm/mach-s3c2416/setup-sdhci-gpio.c + create mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c + rename arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} (58%) + create mode 100644 arch/arm/mach-s5pv310/cpufreq.c + create mode 100644 arch/arm/mach-s5pv310/dev-pd.c + create mode 100644 arch/arm/mach-s5pv310/dev-sysmmu.c + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-mem.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-pmu.h + delete mode 100644 arch/arm/mach-s5pv310/include/mach/regs-srom.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-sysmmu.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/sysmmu.h + create mode 100644 arch/arm/plat-s5p/dev-csis0.c + create mode 100644 arch/arm/plat-s5p/dev-csis1.c + create mode 100644 arch/arm/plat-s5p/include/plat/csis.h + create mode 100644 arch/arm/plat-s5p/include/plat/regs-srom.h + create mode 100644 arch/arm/plat-s5p/include/plat/sysmmu.h + create mode 100644 arch/arm/plat-s5p/sysmmu.c + create mode 100644 arch/arm/plat-samsung/include/plat/pd.h + create mode 100644 arch/arm/plat-samsung/pd.c +Merging tegra/for-next +$ git merge tegra/for-next +Resolved 'arch/arm/mach-tegra/timer.c' using previous resolution. +Auto-merging arch/arm/mach-tegra/timer.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eb9fa8e] Merge remote branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Merge made by recursive. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/Kconfig | 1 - + arch/cris/arch-v10/drivers/axisflashmap.c | 6 ------ + arch/cris/arch-v32/drivers/Kconfig | 1 - + arch/cris/arch-v32/drivers/axisflashmap.c | 6 ------ + 4 files changed, 0 insertions(+), 14 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + Documentation/ABI/testing/pstore | 35 ++++ + Documentation/ABI/testing/sysfs-fs-pstore | 7 + + arch/ia64/include/asm/dma-mapping.h | 2 + + arch/ia64/kernel/perfmon.c | 2 +- + drivers/acpi/apei/Kconfig | 1 + + drivers/acpi/apei/erst.c | 136 ++++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/pstore/Kconfig | 13 ++ + fs/pstore/Makefile | 7 + + fs/pstore/inode.c | 285 +++++++++++++++++++++++++++++ + fs/pstore/internal.h | 7 + + fs/pstore/platform.c | 202 ++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/pstore.h | 60 ++++++ + 15 files changed, 759 insertions(+), 1 deletions(-) + create mode 100644 Documentation/ABI/testing/pstore + create mode 100644 Documentation/ABI/testing/sysfs-fs-pstore + create mode 100644 fs/pstore/Kconfig + create mode 100644 fs/pstore/Makefile + create mode 100644 fs/pstore/inode.c + create mode 100644 fs/pstore/internal.h + create mode 100644 fs/pstore/platform.c + create mode 100644 include/linux/pstore.h +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Renaming arch/m68k/include/asm/m548xgpt.h => arch/m68k/include/asm/m54xxgpt.h +Auto-merging arch/m68k/include/asm/m54xxgpt.h +Removing arch/m68k/include/asm/mcfcache.h +Removing arch/m68knommu/mm/fault.c +Removing arch/m68knommu/mm/memory.c +Auto-merging arch/m68knommu/platform/coldfire/entry.S +Merge made by recursive. + arch/m68k/include/asm/cacheflush_no.h | 95 ++++++-------- + arch/m68k/include/asm/coldfire.h | 2 +- + arch/m68k/include/asm/entry_no.h | 59 +++++---- + arch/m68k/include/asm/gpio.h | 2 +- + arch/m68k/include/asm/io_no.h | 1 - + arch/m68k/include/asm/m5206sim.h | 14 ++- + arch/m68k/include/asm/m520xsim.h | 17 +++- + arch/m68k/include/asm/m523xsim.h | 11 ++ + arch/m68k/include/asm/m5249sim.h | 10 ++ + arch/m68k/include/asm/m5272sim.h | 8 + + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 11 ++ + arch/m68k/include/asm/m52xxacr.h | 94 ++++++++++++++ + arch/m68k/include/asm/m5307sim.h | 43 +++---- + arch/m68k/include/asm/m532xsim.h | 33 ++---- + arch/m68k/include/asm/m53xxacr.h | 101 +++++++++++++++ + arch/m68k/include/asm/m5407sim.h | 42 +----- + arch/m68k/include/asm/m54xxacr.h | 97 ++++++++++++++ + arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- + arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 23 +++- + arch/m68k/include/asm/mcfcache.h | 150 ---------------------- + arch/m68k/include/asm/mcfsim.h | 4 +- + arch/m68k/include/asm/mcfuart.h | 45 +------- + arch/m68k/include/asm/processor.h | 13 +- + arch/m68knommu/Kconfig | 99 +++++++++++++-- + arch/m68knommu/Makefile | 14 +- + arch/m68knommu/kernel/setup.c | 72 +++-------- + arch/m68knommu/mm/Makefile | 2 +- + arch/m68knommu/mm/fault.c | 57 -------- + arch/m68knommu/mm/kmap.c | 9 -- + arch/m68knommu/mm/memory.c | 33 ----- + arch/m68knommu/platform/{548x => 54xx}/Makefile | 0 + arch/m68knommu/platform/{548x => 54xx}/config.c | 32 +++--- + arch/m68knommu/platform/coldfire/Makefile | 4 +- + arch/m68knommu/platform/coldfire/cache.c | 48 +++++++ + arch/m68knommu/platform/coldfire/entry.S | 56 ++------- + arch/m68knommu/platform/coldfire/head.S | 26 +++- + 37 files changed, 726 insertions(+), 621 deletions(-) + create mode 100644 arch/m68k/include/asm/m52xxacr.h + create mode 100644 arch/m68k/include/asm/m53xxacr.h + create mode 100644 arch/m68k/include/asm/m54xxacr.h + rename arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} (95%) + rename arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} (73%) + delete mode 100644 arch/m68k/include/asm/mcfcache.h + delete mode 100644 arch/m68knommu/mm/fault.c + delete mode 100644 arch/m68knommu/mm/memory.c + rename arch/m68knommu/platform/{548x => 54xx}/Makefile (100%) + rename arch/m68knommu/platform/{548x => 54xx}/config.c (74%) + create mode 100644 arch/m68knommu/platform/coldfire/cache.c +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/txx9/generic/pci.c +Merge made by recursive. + arch/mips/Kconfig | 4 + + arch/mips/include/asm/cpu-info.h | 1 + + arch/mips/include/asm/inst.h | 14 + + arch/mips/include/asm/jump_label.h | 48 +++ + arch/mips/include/asm/mips_machine.h | 54 +++ + arch/mips/include/asm/mmu_context.h | 8 +- + arch/mips/include/asm/uasm.h | 7 + + arch/mips/kernel/Makefile | 3 + + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/jump_label.c | 54 +++ + arch/mips/kernel/mips_machine.c | 86 +++++ + arch/mips/kernel/module.c | 5 + + arch/mips/kernel/proc.c | 9 +- + arch/mips/kernel/traps.c | 2 +- + arch/mips/kernel/vmlinux.lds.S | 7 + + arch/mips/mm/tlbex.c | 590 +++++++++++++++++++++++++++++----- + arch/mips/mm/uasm.c | 56 ++-- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/mips/txx9/generic/pci.c | 7 +- + 19 files changed, 832 insertions(+), 128 deletions(-) + create mode 100644 arch/mips/include/asm/jump_label.h + create mode 100644 arch/mips/include/asm/mips_machine.h + create mode 100644 arch/mips/kernel/jump_label.c + create mode 100644 arch/mips/kernel/mips_machine.c +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Auto-merging arch/powerpc/boot/dts/mpc8308rdb.dts +Auto-merging arch/powerpc/sysdev/fsl_rio.c +Merge made by recursive. + arch/powerpc/boot/dts/mpc8308rdb.dts | 2 +- + arch/powerpc/boot/dts/p1022ds.dts | 4 ++-- + arch/powerpc/include/asm/immap_qe.h | 21 +++++++++++++++------ + arch/powerpc/include/asm/reg.h | 2 ++ + arch/powerpc/include/asm/reg_booke.h | 14 ++++++++++++++ + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 ++++++ + arch/powerpc/platforms/83xx/mpc83xx.h | 2 ++ + arch/powerpc/platforms/83xx/usb.c | 21 ++++++++++++++++----- + arch/powerpc/sysdev/fsl_rio.c | 2 -- + 9 files changed, 58 insertions(+), 16 deletions(-) +Merging s390/features +$ git merge s390/features +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 3 +- + arch/s390/defconfig | 16 ++++++++++- + arch/s390/include/asm/compat.h | 2 +- + arch/s390/include/asm/elf.h | 9 +++++- + arch/s390/include/asm/system.h | 2 +- + arch/s390/include/asm/thread_info.h | 6 ++++ + arch/s390/kernel/process.c | 38 +++++++++++++++++++++++++++ + arch/s390/kernel/vdso.c | 4 +-- + arch/s390/mm/mmap.c | 49 ++++++++++++++++++++++------------- + drivers/s390/cio/device.c | 1 + + 10 files changed, 103 insertions(+), 27 deletions(-) +Merging sh/sh-latest +$ git merge sh/sh-latest +Already up-to-date. +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Merge made by recursive. + arch/arm/mach-shmobile/Kconfig | 1 + + arch/arm/mach-shmobile/intc-sh73a0.c | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 22fd3cb] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/main.c +Auto-merging include/linux/magic.h +Merge made by recursive. + fs/ecryptfs/crypto.c | 30 ++++++++++++++---------------- + fs/ecryptfs/ecryptfs_kernel.h | 5 ++--- + fs/ecryptfs/file.c | 28 +++++++++++++--------------- + fs/ecryptfs/inode.c | 32 ++++++++++++++------------------ + fs/ecryptfs/keystore.c | 26 +++++++++++++------------- + fs/ecryptfs/kthread.c | 19 +++++++++++++++---- + fs/ecryptfs/main.c | 12 +++++++----- + fs/ecryptfs/mmap.c | 35 +++++++++++++++++++++-------------- + include/linux/magic.h | 1 + + 9 files changed, 100 insertions(+), 88 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +Merge made by recursive. + fs/ext3/super.c | 25 +++++++------------------ + fs/ext4/super.c | 25 +++++++------------------ + fs/ocfs2/super.c | 5 ++--- + fs/quota/dquot.c | 18 ++---------------- + fs/quota/quota.c | 41 +++++++++++++++++++++++++++-------------- + fs/reiserfs/super.c | 17 ++++++----------- + include/linux/quota.h | 5 ++++- + include/linux/quotaops.h | 4 +--- + 8 files changed, 56 insertions(+), 84 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merging fs/fuse/dir.c +Merge made by recursive. + fs/fuse/dir.c | 36 +++++++++++++++++++++++++----------- + 1 files changed, 25 insertions(+), 11 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 66592b7] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging fs/nfs/dir.c +Merge made by recursive. + fs/nfs/dir.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging Documentation/filesystems/Locking +Auto-merging fs/locks.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/nfs4.h +Auto-merging include/linux/sunrpc/cache.h +Auto-merging include/linux/sunrpc/svc.h +Auto-merging include/linux/sunrpc/svc_xprt.h +Auto-merging net/sunrpc/svc.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/sunrpc/xprtsock.c +Merge made by recursive. + Documentation/filesystems/Locking | 2 - + fs/locks.c | 8 +- + include/linux/nfs4_acl.h => fs/nfsd/acl.h | 2 - + include/linux/nfsd_idmap.h => fs/nfsd/idmap.h | 6 +- + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4acl.c | 2 +- + fs/nfsd/nfs4callback.c | 135 ++++++++++----- + fs/nfsd/nfs4idmap.c | 15 +- + fs/nfsd/nfs4proc.c | 59 +++++-- + fs/nfsd/nfs4recover.c | 1 - + fs/nfsd/nfs4state.c | 243 +++++++++++++++---------- + fs/nfsd/nfs4xdr.c | 115 +++++++++--- + fs/nfsd/nfsctl.c | 4 +- + fs/nfsd/nfsd.h | 1 + + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 2 +- + fs/nfsd/state.h | 16 ++- + fs/nfsd/vfs.c | 8 +- + fs/nfsd/xdr4.h | 9 +- + include/linux/fs.h | 1 - + include/linux/nfs4.h | 6 + + include/linux/sunrpc/cache.h | 3 + + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/svc_xprt.h | 2 +- + include/linux/sunrpc/svcsock.h | 1 - + include/linux/sunrpc/xprt.h | 1 + + net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 - + net/sunrpc/cache.c | 54 ++++-- + net/sunrpc/svc.c | 3 +- + net/sunrpc/svc_xprt.c | 97 +++++----- + net/sunrpc/svcauth.c | 1 - + net/sunrpc/svcauth_unix.c | 17 ++- + net/sunrpc/svcsock.c | 20 ++- + net/sunrpc/xprt.c | 5 +- + net/sunrpc/xprtsock.c | 34 +++- + 36 files changed, 572 insertions(+), 320 deletions(-) + rename include/linux/nfs4_acl.h => fs/nfsd/acl.h (98%) + rename include/linux/nfsd_idmap.h => fs/nfsd/idmap.h (92%) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Merge made by recursive. + fs/xfs/Makefile | 1 + + fs/xfs/linux-2.6/xfs_buf.c | 7 +- + fs/xfs/linux-2.6/xfs_buf.h | 7 +- + fs/xfs/linux-2.6/xfs_discard.c | 191 ++++++++++++++ + fs/xfs/linux-2.6/xfs_discard.h | 8 + + fs/xfs/linux-2.6/xfs_file.c | 535 +++++++++++++++++++++++----------------- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 + + fs/xfs/linux-2.6/xfs_super.c | 2 +- + fs/xfs/linux-2.6/xfs_sync.c | 11 +- + fs/xfs/linux-2.6/xfs_sysctl.c | 23 ++- + fs/xfs/linux-2.6/xfs_trace.h | 33 +++ + fs/xfs/support/debug.c | 112 ++++----- + fs/xfs/support/debug.h | 25 ++- + fs/xfs/xfs_alloc.c | 10 +- + fs/xfs/xfs_alloc.h | 25 ++- + fs/xfs/xfs_buf_item.c | 151 ++++-------- + fs/xfs/xfs_error.c | 31 --- + fs/xfs/xfs_error.h | 18 +- + fs/xfs/xfs_fsops.c | 10 +- + fs/xfs/xfs_fsops.h | 2 +- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + fs/xfs/xfs_trans.c | 2 +- + 23 files changed, 729 insertions(+), 482 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_discard.c + create mode 100644 fs/xfs/linux-2.6/xfs_discard.h +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Resolved 'drivers/net/skge.c' using previous resolution. +Resolved 'drivers/net/sky2.c' using previous resolution. +Auto-merging arch/x86/Kconfig +Auto-merging drivers/media/video/cafe_ccic.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/sfc/falcon.c +Auto-merging drivers/net/skge.c +CONFLICT (content): Merge conflict in drivers/net/skge.c +Auto-merging drivers/net/sky2.c +CONFLICT (content): Merge conflict in drivers/net/sky2.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/staging/sm7xx/smtcfb.c +Auto-merging include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aba297c] Merge remote branch 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 31 +++- + arch/x86/Kconfig | 10 +- + arch/x86/pci/broadcom_bus.c | 11 +- + arch/x86/pci/common.c | 41 ++++++ + arch/x86/pci/irq.c | 3 +- + drivers/acpi/apei/hest.c | 22 ++-- + drivers/acpi/pci_root.c | 35 +++++ + drivers/media/video/cafe_ccic.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/sfc/falcon.c | 25 +--- + drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- + drivers/pci/Makefile | 3 +- + drivers/pci/msi.c | 5 +- + drivers/pci/msi.h | 6 - + drivers/pci/pci-acpi.c | 3 +- + drivers/pci/pci-driver.c | 5 +- + drivers/pci/pci-label.c | 236 ++++++++++++++++++++++++++++++- + drivers/pci/pci-stub.c | 7 + + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 25 +--- + drivers/pci/pci.h | 16 +-- + drivers/pci/pcie/aer/aerdrv.c | 1 + + drivers/pci/pcie/aer/aerdrv.h | 3 - + drivers/pci/pcie/aspm.c | 21 +++- + drivers/pci/pcie/pme.c | 31 +---- + drivers/pci/pcie/portdrv.h | 5 +- + drivers/pci/pcie/portdrv_acpi.c | 23 +--- + drivers/pci/pcie/portdrv_core.c | 25 ++-- + drivers/pci/pcie/portdrv_pci.c | 37 +++++- + drivers/scsi/ipr.c | 8 +- + drivers/scsi/pmcraid.c | 7 +- + drivers/staging/sm7xx/smtcfb.c | 2 +- + include/acpi/apei.h | 6 + + include/linux/pci-acpi.h | 6 + + include/linux/pci-aspm.h | 5 +- + include/linux/pci.h | 20 ++- + include/linux/pci_ids.h | 3 +- + include/linux/pci_regs.h | 10 ++ + sound/pci/cs5535audio/cs5535audio_pm.c | 7 +- + 39 files changed, 519 insertions(+), 199 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 1b4b80a Merge remote branch 'xfs/master' +Merging refs/next/20110107/pci +$ git merge refs/next/20110107/pci +Resolved 'drivers/net/skge.c' using previous resolution. +Resolved 'drivers/net/sky2.c' using previous resolution. +Auto-merging drivers/media/video/cafe_ccic.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/sfc/falcon.c +Auto-merging drivers/net/skge.c +CONFLICT (content): Merge conflict in drivers/net/skge.c +Auto-merging drivers/net/sky2.c +CONFLICT (content): Merge conflict in drivers/net/sky2.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/staging/sm7xx/smtcfb.c +Auto-merging include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5759540] Merge commit 'refs/next/20110107/pci' +$ git diff -M --stat --summary HEAD^.. + arch/x86/pci/irq.c | 3 +- + drivers/media/video/cafe_ccic.c | 4 +-- + drivers/net/myri10ge/myri10ge.c | 4 +-- + drivers/net/sfc/falcon.c | 25 ++++---------------- + drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- + drivers/pci/msi.c | 5 ++- + drivers/pci/msi.h | 6 ----- + drivers/pci/pci-acpi.c | 1 + + drivers/pci/pci-driver.c | 5 ++- + drivers/pci/pci-stub.c | 7 ++++++ + drivers/pci/pci.c | 7 +---- + drivers/pci/pcie/aspm.c | 21 ++++++++++++++--- + drivers/pci/pcie/pme.c | 27 +++------------------- + drivers/pci/pcie/portdrv.h | 2 + + drivers/pci/pcie/portdrv_core.c | 25 +++++++++++--------- + drivers/pci/pcie/portdrv_pci.c | 37 +++++++++++++++++++++++++++--- + drivers/scsi/ipr.c | 8 +------ + drivers/scsi/pmcraid.c | 7 +----- + drivers/staging/sm7xx/smtcfb.c | 2 +- + include/linux/pci-aspm.h | 5 +++- + include/linux/pci.h | 8 ++---- + include/linux/pci_ids.h | 3 +- + include/linux/pci_regs.h | 10 ++++++++ + sound/pci/cs5535audio/cs5535audio_pm.c | 7 +----- + 24 files changed, 120 insertions(+), 113 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/i2c-core.c | 90 ++++++++++++++++++++++-------------------------- + 1 files changed, 41 insertions(+), 49 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'arch/arm/mach-pxa/devices.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/poodle.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/pxa27x.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/pxa3xx.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/z2.c' using previous resolution. +CONFLICT (rename/rename): Rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"arch/arm/mach-s5pv310/include/mach/dma.h" in branch "HEAD" rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"include/linux/spi/pxa2xx_spi.h" in "bjdooks-i2c/next-i2c" +Renaming arch/arm/plat-pxa/include/plat/ssp.h->include/linux/pxa2xx_ssp.h +Auto-merging include/linux/pxa2xx_ssp.h +Auto-merging arch/arm/mach-mmp/include/mach/mmp2.h +Auto-merging arch/arm/mach-pxa/balloon3.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Auto-merging arch/arm/mach-pxa/colibri-pxa270-income.c +Auto-merging arch/arm/mach-pxa/corgi.c +Auto-merging arch/arm/mach-pxa/csb726.c +Auto-merging arch/arm/mach-pxa/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/devices.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-pxa/ezx.c +Auto-merging arch/arm/mach-pxa/hx4700.c +Auto-merging arch/arm/mach-pxa/icontrol.c +Auto-merging arch/arm/mach-pxa/littleton.c +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/magician.c +Auto-merging arch/arm/mach-pxa/mainstone.c +Auto-merging arch/arm/mach-pxa/mioa701.c +Auto-merging arch/arm/mach-pxa/mxm8x10.c +Auto-merging arch/arm/mach-pxa/pcm027.c +Auto-merging arch/arm/mach-pxa/poodle.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c +Auto-merging arch/arm/mach-pxa/pxa27x.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa27x.c +Auto-merging arch/arm/mach-pxa/pxa3xx.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa3xx.c +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/saar.c +Auto-merging arch/arm/mach-pxa/spitz.c +Auto-merging arch/arm/mach-pxa/stargate2.c +Auto-merging arch/arm/mach-pxa/tavorevb3.c +Auto-merging arch/arm/mach-pxa/tosa.c +Auto-merging arch/arm/mach-pxa/trizeps4.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/trizeps4.c +Auto-merging arch/arm/mach-pxa/viper.c +Auto-merging arch/arm/mach-pxa/vpac270.c +Auto-merging arch/arm/mach-pxa/xcep.c +Auto-merging arch/arm/mach-pxa/z2.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/z2.c +Auto-merging arch/arm/mach-pxa/zeus.c +Auto-merging drivers/spi/pxa2xx_spi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-pxa/include/mach/pxa2xx_spi.h +arch/arm/mach-pxa/devices.c: needs merge +arch/arm/mach-pxa/include/mach/pxa2xx_spi.h: needs merge +arch/arm/mach-pxa/poodle.c: needs merge +arch/arm/mach-pxa/pxa27x.c: needs merge +arch/arm/mach-pxa/pxa3xx.c: needs merge +arch/arm/mach-pxa/trizeps4.c: needs merge +arch/arm/mach-pxa/z2.c: needs merge +include/linux/spi/pxa2xx_spi.h: needs merge +rm 'arch/arm/mach-pxa/include/mach/pxa2xx_spi.h' +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-pxa/trizeps4.c'. +[master c5a2a6e] Merge remote branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mmp/include/mach/mmp2.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa168.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa910.h | 2 +- + arch/arm/mach-pxa/balloon3.c | 3 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 3 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/csb726.c | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/palm27x.c | 3 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 3 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/spitz.c | 3 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + arch/arm/mach-pxa/tavorevb3.c | 3 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/vpac270.c | 3 +- + arch/arm/mach-pxa/xcep.c | 3 +- + arch/arm/mach-pxa/z2.c | 3 +- + arch/arm/mach-pxa/zeus.c | 3 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- + drivers/i2c/busses/Kconfig | 7 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-pxa-pci.c | 173 ++++++++++++++++++++ + drivers/i2c/busses/i2c-pxa.c | 116 ++++++++++--- + .../plat/i2c.h => include/linux/i2c/pxa-i2c.h | 0 + 40 files changed, 304 insertions(+), 73 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-pxa-pci.c + rename arch/arm/plat-pxa/include/plat/i2c.h => include/linux/i2c/pxa-i2c.h (100%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging Documentation/feature-removal-schedule.txt +Merge made by recursive. +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Removing drivers/media/radio/radio-gemtek-pci.c +Auto-merging drivers/media/video/davinci/vpif.h +Removing drivers/media/video/tda9875.c +Auto-merging drivers/media/video/tvp7002.c +Merge made by recursive. + drivers/media/common/saa7146_core.c | 2 +- + drivers/media/common/saa7146_fops.c | 8 +- + drivers/media/common/saa7146_vbi.c | 2 +- + drivers/media/common/saa7146_video.c | 20 +- + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 6 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 + + drivers/media/dvb/dvb-usb/technisat-usb2.c | 808 ++++++++++++++++++++++ + drivers/media/dvb/frontends/af9013.c | 4 +- + drivers/media/dvb/frontends/stv090x.c | 22 + + drivers/media/dvb/frontends/stv090x.h | 15 + + drivers/media/radio/Kconfig | 14 - + drivers/media/radio/Makefile | 1 - + drivers/media/radio/radio-gemtek-pci.c | 478 ------------- + drivers/media/radio/radio-maxiradio.c | 4 +- + drivers/media/radio/si470x/radio-si470x-common.c | 9 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-dib0700-nec.c | 52 +- + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 +++ + drivers/media/video/Kconfig | 9 - + drivers/media/video/Makefile | 1 - + drivers/media/video/adv7343.c | 167 ++--- + drivers/media/video/adv7343_regs.h | 8 +- + drivers/media/video/bt819.c | 129 ++--- + drivers/media/video/bt8xx/bttv-cards.c | 39 - + drivers/media/video/bt8xx/bttv.h | 1 - + drivers/media/video/cpia2/cpia2.h | 2 +- + drivers/media/video/cpia2/cpia2_core.c | 65 +-- + drivers/media/video/cpia2/cpia2_v4l.c | 104 +-- + drivers/media/video/cs5345.c | 87 ++- + drivers/media/video/cx18/cx18-av-audio.c | 92 +--- + drivers/media/video/cx18/cx18-av-core.c | 175 ++--- + drivers/media/video/cx18/cx18-av-core.h | 12 +- + drivers/media/video/cx18/cx18-controls.c | 285 +------- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 30 +- + drivers/media/video/cx18/cx18-driver.h | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 32 +- + drivers/media/video/cx18/cx18-ioctl.c | 24 +- + drivers/media/video/cx18/cx18-mailbox.c | 5 +- + drivers/media/video/cx18/cx18-mailbox.h | 5 - + drivers/media/video/cx18/cx18-streams.c | 16 +- + drivers/media/video/davinci/vpif.c | 177 +++++ + drivers/media/video/davinci/vpif.h | 18 +- + drivers/media/video/davinci/vpif_capture.c | 451 ++++++++++--- + drivers/media/video/davinci/vpif_capture.h | 2 + + drivers/media/video/davinci/vpif_display.c | 474 ++++++++++--- + drivers/media/video/davinci/vpif_display.h | 2 + + drivers/media/video/em28xx/em28xx-cards.c | 1 + + drivers/media/video/et61x251/et61x251.h | 24 - + drivers/media/video/gspca/gspca.c | 208 +++--- + drivers/media/video/gspca/gspca.h | 2 - + drivers/media/video/gspca/sonixb.c | 266 +++++--- + drivers/media/video/gspca/sonixj.c | 63 +- + drivers/media/video/ir-kbd-i2c.c | 6 +- + drivers/media/video/saa7110.c | 115 ++-- + drivers/media/video/sn9c102/sn9c102_devtable.h | 74 +-- + drivers/media/video/tda9875.c | 411 ----------- + drivers/media/video/tlv320aic23b.c | 74 ++- + drivers/media/video/tvp514x.c | 236 ++----- + drivers/media/video/tvp5150.c | 157 ++--- + drivers/media/video/tvp7002.c | 117 ++-- + drivers/media/video/v4l2-ioctl.c | 20 +- + drivers/media/video/vivi.c | 228 ++++--- + drivers/media/video/vpx3220.c | 137 ++--- + include/media/rc-map.h | 1 + + include/media/saa7146.h | 2 +- + 70 files changed, 3054 insertions(+), 3064 deletions(-) + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + delete mode 100644 drivers/media/radio/radio-gemtek-pci.c + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + delete mode 100644 drivers/media/video/tda9875.c +Merging kbuild/for-next +$ git merge kbuild/for-next +Already up-to-date! +Merge made by recursive. +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/amso1100/c2_rnic.c | 5 ++--- + drivers/infiniband/hw/ehca/ipz_pt_fn.c | 5 ++--- + drivers/infiniband/hw/ipath/ipath_driver.c | 3 +-- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 11 +++-------- + drivers/infiniband/hw/ipath/ipath_init_chip.c | 5 +---- + drivers/infiniband/hw/mlx4/main.c | 12 +++++++----- + drivers/infiniband/hw/mthca/mthca_catas.c | 5 +++-- + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- + drivers/infiniband/hw/mthca/mthca_eq.c | 2 +- + drivers/infiniband/hw/mthca/mthca_main.c | 2 +- + drivers/infiniband/hw/mthca/mthca_mr.c | 2 +- + drivers/infiniband/hw/qib/qib_init.c | 7 ++----- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +++------- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +-- + drivers/infiniband/ulp/srp/ib_srp.c | 15 +++++++-------- + drivers/net/mlx4/catas.c | 6 +++--- + drivers/net/mlx4/en_main.c | 3 ++- + drivers/net/mlx4/main.c | 2 +- + drivers/net/mlx4/mcg.c | 23 +++++++++++++---------- + include/linux/mlx4/device.h | 10 ++++++++-- + include/linux/mlx4/driver.h | 6 +----- + 21 files changed, 64 insertions(+), 75 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/kernel/dumpstack.c +Auto-merging drivers/acpi/sleep.c +Auto-merging drivers/acpi/video.c +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Auto-merging drivers/platform/x86/fujitsu-laptop.c +Auto-merging include/linux/suspend.h +Auto-merging kernel/power/Makefile +Merge made by recursive. + Documentation/ABI/stable/thermal-notification | 4 + + Documentation/IPMI.txt | 27 + + Documentation/acpi/apei/output_format.txt | 122 +++++ + Documentation/feature-removal-schedule.txt | 11 + + Documentation/kernel-parameters.txt | 5 - + Documentation/thermal/sysfs-api.txt | 12 + + arch/ia64/include/asm/io.h | 5 + + arch/x86/kernel/acpi/boot.c | 1 + + arch/x86/kernel/dumpstack.c | 1 + + arch/x86/kernel/e820.c | 1 + + drivers/acpi/Kconfig | 18 +- + drivers/acpi/Makefile | 3 +- + drivers/acpi/ac.c | 3 +- + drivers/acpi/acpi_ipmi.c | 525 +++++++++++++++++++ + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/acpica/acevents.h | 21 +- + drivers/acpi/acpica/acglobal.h | 7 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/aclocal.h | 13 +- + drivers/acpi/acpica/evevent.c | 12 +- + drivers/acpi/acpica/evgpe.c | 265 +++++++---- + drivers/acpi/acpica/evgpeblk.c | 33 +- + drivers/acpi/acpica/evgpeinit.c | 25 +- + drivers/acpi/acpica/evgpeutil.c | 39 ++ + drivers/acpi/acpica/evmisc.c | 94 ++-- + drivers/acpi/acpica/evxface.c | 77 +++- + drivers/acpi/acpica/evxfevnt.c | 600 ---------------------- + drivers/acpi/acpica/evxfgpe.c | 669 +++++++++++++++++++++++++ + drivers/acpi/acpica/hwgpe.c | 32 +- + drivers/acpi/acpica/utglobal.c | 3 +- + drivers/acpi/apei/apei-internal.h | 2 + + drivers/acpi/apei/cper.c | 311 ++++++++++++ + drivers/acpi/apei/ghes.c | 431 +++++++++++++---- + drivers/acpi/battery.c | 16 + + drivers/acpi/bus.c | 153 +++--- + drivers/acpi/button.c | 9 +- + drivers/acpi/dock.c | 2 +- + drivers/acpi/ec.c | 5 +- + drivers/acpi/fan.c | 27 +- + drivers/acpi/glue.c | 5 +- + drivers/acpi/internal.h | 13 +- + {kernel/power => drivers/acpi}/nvs.c | 20 +- + drivers/acpi/osl.c | 17 +- + drivers/acpi/power.c | 128 +++-- + drivers/acpi/proc.c | 41 +-- + drivers/acpi/processor_driver.c | 80 +--- + drivers/acpi/processor_throttling.c | 190 +++----- + drivers/acpi/sbs.c | 2 + + drivers/acpi/scan.c | 70 ++- + drivers/acpi/sleep.c | 13 +- + drivers/acpi/sysfs.c | 19 +- + drivers/acpi/thermal.c | 5 +- + drivers/acpi/video.c | 104 +---- + drivers/acpi/video_detect.c | 57 +-- + drivers/acpi/wakeup.c | 22 +- + drivers/char/ipmi/ipmi_msghandler.c | 27 + + drivers/char/ipmi/ipmi_si_intf.c | 23 +- + drivers/gpu/drm/Kconfig | 1 - + drivers/gpu/stub/Kconfig | 1 - + drivers/platform/x86/fujitsu-laptop.c | 4 +- + drivers/pnp/Makefile | 6 +- + drivers/pnp/core.c | 7 +- + drivers/pnp/driver.c | 7 +- + drivers/pnp/isapnp/Makefile | 6 +- + drivers/pnp/pnpacpi/Makefile | 3 +- + drivers/pnp/pnpacpi/core.c | 93 +++- + drivers/pnp/pnpbios/Makefile | 5 +- + drivers/thermal/Kconfig | 1 + + drivers/thermal/thermal_sys.c | 120 ++++- + include/acpi/acpi_bus.h | 12 +- + include/acpi/acpixf.h | 20 +- + include/acpi/actypes.h | 54 ++- + include/acpi/processor.h | 6 + + include/linux/acpi.h | 10 + + include/linux/cper.h | 86 +++- + include/linux/ipmi.h | 38 ++ + include/linux/ipmi_smi.h | 8 + + include/linux/suspend.h | 17 - + include/linux/thermal.h | 47 ++- + kernel/panic.c | 1 + + kernel/power/Kconfig | 5 - + kernel/power/Makefile | 1 - + lib/ioremap.c | 2 + + mm/vmalloc.c | 1 + + 84 files changed, 3374 insertions(+), 1612 deletions(-) + create mode 100644 Documentation/ABI/stable/thermal-notification + create mode 100644 Documentation/acpi/apei/output_format.txt + create mode 100644 drivers/acpi/acpi_ipmi.c + create mode 100644 drivers/acpi/acpica/evxfgpe.c + rename {kernel/power => drivers/acpi}/nvs.c (86%) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Auto-merging arch/arm/mach-omap2/cpuidle34xx.c +Auto-merging arch/x86/include/asm/processor.h +Merge made by recursive. + arch/arm/mach-omap2/cpuidle34xx.c | 2 + + arch/ia64/include/asm/processor.h | 5 +- + arch/ia64/kernel/process.c | 6 +-- + arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 - + arch/x86/include/asm/processor.h | 5 +- + arch/x86/kernel/process.c | 30 ++++------ + arch/x86/kernel/process_32.c | 4 -- + arch/x86/kernel/process_64.c | 6 -- + drivers/acpi/processor_core.c | 4 +- + drivers/acpi/processor_idle.c | 28 ++++------ + drivers/cpuidle/cpuidle.c | 92 +++++++++++++++++--------------- + drivers/idle/intel_idle.c | 69 ++++++++++++++++++++++--- + include/linux/cpuidle.h | 6 -- + 13 files changed, 145 insertions(+), 113 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/fsldma.c +Auto-merging drivers/dma/intel_mid_dma.c +Merge made by recursive. + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 8 + + drivers/dma/amba-pl08x.c | 1040 +++++++++++------------- + drivers/dma/fsldma.c | 4 +- + drivers/dma/intel_mid_dma.c | 33 +- + drivers/dma/ste_dma40.c | 191 ++++- + drivers/dma/ste_dma40_ll.c | 246 ++++-- + drivers/dma/ste_dma40_ll.h | 36 +- + include/linux/amba/pl08x.h | 56 +- + 8 files changed, 898 insertions(+), 716 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + drivers/bluetooth/ath3k.c | 75 ++++++++++++--------------------------------- + 1 files changed, 20 insertions(+), 55 deletions(-) +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/Kconfig' using previous resolution. +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Auto-merging drivers/mtd/Kconfig +CONFLICT (content): Merge conflict in drivers/mtd/Kconfig +Auto-merging drivers/mtd/mtdchar.c +Auto-merging drivers/mtd/mtdoops.c +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/mtd/onenand/omap2.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1ddaf13] Merge remote branch 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap1/board-ams-delta.c | 17 ++++ + arch/arm/plat-omap/include/plat/onenand.h | 1 + + drivers/mtd/Kconfig | 19 +++-- + drivers/mtd/Makefile | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 55 +++++++------- + drivers/mtd/chips/cfi_cmdset_0002.c | 116 ++++++++++++++++------------ + drivers/mtd/chips/cfi_cmdset_0020.c | 1 + + drivers/mtd/chips/cfi_util.c | 2 +- + drivers/mtd/chips/fwh_lock.h | 2 +- + drivers/mtd/devices/m25p80.c | 39 +++++++++- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/maps/amd76xrom.c | 7 +- + drivers/mtd/maps/bcm963xx-flash.c | 5 + + drivers/mtd/maps/ck804xrom.c | 7 +- + drivers/mtd/maps/esb2rom.c | 9 +-- + drivers/mtd/maps/ichxrom.c | 9 +-- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/maps/scx200_docflash.c | 5 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/mtdchar.c | 10 +- + drivers/mtd/mtdconcat.c | 1 + + drivers/mtd/mtdoops.c | 3 +- + drivers/mtd/mtdpart.c | 11 ++- + drivers/mtd/nand/Kconfig | 1 + + drivers/mtd/nand/ams-delta.c | 80 +++++++++++++++++--- + drivers/mtd/nand/fsl_elbc_nand.c | 2 + + drivers/mtd/nand/fsmc_nand.c | 89 +++++++++++++++++----- + drivers/mtd/nand/jz4740_nand.c | 57 +-------------- + drivers/mtd/nand/mxc_nand.c | 2 +- + drivers/mtd/nand/nand_base.c | 25 ++++--- + drivers/mtd/nand/nand_bbt.c | 3 +- + drivers/mtd/nand/nandsim.c | 39 +++++----- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/txx9ndfmc.c | 5 +- + drivers/mtd/onenand/omap2.c | 80 +++++++++++++++----- + drivers/mtd/onenand/onenand_base.c | 81 +++++++++++++------- + drivers/mtd/onenand/onenand_bbt.c | 10 ++- + drivers/mtd/onenand/samsung.c | 7 +- + drivers/mtd/ubi/build.c | 28 +++++++- + drivers/mtd/ubi/vtbl.c | 6 +- + fs/jffs2/build.c | 5 +- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/xattr.c | 12 ++-- + include/linux/mtd/cfi.h | 3 +- + include/linux/mtd/fsmc.h | 26 +------ + include/linux/mtd/mtd.h | 11 +++ + include/linux/mtd/nand.h | 2 + + include/linux/mtd/onenand.h | 14 ++++ + include/linux/mtd/partitions.h | 2 +- + 50 files changed, 577 insertions(+), 350 deletions(-) +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + Documentation/sound/alsa/soc/codec.txt | 45 +++++++++++++--------------- + Documentation/sound/alsa/soc/machine.txt | 38 ++++++------------------ + Documentation/sound/alsa/soc/platform.txt | 12 ++++++- + sound/soc/blackfin/Kconfig | 11 ++++--- + sound/soc/blackfin/bf5xx-ac97.c | 4 +- + sound/soc/blackfin/bf5xx-tdm.c | 10 +++--- + 6 files changed, 53 insertions(+), 67 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_realtek.c | 10 ++-------- + 1 files changed, 2 insertions(+), 8 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq_conservative.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging Documentation/lguest/lguest.txt +Auto-merging arch/x86/kernel/head_32.S +Auto-merging arch/x86/lguest/boot.c +Merge made by recursive. + Documentation/lguest/lguest.c | 73 ++++++++++++++++++++++++--- + Documentation/lguest/lguest.txt | 5 ++ + arch/x86/kernel/head_32.S | 4 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/lguest/i386_head.S | 105 +++++++++++++++++++++++++++++++++++++++ + drivers/lguest/page_tables.c | 2 +- + drivers/lguest/x86/core.c | 4 +- + 7 files changed, 181 insertions(+), 14 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date! +Merge made by recursive. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + Documentation/device-mapper/dm-crypt.txt | 7 +- + Documentation/device-mapper/dm-raid.txt | 70 +++ + drivers/md/Kconfig | 24 + + drivers/md/Makefile | 1 + + drivers/md/dm-crypt.c | 618 ++++++++++++++++++++++----- + drivers/md/dm-delay.c | 2 +- + drivers/md/dm-ioctl.c | 111 ++++-- + drivers/md/dm-kcopyd.c | 57 +++- + drivers/md/dm-log-userspace-base.c | 139 +++++-- + drivers/md/dm-log-userspace-transfer.c | 1 + + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 67 ++-- + drivers/md/dm-raid.c | 697 ++++++++++++++++++++++++++++++ + drivers/md/dm-raid1.c | 19 +- + drivers/md/dm-snap-persistent.c | 4 +- + drivers/md/dm-snap.c | 62 +--- + drivers/md/dm-stripe.c | 27 +- + drivers/md/dm-table.c | 19 + + drivers/md/dm.c | 23 +- + include/linux/device-mapper.h | 12 + + include/linux/dm-ioctl.h | 14 +- + include/linux/dm-log-userspace.h | 13 +- + 22 files changed, 1691 insertions(+), 298 deletions(-) + create mode 100644 Documentation/device-mapper/dm-raid.txt + create mode 100644 drivers/md/dm-raid.c +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Auto-merging drivers/power/ds2760_battery.c +Auto-merging drivers/power/intel_mid_battery.c +Auto-merging drivers/power/s3c_adc_battery.c +Merge made by recursive. + drivers/power/Kconfig | 10 ++ + drivers/power/Makefile | 1 + + drivers/power/collie_battery.c | 13 +-- + drivers/power/ds2760_battery.c | 2 +- + drivers/power/gpio-charger.c | 188 +++++++++++++++++++++++++++++++++ + drivers/power/intel_mid_battery.c | 2 +- + drivers/power/isp1704_charger.c | 201 +++++++++++++++++++++++++++++------- + drivers/power/jz4740-battery.c | 13 +++ + drivers/power/olpc_battery.c | 114 ++++++++++++++++++++- + drivers/power/power_supply_core.c | 6 +- + drivers/power/s3c_adc_battery.c | 12 ++- + drivers/power/tosa_battery.c | 13 +-- + drivers/power/wm97xx_battery.c | 4 +- + drivers/power/z2_battery.c | 6 +- + include/linux/power/gpio-charger.h | 41 ++++++++ + include/linux/s3c_adc_battery.h | 1 + + 16 files changed, 558 insertions(+), 69 deletions(-) + create mode 100644 drivers/power/gpio-charger.c + create mode 100644 include/linux/power/gpio-charger.h +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8cbfec4] Merge remote branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Merge made by recursive. + drivers/mmc/host/bfin_sdh.c | 2 +- + drivers/mmc/host/jz4740_mmc.c | 5 +++-- + drivers/mmc/host/mmci.c | 10 +++++----- + drivers/mmc/host/sdhci-s3c.c | 36 ++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/ushc.c | 1 - + 5 files changed, 45 insertions(+), 9 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Renaming drivers/serial/kgdboc.c => drivers/tty/serial/kgdboc.c +Auto-merging drivers/tty/serial/kgdboc.c +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 4 ++-- + drivers/misc/kgdbts.c | 2 +- + drivers/tty/serial/kgdboc.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/memory_hotplug.h | 6 ++++++ + mm/memory_hotplug.c | 4 ++++ + mm/slub.c | 4 ++-- + 3 files changed, 12 insertions(+), 2 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'drivers/mfd/wm8994-core.c' using previous resolution. +Auto-merging arch/x86/Kconfig +Auto-merging drivers/gpio/cs5535-gpio.c +Removing drivers/mfd/ab8500-spi.c +Auto-merging drivers/mfd/wm8994-core.c +CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/regulator/max8998.c +Auto-merging include/linux/mfd/ab8500.h +Auto-merging include/linux/mfd/core.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a3dfb70] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 2 +- + arch/x86/platform/olpc/olpc-xo1.c | 101 ++-- + drivers/gpio/cs5535-gpio.c | 93 ++--- + drivers/i2c/busses/scx200_acb.c | 200 +++---- + drivers/mfd/88pm860x-core.c | 36 +- + drivers/mfd/Kconfig | 16 +- + drivers/mfd/Makefile | 3 +- + drivers/mfd/ab3550-core.c | 28 +- + drivers/mfd/ab8500-core.c | 306 ++++++++++-- + drivers/mfd/ab8500-debugfs.c | 1016 +++++++++++++++++----------------- + drivers/mfd/ab8500-spi.c | 143 ----- + drivers/mfd/asic3.c | 62 ++-- + drivers/mfd/cs5535-mfd.c | 151 ++++++ + drivers/mfd/ezx-pcap.c | 25 +- + drivers/mfd/htc-egpio.c | 27 +- + drivers/mfd/htc-i2cpld.c | 40 +- + drivers/mfd/jz4740-adc.c | 25 +- + drivers/mfd/max8925-core.c | 30 +- + drivers/mfd/max8998-irq.c | 37 +- + drivers/mfd/max8998.c | 134 +++++- + drivers/mfd/mc13xxx-core.c | 2 +- + drivers/mfd/mfd-core.c | 4 + + drivers/mfd/sm501.c | 9 +- + drivers/mfd/stmpe.c | 28 +- + drivers/mfd/t7l66xb.c | 20 +- + drivers/mfd/tc6393xb.c | 22 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/tps6586x.c | 36 +- + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl4030-irq.c | 28 +- + drivers/mfd/twl6030-irq.c | 2 +- + drivers/mfd/vx855.c | 2 +- + drivers/mfd/wm831x-core.c | 17 +- + drivers/mfd/wm831x-i2c.c | 14 +- + drivers/mfd/wm831x-irq.c | 53 ++- + drivers/mfd/wm831x-spi.c | 18 + + drivers/mfd/wm8350-irq.c | 32 +- + drivers/mfd/wm8994-core.c | 48 +- + drivers/mfd/wm8994-irq.c | 32 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/cs5535-mfgpt.c | 73 +-- + drivers/regulator/max8998.c | 94 +++- + drivers/rtc/rtc-max8998.c | 54 ++- + include/linux/mfd/ab8500.h | 53 +- + include/linux/mfd/core.h | 6 + + include/linux/mfd/max8998-private.h | 2 + + include/linux/mfd/max8998.h | 31 +- + include/linux/mfd/wm831x/core.h | 1 + + 48 files changed, 1807 insertions(+), 1355 deletions(-) + delete mode 100644 drivers/mfd/ab8500-spi.c + create mode 100644 drivers/mfd/cs5535-mfd.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Recorded preimage for 'include/linux/mfd/ab8500.h' +Auto-merging arch/arm/mach-imx/mach-pcm038.c +Auto-merging arch/arm/mach-mx3/mach-mx31_3ds.c +Auto-merging arch/arm/mach-mx3/mach-mx31moboard.c +Auto-merging arch/arm/mach-ux500/board-mop500.c +Auto-merging drivers/regulator/max8998.c +Auto-merging drivers/regulator/wm8994-regulator.c +Auto-merging include/linux/mfd/ab8500.h +CONFLICT (content): Merge conflict in include/linux/mfd/ab8500.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/mfd/ab8500.h'. +[master 1274248] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging selinux/master +$ git merge selinux/master +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging Documentation/device-mapper/dm-crypt.txt +Merge made by recursive. + Documentation/device-mapper/dm-crypt.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ec920fc] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging kernel/time/clocksource.c +Auto-merging kernel/time/timekeeping.c +Merge made by recursive. + drivers/acpi/numa.c | 8 ++------ + kernel/futex.c | 7 +++---- + kernel/time/clocksource.c | 8 ++++---- + kernel/time/timekeeping.c | 4 ++-- + tools/perf/builtin-record.c | 4 +--- + tools/perf/builtin-stat.c | 1 + + tools/perf/builtin-top.c | 5 +++-- + tools/perf/perf.c | 2 -- + 8 files changed, 16 insertions(+), 23 deletions(-) +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging init/Kconfig +Merge made by recursive. + init/Kconfig | 15 --------------- + kernel/rcutiny.c | 3 ++- + kernel/srcu.c | 15 +++++++++++++-- + 3 files changed, 15 insertions(+), 18 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date! +Merge made by recursive. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Resolved 'drivers/xen/Kconfig' using previous resolution. +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/setup.c +Auto-merging drivers/xen/Kconfig +CONFLICT (content): Merge conflict in drivers/xen/Kconfig +Auto-merging drivers/xen/events.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 691ca16] Merge remote branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. + drivers/xen/Kconfig | 7 + + drivers/xen/Makefile | 2 + + drivers/xen/gntdev.c | 647 +++++++++++++++++++++++++++++++++++++++++++++ + include/xen/gntdev.h | 119 +++++++++ + include/xen/grant_table.h | 39 +++- + 5 files changed, 813 insertions(+), 1 deletions(-) + create mode 100644 drivers/xen/gntdev.c + create mode 100644 include/xen/gntdev.h +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Auto-merging drivers/xen/Kconfig +Auto-merging drivers/xen/Makefile +Merge made by recursive. + arch/x86/xen/irq.c | 2 +- + drivers/xen/Kconfig | 2 +- + drivers/xen/Makefile | 3 ++- + drivers/xen/platform-pci.c | 21 +++++++-------------- + 4 files changed, 11 insertions(+), 17 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Auto-merging arch/x86/include/asm/xen/page.h +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging include/xen/interface/memory.h +Merge made by recursive. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Auto-merging drivers/edac/edac_core.h +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/for-next +Merge made by recursive. + arch/x86/include/asm/percpu.h | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + include/linux/lockdep.h | 3 +++ + kernel/workqueue.c | 20 +++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Merge made by recursive. + drivers/sfi/sfi_core.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-trivial/trivial +$ git merge bkl-trivial/trivial +Already up-to-date. +Merging bkl-llseek/llseek +$ git merge bkl-llseek/llseek +Already up-to-date. +Merging bkl-vfs/vfs +$ git merge bkl-vfs/vfs +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Resolved 'arch/powerpc/kernel/setup_64.c' using previous resolution. +Resolved 'fs/nfsd/nfs4state.c' using previous resolution. +Resolved 'include/linux/hardirq.h' using previous resolution. +Resolved 'include/linux/smp_lock.h' using previous resolution. +Auto-merging arch/powerpc/kernel/setup_64.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c +Auto-merging arch/tile/kernel/compat.c +Auto-merging arch/tile/kernel/compat_signal.c +Auto-merging arch/tile/kernel/signal.c +Auto-merging block/compat_ioctl.c +Auto-merging block/ioctl.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging drivers/char/agp/frontend.c +Auto-merging drivers/char/amiserial.c +Auto-merging drivers/char/specialix.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/drm_fops.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/infiniband/hw/ipath/ipath_file_ops.c +Auto-merging drivers/input/input.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/radio/si470x/radio-si470x.h +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/cx88/cx88-blackbird.c +Auto-merging drivers/media/video/cx88/cx88-video.c +Auto-merging drivers/media/video/pwc/pwc-if.c +Auto-merging drivers/media/video/s2255drv.c +Auto-merging drivers/media/video/saa7134/saa7134-empress.c +Auto-merging drivers/media/video/saa7164/saa7164.h +Auto-merging drivers/media/video/usbvision/usbvision-video.c +Auto-merging drivers/media/video/v4l2-compat-ioctl32.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/s390/block/dasd_eer.c +Auto-merging drivers/s390/char/vmlogrdr.c +Auto-merging drivers/s390/char/vmur.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/cx25821/cx25821.h +Auto-merging drivers/staging/easycap/easycap.h +Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c +Auto-merging drivers/staging/rtl8712/osdep_service.h +CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree. +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/core/inode.c +Auto-merging drivers/usb/gadget/f_fs.c +Auto-merging drivers/usb/host/isp1362-hcd.c +Auto-merging drivers/usb/mon/mon_bin.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/video/console/vgacon.c +Auto-merging drivers/xen/xenfs/privcmd.c +Auto-merging fs/block_dev.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/compat_ioctl.c +Auto-merging fs/ecryptfs/super.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ioctl.c +Auto-merging fs/lockd/clntlock.c +Auto-merging fs/lockd/clntproc.c +Auto-merging fs/lockd/svc4proc.c +Auto-merging fs/lockd/svclock.c +Auto-merging fs/lockd/svcproc.c +Auto-merging fs/locks.c +Auto-merging fs/namespace.c +Auto-merging fs/ncpfs/dir.c +Auto-merging fs/ncpfs/file.c +Auto-merging fs/ncpfs/inode.c +Auto-merging fs/ncpfs/ioctl.c +Auto-merging fs/nfs/callback.c +Auto-merging fs/nfs/delegation.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs4state.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/proc/inode.c +Auto-merging fs/read_write.c +Auto-merging fs/reiserfs/ioctl.c +Auto-merging fs/reiserfs/journal.c +Auto-merging fs/reiserfs/super.c +Auto-merging include/linux/hardirq.h +CONFLICT (content): Merge conflict in include/linux/hardirq.h +Auto-merging include/linux/smp_lock.h +CONFLICT (content): Merge conflict in include/linux/smp_lock.h +Auto-merging include/linux/tty.h +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging lib/Kconfig.debug +Auto-merging net/irda/af_irda.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging sound/core/pcm_native.c +Auto-merging sound/core/sound.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/stradis/Kconfig +arch/powerpc/kernel/setup_64.c: needs merge +drivers/staging/stradis/Kconfig: needs merge +fs/nfsd/nfs4state.c: needs merge +include/linux/hardirq.h: needs merge +include/linux/smp_lock.h: needs merge +rm 'drivers/staging/stradis/Kconfig' +$ git commit -v -a +[master cc696e3] Merge remote branch 'bkl-config/config' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 4 ++-- + drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- + drivers/gpu/drm/i810/i810_drv.c | 6 +++++- + drivers/staging/Kconfig | 11 +++++++++++ + drivers/staging/cx25821/cx25821.h | 1 - + include/linux/smp_lock.h | 15 ++------------- + lib/Kconfig.debug | 9 --------- + 7 files changed, 21 insertions(+), 43 deletions(-) +Merging irqflags/master +$ git merge irqflags/master +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Recorded preimage for 'include/linux/fs.h' +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/fs.h'. +[master 609607f] Merge remote branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Applying: [SCSI] sd: implement sd_check_events() +Applying: [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event +Applying: [SCSI] target: Add LIO target core v4.0.0-rc6 +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Updating 609607f..d67c437 +Fast-forward + Documentation/target/tcm_mod_builder.py | 1094 +++++ + Documentation/target/tcm_mod_builder.txt | 145 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/scsi/sd.c | 103 +- + drivers/scsi/sd.h | 1 - + drivers/scsi/sr.c | 4 - + drivers/target/Kconfig | 32 + + drivers/target/Makefile | 24 + + drivers/target/target_core_alua.c | 1991 +++++++++ + drivers/target/target_core_alua.h | 126 + + drivers/target/target_core_cdb.c | 1131 +++++ + drivers/target/target_core_configfs.c | 3225 ++++++++++++++ + drivers/target/target_core_device.c | 1694 +++++++ + drivers/target/target_core_fabric_configfs.c | 999 +++++ + drivers/target/target_core_fabric_lib.c | 451 ++ + drivers/target/target_core_file.c | 688 +++ + drivers/target/target_core_file.h | 50 + + drivers/target/target_core_hba.c | 185 + + drivers/target/target_core_hba.h | 7 + + drivers/target/target_core_iblock.c | 808 ++++ + drivers/target/target_core_iblock.h | 40 + + drivers/target/target_core_mib.c | 1078 +++++ + drivers/target/target_core_mib.h | 28 + + drivers/target/target_core_pr.c | 4251 ++++++++++++++++++ + drivers/target/target_core_pr.h | 67 + + drivers/target/target_core_pscsi.c | 1470 ++++++ + drivers/target/target_core_pscsi.h | 65 + + drivers/target/target_core_rd.c | 1091 +++++ + drivers/target/target_core_rd.h | 73 + + drivers/target/target_core_scdb.c | 105 + + drivers/target/target_core_scdb.h | 10 + + drivers/target/target_core_tmr.c | 404 ++ + drivers/target/target_core_tpg.c | 826 ++++ + drivers/target/target_core_transport.c | 6134 ++++++++++++++++++++++++++ + drivers/target/target_core_ua.c | 332 ++ + drivers/target/target_core_ua.h | 36 + + include/target/configfs_macros.h | 147 + + include/target/target_core_base.h | 937 ++++ + include/target/target_core_configfs.h | 52 + + include/target/target_core_device.h | 61 + + include/target/target_core_fabric_configfs.h | 106 + + include/target/target_core_fabric_lib.h | 28 + + include/target/target_core_fabric_ops.h | 100 + + include/target/target_core_tmr.h | 43 + + include/target/target_core_tpg.h | 35 + + include/target/target_core_transport.h | 351 ++ + 47 files changed, 30573 insertions(+), 58 deletions(-) + create mode 100755 Documentation/target/tcm_mod_builder.py + create mode 100644 Documentation/target/tcm_mod_builder.txt + create mode 100644 drivers/target/Kconfig + create mode 100644 drivers/target/Makefile + create mode 100644 drivers/target/target_core_alua.c + create mode 100644 drivers/target/target_core_alua.h + create mode 100644 drivers/target/target_core_cdb.c + create mode 100644 drivers/target/target_core_configfs.c + create mode 100644 drivers/target/target_core_device.c + create mode 100644 drivers/target/target_core_fabric_configfs.c + create mode 100644 drivers/target/target_core_fabric_lib.c + create mode 100644 drivers/target/target_core_file.c + create mode 100644 drivers/target/target_core_file.h + create mode 100644 drivers/target/target_core_hba.c + create mode 100644 drivers/target/target_core_hba.h + create mode 100644 drivers/target/target_core_iblock.c + create mode 100644 drivers/target/target_core_iblock.h + create mode 100644 drivers/target/target_core_mib.c + create mode 100644 drivers/target/target_core_mib.h + create mode 100644 drivers/target/target_core_pr.c + create mode 100644 drivers/target/target_core_pr.h + create mode 100644 drivers/target/target_core_pscsi.c + create mode 100644 drivers/target/target_core_pscsi.h + create mode 100644 drivers/target/target_core_rd.c + create mode 100644 drivers/target/target_core_rd.h + create mode 100644 drivers/target/target_core_scdb.c + create mode 100644 drivers/target/target_core_scdb.h + create mode 100644 drivers/target/target_core_tmr.c + create mode 100644 drivers/target/target_core_tpg.c + create mode 100644 drivers/target/target_core_transport.c + create mode 100644 drivers/target/target_core_ua.c + create mode 100644 drivers/target/target_core_ua.h + create mode 100644 include/target/configfs_macros.h + create mode 100644 include/target/target_core_base.h + create mode 100644 include/target/target_core_configfs.h + create mode 100644 include/target/target_core_device.h + create mode 100644 include/target/target_core_fabric_configfs.h + create mode 100644 include/target/target_core_fabric_lib.h + create mode 100644 include/target/target_core_fabric_ops.h + create mode 100644 include/target/target_core_tmr.h + create mode 100644 include/target/target_core_tpg.h + create mode 100644 include/target/target_core_transport.h +$ rm -rf ../rebase-tmp |