From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 9179746..c44ed96 master -> origin/mast## Checking out files: 7% (121/1720) Checking out files: 8% (138/1720) Checking out files: 9% (155/1720) Checking out files: 9% (167/1720) Checking out files: 1Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Auto-merging Documentation/devicetree/booting-without-of.txt Auto-merging MAINTAINERS Removing arch/arm/plat-s5p/include/plat/sysmmu.h Removing arch/x86/include/asm/system_64.h Auto-merging drivers/ata/libata-core.c Auto-merging drivers/ata/libata-scsi.c Auto-merging drivers/char/virtio_console.c Auto-merging drivers/message/fusion/mptctl.c Auto-merging drivers/net/bnx2x/bnx2x_main.c Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c Auto-merging drivers/scsi/libsas/sas_scsi_host.c Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c Auto-merging drivers/scsi/qla2xxx/qla_init.c Auto-merging drivers/scsi/qla2xxx/qla_os.c Removing drivers/staging/vme/bridges/Module.symvers Removing drivers/target/target_core_mib.c Removing drivers/target/target_core_mib.h Auto-merging drivers/watchdog/m54xx_wdt.c Removing fs/cifs/cifsencrypt.h Removing fs/cifs/md4.c Removing fs/cifs/md5.c Removing fs/cifs/md5.h Auto-merging include/scsi/scsi.h Merge made by recursive. .gitignore | 1 + .mailmap | 1 + Documentation/ABI/testing/sysfs-platform-at91 | 25 + Documentation/DocBook/drm.tmpl | 6 +- Documentation/DocBook/filesystems.tmpl | 5 + .../bindings/ata/fsl-sata.txt} | 0 .../bindings}/eeprom.txt | 0 .../fsl => devicetree/bindings/gpio}/8xxx_gpio.txt | 0 .../bindings}/gpio/gpio.txt | 0 .../bindings}/gpio/led.txt | 0 .../bindings/i2c/fsl-i2c.txt} | 0 .../bindings}/marvell.txt | 0 .../bindings/mmc/fsl-esdhc.txt} | 0 .../bindings/mmc}/mmc-spi-slot.txt | 0 .../bindings/mtd/fsl-upm-nand.txt} | 0 .../bindings/mtd}/mtd-physmap.txt | 0 .../bindings/net/can/mpc5xxx-mscan.txt} | 0 .../bindings/net}/can/sja1000.txt | 0 .../bindings/net/fsl-tsec-phy.txt} | 0 .../bindings/net/mdio-gpio.txt} | 0 .../bindings/net}/phy.txt | 0 .../bindings/pci}/83xx-512x-pci.txt | 0 .../bindings/powerpc}/4xx/cpm.txt | 0 .../bindings/powerpc}/4xx/emac.txt | 0 .../bindings/powerpc}/4xx/ndfc.txt | 0 .../bindings/powerpc}/4xx/ppc440spe-adma.txt | 0 .../bindings/powerpc}/4xx/reboot.txt | 0 .../bindings/powerpc}/fsl/board.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/cpm.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/cpm/brg.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/cpm/i2c.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/cpm/pic.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/cpm/usb.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/gpio.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/network.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/qe.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/qe/firmware.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/qe/par_io.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/qe/pincfg.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/qe/ucc.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/qe/usb.txt | 0 .../bindings/powerpc}/fsl/cpm_qe/serial.txt | 0 .../bindings/powerpc}/fsl/diu.txt | 0 .../bindings/powerpc}/fsl/dma.txt | 0 .../bindings/powerpc/fsl}/ecm.txt | 0 .../bindings/powerpc}/fsl/gtm.txt | 0 .../bindings/powerpc}/fsl/guts.txt | 0 .../bindings/powerpc}/fsl/lbc.txt | 0 .../bindings/powerpc}/fsl/mcm.txt | 0 .../bindings/powerpc}/fsl/mcu-mpc8349emitx.txt | 0 .../bindings/powerpc}/fsl/mpc5121-psc.txt | 0 .../bindings/powerpc}/fsl/mpc5200.txt | 0 .../bindings/powerpc}/fsl/mpic.txt | 0 .../bindings/powerpc}/fsl/msi-pic.txt | 0 .../bindings/powerpc}/fsl/pmc.txt | 0 .../bindingFrom . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD Already on '2.6.38-rc2-stor53' From . * branch libata-upstream -> FETCH_HEAD Checking out files: 30% (309/1007) Checking out files: 31% (313/1007) Checking out files: 32% (323/1007) Checking out files: 33% (333/1007) Checking out files: 34% (343/1007) Checking out files: 35% (353/1007) Checking out files: 36% (363/1007) Checking out files: 37% (373/1007) Checking out files: 38% (383/1007) Checking out files: 39% (393/1007) Checking out files: 40% (403/1007) Checking out files: 41% (413/1007) Checking out files: 42% (423/1007) Checking out files: 43% (434/1007) Checking out files: 44% (444/1007) Checking out files: 45% (454/1007) Checking out files: 46% (464/1007) Checking out files: 47% (474/1007) Checking out files: 48% (484/1007) Checking out files: 49% (494/1007) Checking out files: 50% (504/1007) Checking out files: 51% (514/1007) Checking out files: 52% (524/1007) Checking out files: 53% (534/1007) Checking out files: 54% (544/1007) Checking out files: 55% (554/1007) Checking out files: 56% (564/1007) Checking out files: 57% (574/1007) Checking out files: 58% (585/1007) Checking out files: 59% (595/1007) Checking out files: 60% (605/1007) Checking out files: 61% (615/1007) Checking out files: 62% (625/1007) Checking out files: 62% (631/1007) Checking out files: 63% (635/1007) Checking out files: 64% (645/1007) Checking out files: 65% (655/1007) Checking out files: 66% (665/1007) Checking out files: 67% (675/1007) Checking out files: 68% (685/1007) Checking out files: 69% (695/1007) Checking out files: 70% (705/1007) Checking out files: 71% (715/1007) Checking out files: 72% (726/1007) Checking out files: 73% (736/1007) Checking out files: 74% (746/1007) Checking out files: 75% (756/1007) Checking out files: 76% (766/1007) Checking out files: 77% (776/1007) Checking out files: 78% (786/1007) Checking out files: 79% (796/1007) Checking out files: 80% (806/1007) Checking out files: 81% (816/1007) Checking out files: 82% (826/1007) Checking out files: 82% (830/1007) Checking out files: 83% (836/1007) Checking out files: 84% (846/1007) Checking out files: 85% (856/1007) Checking out files: 86% (867/1007) Checking out files: 87% (877/1007) Checking out files: 88% (887/1007) Checking out files: 89% (897/1007) Checking out files: 90% (907/1007) Checking out files: 91% (917/1007) Checking out files: 92% (927/1007) Checking out files: 93% (937/1007) Checking out files: 94% (947/1007) Checking out files: 95% (957/1007) Checking out files: 96% (967/1007) Checking out files: 97% (977/1007) Checking out files: 98% (987/1007) Checking out files: 99% (997/1007) Checking out files: 100% (1007/1007) Checking out files: 100% (1007/1007), done. Switched to branch 'device-mapper' /home/ftp/pub/scm/linux/kernel/git/jejb/storage-tree/.git/rebase-apply/patch:14: new blank line at EOF. + warning: 1 line adds whitespace errors. Checking out files: 33% (344/1015) Checking out files: 34% (346/1015) Checking out files: 35% (356/1015) Checking out files: 36% (366/1015) Checking out files: 37% (376/1015) Checking out files: 38% (386/1015) Checking out files: 39% (396/1015) Checking out files: 40% (406/1015) Checking out files: 41% (417/1015) Checking out files: 42% (427/1015) Checking out files: 43% (437/1015) Checking out files: 44% (447/1015) Checking out files: 45% (457/1015) Checking out files: 46% (467/1015) Checking out files: 47% (478/1015) Checking out files: 48% (488/1015) Checking out files: 49% (498/1015) Checking out files: 50% (508/1015) Checking out files: 51% (518/1015) Checking out files: 52% (528/1015) Checking out files: 53% (538/1015) Checking out files: 54% (549/1015) Checking out files: 55% (559/1015) Checking out files: 56% (569/1015) Checking out files: 56% (573/1015) Checking out files: 57% (579/1015) Checking out files: 58% (589/1015) Checking out files: 59% (599/1015) Checking out files: 60% (609/1015) Checking out files: 61% (620/1015) Checking out files: 62% (630/1015) Checking out files: 63% (640/1015) Checking out files: 64% (650/1015) Checking out files: 65% (660/1015) Checking out files: 66% (670/1015) Checking out files: 67% (681/1015) Checking out files: 68% (691/1015) Checking out files: 69% (701/1015) Checking out files: 70% (711/1015) Checking out files: 71% (721/1015) Checking out files: 72% (731/1015) Checking out files: 72% (736/1015) Checking out files: 73% (741/1015) Checking out files: 74% (752/1015) Checking out files: 75% (762/1015) Checking out files: 76% (772/1015) Checking out files: 77% (782/1015) Checking out files: 78% (792/1015) Checking out files: 79% (802/1015) Checking out files: 80% (812/1015) Checking out files: 81% (823/1015) Checking out files: 82% (833/1015) Checking out files: 83% (843/1015) Checking out files: 84% (853/1015) Checking out files: 85% (863/1015) Checking out files: 86% (873/1015) Checking out files: 87% (884/1015) Checking out files: 88% (894/1015) Checking out files: 89% (904/1015) Checking out files: 90% (914/1015) Checking out files: 91% (924/1015) Checking out files: 92% (934/1015) Checking out files: 93% (944/1015) Checking out files: 94% (955/1015) Checking out files: 94% (957/1015) Checking out files: 95% (965/1015) Checking out files: 96% (975/1015) Checking out files: 97% (985/1015) Checking out files: 98% (995/1015) Checking out files: 99% (1005/1015) Checking out files: 100% (1015/1015) Checking out files: 100% (1015/1015), done. Switched to branch '2.6.38-rc2-stor53' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 129d575...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 13% (490/3641) Checking out files: 14% (510/3641) Checking out files: 15% (547/3641) Checking out files: 16% (583/3641) Checking out files: 17% (619/3641) Checking out files: 18% (656/3641) Checking out files: 19% (692/3641) Checking out files: 20% (729/3641) Checking out files: 21% (765/3641) Checking out files: 22% (802/3641) Checking out files: 23% (838/3641) Checking out files: 24% (874/3641) Checking out files: 25% (911/3641) Checking out files: 25% (933/3641) Checking out files: 26% (947/3641) Checking out files: 27% (984/3641) Checking out files: 28% (1020/3641) Checking out files: 29% (1056/3641) Checking out files: 30% (1093/3641) Checking out files: 30% (1127/3641) Checking out files: 31% (1129/3641) Checking out files: 32% (1166/3641) Checking out files: 33% (1202/3641) Checking out files: 34% (1238/3641) Checking out files: 35% (1275/3641) Checking out files: 36% (1311/3641) Checking out files: 37% (1348/3641) Checking out files: 37% (1365/3641) Checking out files: 38% (1384/3641) Checking out files: 39% (1420/3641) Checking out files: 40% (1457/3641) Checking out files: 41% (1493/3641) Checking out files: 42% (1530/3641) Checking out files: 43% (1566/3641) Checking out files: 43% (1597/3641) Checking out files: 44% (1603/3641) Checking out files: 45% (1639/3641) Checking out files: 46% (1675/3641) Checking out files: 47% (1712/3641) Checking out files: 48% (1748/3641) Checking out files: 49% (1785/3641) Checking out files: 49% (1816/3641) Checking out files: 50% (1821/3641) Checking out files: 51% (1857/3641) Checking out files: 52% (1894/3641) Checking out files: 53% (1930/3641) Checking out files: 54% (1967/3641) Checking out files: 55% (2003/3641) Checking out files: 55% (2013/3641) Checking out files: 56% (2039/3641) Checking out files: 57% (2076/3641) Checking out files: 58% (2112/3641) Checking out files: 59% (2149/3641) Checking out files: 60% (2185/3641) Checking out files: 60% (2187/3641) Checking out files: 61% (2222/3641) Checking out files: 62% (2258/3641) Checking out files: 63% (2294/3641) Checking out files: 64% (2331/3641) Checking out files: 65% (2367/3641) Checking out files: 65% (2375/3641) Checking out files: 66% (2404/3641) Checking out files: 67% (2440/3641) Checking out files: 68% (2476/3641) Checking out files: 69% (2513/3641) Checking out files: 69% (2531/3641) Checking out files: 70% (2549/3641) Checking out files: 71% (2586/3641) Checking out files: 72% (2622/3641) Checking out files: 72% (2623/3641) Checking out files: 73% (2658/3641) Checking out files: 74% (2695/3641) Checking out files: 75% (2731/3641) Checking out files: 76% (2768/3641) Checking out files: 76% (2771/3641) Checking out files: 77% (2804/3641) Checking out files: 78% (2840/3641) Checking out files: 79% (2877/3641) Checking out files: 79% (2884/3641) Checking out files: 80% (2913/3641) Checking out files: 81% (2950/3641) Checking out files: 82% (2986/3641) Checking out files: 82% (2988/3641) Checking out files: 83% (3023/3641) Checking out files: 84% (3059/3641) Checking out files: 85% (3095/3641) Checking out files: 85% (3107/3641) Checking out files: 86% (3132/3641) Checking out files: 87% (3168/3641) Checking out files: 88% (3205/3641) Checking out files: 89% (3241/3641) Checking out files: 89% (3256/3641) Checking out files: 90% (3277/3641) Checking out files: 91% (3314/3641) Checking out files: 92% (3350/3641) Checking out files: 93% (3387/3641) Checking out files: 94% (3423/3641) Checking out files: 95% (3459/3641) Checking out files: 95% (3494/3641) Checking out files: 96% (3496/3641) Checking out files: 97% (3532/3641) Checking out files: 98% (3569/3641) Checking out files: 99% (3605/3641) Checking out files: 100% (3641/3641) Checking out files: 100% (3641/3641), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.38-rc2-stor53' From . * branch scsi-post-merge -> FETCH_HEAD | 1 + arch/s390/include/asm/atomic.h | 26 +- arch/s390/include/asm/cache.h | 1 + arch/s390/include/asm/cacheflush.h | 23 +- arch/s390/include/asm/processor.h | 5 - arch/s390/include/asm/tlb.h | 1 + arch/s390/kernel/traps.c | 37 - arch/s390/lib/uaccess_std.c | 10 +- arch/s390/mm/pgtable.c | 3 +- arch/sh/Kconfig | 1 + arch/sh/Makefile | 3 +- arch/sh/boards/mach-ecovec24/setup.c | 2 + arch/sh/boot/Makefile | 11 +- arch/sh/boot/compressed/Makefile | 4 +- arch/sh/boot/compressed/misc.c | 4 + arch/sh/include/asm/pgtable.h | 1 + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 6 +- arch/sh/kernel/topology.c | 1 + arch/sparc/include/asm/pcr.h | 2 + arch/sparc/kernel/iommu.c | 5 +- arch/sparc/kernel/pcr.c | 2 - arch/sparc/kernel/smp_64.c | 2 + arch/sparc/kernel/una_asm_32.S | 4 +- arch/sparc/lib/bitext.c | 5 +- arch/x86/include/asm/acpi.h | 1 + arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/cacheflush.h | 42 +- arch/x86/include/asm/cpu.h | 1 + arch/x86/include/asm/jump_label.h | 2 +- arch/x86/include/asm/mmu_context.h | 5 +- arch/x86/include/asm/paravirt.h | 5 +- arch/x86/include/asm/percpu.h | 24 +- arch/x86/include/asm/perf_event_p4.h | 1 + arch/x86/include/asm/smp.h | 5 +- arch/x86/include/asm/system_64.h | 22 - arch/x86/kernel/acpi/boot.c | 14 +- arch/x86/kernel/acpi/sleep.c | 15 +- arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/apb_timer.c | 2 +- arch/x86/kernel/apic/apic.c | 9 +- arch/x86/kernel/apic/io_apic.c | 3 + arch/x86/kernel/cpu/intel_cacheinfo.c | 3 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + arch/x86/kernel/cpu/mtrr/main.c | 10 +- arch/x86/kernel/cpu/perf_event_p4.c | 23 +- arch/x86/kernel/dumpstack_64.c | 2 +- arch/x86/kernel/early-quirks.c | 16 +- arch/x86/kernel/head_32.S | 30 +- arch/x86/kernel/irq.c | 3 +- arch/x86/kernel/process.c | 25 +- arch/x86/kernel/reboot.c | 8 + arch/x86/kernel/smpboot.c | 11 +- arch/x86/kvm/svm.c | 4 +- arch/x86/mm/pageattr.c | 8 - arch/x86/xen/p2m.c | 18 +- arch/x86/xen/setup.c | 8 +- block/blk-throttle.c | 10 +- block/cfq-iosched.c | 10 +- block/genhd.c | 2 +- block/ioctl.c | 8 +- drivers/acpi/acpica/evxfgpe.c | 49 +- drivers/acpi/osl.c | 25 +- drivers/acpi/video_detect.c | 5 + drivers/acpi/wakeup.c | 6 +- drivers/ata/ahci.c | 3 + drivers/ata/libata-core.c | 1 + drivers/ata/libata-scsi.c | 24 +- drivers/ata/pata_hpt366.c | 6 +- drivers/ata/pata_hpt37x.c | 112 +-- drivers/ata/pata_hpt3x2n.c | 12 +- drivers/ata/pata_mpc52xx.c | 2 +- drivers/atm/idt77105.c | 2 +- drivers/atm/solos-pci.c | 5 +- drivers/base/power/runtime.c | 9 +- drivers/block/Makefile | 2 +- drivers/block/aoe/Makefile | 2 +- drivers/block/cciss.c | 2 +- drivers/block/floppy.c | 2 +- drivers/block/loop.c | 3 + drivers/block/nbd.c | 3 - drivers/bluetooth/ath3k.c | 80 +- drivers/bluetooth/btusb.c | 12 +- drivers/cdrom/cdrom.c | 3 +- drivers/char/Makefile | 1 + drivers/char/agp/Kconfig | 2 +- drivers/char/agp/amd-k7-agp.c | 19 - drivers/char/agp/amd64-agp.c | 9 +- drivers/char/agp/intel-agp.c | 27 +- drivers/char/agp/intel-agp.h | 1 + drivers/char/agp/intel-gtt.c | 75 +- drivers/char/bfin_jtag_comm.c | 8 +- drivers/char/ipmi/ipmi_si_intf.c | 12 +- drivers/char/pcmcia/cm4000_cs.c | 3 +- drivers/char/pcmcia/ipwireless/main.c | 52 +- drivers/{tty/hvc => char}/virtio_console.c | 20 +- drivers/clocksource/acpi_pm.c | 6 +- drivers/clocksource/tcb_clksrc.c | 4 +- drivers/dma/amba-pl08x.c | 53 +- drivers/dma/imx-dma.c | 26 +- drivers/dma/imx-sdma.c | 88 +- drivers/dma/ipu/ipu_idmac.c | 50 - drivers/edac/amd64_edac.c | 28 +- drivers/firmware/dmi_scan.c | 11 +- drivers/gpio/langwell_gpio.c | 9 +- drivers/gpio/pca953x.c | 28 +- drivers/gpu/drm/Kconfig | 3 + drivers/gpu/drm/drm_crtc.c | 20 + drivers/gpu/drm/drm_crtc_helper.c | 33 +- drivers/gpu/drm/drm_info.c | 9 +- drivers/gpu/drm/drm_irq.c | 33 +- drivers/gpu/drm/i915/i915_dma.c | 35 +- drivers/gpu/drm/i915/i915_drv.c | 20 +- drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_gem.c | 12 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 + drivers/gpu/drm/i915/i915_gem_tiling.c | 16 +- drivers/gpu/drm/i915/i915_irq.c | 51 +- drivers/gpu/drm/i915/i915_reg.h | 20 +- drivers/gpu/drm/i915/intel_crt.c | 10 + drivers/gpu/drm/i915/intel_display.c | 224 ++++- drivers/gpu/drm/i915/intel_dp.c | 36 +- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_hdmi.c | 39 +- drivers/gpu/drm/i915/intel_lvds.c | 12 +- drivers/gpu/drm/i915/intel_opregion.c | 3 +- drivers/gpu/drm/i915/intel_panel.c | 37 - drivers/gpu/drm/i915/intel_ringbuffer.c | 109 ++- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 + drivers/gpu/drm/i915/intel_sdvo.c | 112 ++- drivers/gpu/drm/i915/intel_tv.c | 43 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 17 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 13 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 1 + drivers/gpu/drm/nouveau/nouveau_drv.c | 8 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 - drivers/gpu/drm/nouveau/nouveau_pm.c | 4 +- drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- drivers/gpu/drm/nouveau/nv04_dfp.c | 12 +- drivers/gpu/drm/nouveau/nv40_graph.c | 46 +- drivers/gpu/drm/nouveau/nv50_evo.c | 3 +- drivers/gpu/drm/nouveau/nv50_graph.c | 3 + drivers/gpu/drm/nouveau/nv50_vm.c | 5 - drivers/gpu/drm/nouveau/nvc0_graph.c | 23 +- drivers/gpu/drm/nouveau/nvc0_grctx.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 135 ++-- drivers/gpu/drm/radeon/atombios_dp.c | 4 +- drivers/gpu/drm/radeon/evergreen.c | 64 +- drivers/gpu/drm/radeon/evergreen_blit_kms.c | 62 +- drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 8 + drivers/gpu/drm/radeon/evergreend.h | 3 + drivers/gpu/drm/radeon/mkregtable.c | 5 +- drivers/gpu/drm/radeon/r100.c | 77 ++- drivers/gpu/drm/radeon/r100_track.h | 13 +- drivers/gpu/drm/radeon/r200.c | 18 + drivers/gpu/drm/radeon/r300.c | 51 +- drivers/gpu/drm/radeon/r300_reg.h | 2 + drivers/gpu/drm/radeon/r420.c | 2 +- drivers/gpu/drm/radeon/r520.c | 4 +- drivers/gpu/drm/radeon/r600.c | 33 +- drivers/gpu/drm/radeon/r600_blit.c | 11 +- drivers/gpu/drm/radeon/r600_blit_kms.c | 29 +- drivers/gpu/drm/radeon/r600_blit_shaders.c | 4 + drivers/gpu/drm/radeon/r600_cp.c | 31 +- drivers/gpu/drm/radeon/r600_cs.c | 46 +- drivers/gpu/drm/radeon/r600_reg.h | 6 +- drivers/gpu/drm/radeon/r600d.h | 9 +- drivers/gpu/drm/radeon/radeon.h | 11 +- drivers/gpu/drm/radeon/radeon_asic.c | 6 +- drivers/gpu/drm/radeon/radeon_asic.h | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 121 ++-- drivers/gpu/drm/radeon/radeon_combios.c | 58 ++ drivers/gpu/drm/radeon/radeon_device.c | 14 +- drivers/gpu/drm/radeon/radeon_display.c | 140 +++- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.h | 1 + drivers/gpu/drm/radeon/radeon_encoders.c | 32 +- drivers/gpu/drm/radeon/radeon_fb.c | 5 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 3 + drivers/gpu/drm/radeon/radeon_kms.c | 6 + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 6 +- drivers/gpu/drm/radeon/radeon_mode.h | 24 +- drivers/gpu/drm/radeon/radeon_pm.c | 5 +- drivers/gpu/drm/radeon/radeon_reg.h | 2 + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- drivers/gpu/drm/radeon/reg_srcs/r300 | 6 +- drivers/gpu/drm/radeon/reg_srcs/r420 | 7 +- drivers/gpu/drm/radeon/reg_srcs/rs600 | 6 +- drivers/gpu/drm/radeon/reg_srcs/rv515 | 7 +- drivers/gpu/drm/radeon/rs400.c | 15 +- drivers/gpu/drm/radeon/rs690.c | 12 +- drivers/gpu/drm/radeon/rv515.c | 10 +- drivers/gpu/drm/radeon/rv770.c | 29 +- drivers/gpu/drm/radeon/rv770d.h | 8 +- drivers/gpu/stub/Kconfig | 2 + drivers/gpu/vga/vgaarb.c | 2 +- drivers/hwmon/Kconfig | 19 +- drivers/hwmon/applesmc.c | 1 + drivers/hwmon/asus_atk0110.c | 23 +- drivers/hwmon/emc1403.c | 2 +- drivers/hwmon/jc42.c | 35 +- drivers/hwmon/k10temp.c | 5 +- drivers/hwmon/lis3lv02d.c | 2 +- drivers/hwmon/lm63.c | 59 +- drivers/hwmon/lm85.c | 23 +- drivers/i2c/busses/i2c-omap.c | 35 +- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/idle/intel_idle.c | 8 +- drivers/infiniband/core/sa_query.c | 2 +- drivers/infiniband/core/ucma.c | 22 +- drivers/infiniband/hw/amso1100/c2_vq.c | 6 +- drivers/infiniband/hw/cxgb4/cm.c | 2 +- drivers/infiniband/hw/cxgb4/qp.c | 4 +- drivers/infiniband/hw/nes/nes_hw.c | 32 +- drivers/infiniband/hw/qib/qib_iba7322.c | 30 +- drivers/infiniband/hw/qib/qib_rc.c | 5 +- drivers/input/gameport/gameport.c | 2 +- drivers/input/input.c | 37 +- drivers/input/keyboard/Kconfig | 10 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/gpio_keys.c | 6 +- drivers/input/keyboard/tegra-kbc.c | 783 ++++++++++++++ drivers/input/keyboard/tnetv107x-keypad.c | 5 +- drivers/input/misc/ixp4xx-beeper.c | 6 +- drivers/input/misc/rotary_encoder.c | 4 +- drivers/input/mouse/synaptics.c | 32 +- drivers/input/mouse/synaptics.h | 23 + drivers/input/serio/ct82c710.c | 8 +- drivers/input/serio/serio.c | 13 +- drivers/input/serio/serport.c | 24 +- drivers/input/sparse-keymap.c | 1 + drivers/input/tablet/wacom_sys.c | 2 +- drivers/input/tablet/wacom_wac.c | 27 +- drivers/input/touchscreen/ads7846.c | 38 +- drivers/input/touchscreen/bu21013_ts.c | 39 +- drivers/input/touchscreen/tnetv107x-ts.c | 5 +- drivers/input/touchscreen/wacom_w8001.c | 13 +- drivers/isdn/hisax/isdnl2.c | 28 +- drivers/isdn/hysdn/hysdn_defs.h | 2 - drivers/isdn/hysdn/hysdn_init.c | 26 +- drivers/isdn/hysdn/hysdn_net.c | 3 - drivers/isdn/hysdn/hysdn_procconf.c | 3 +- drivers/isdn/icn/icn.c | 3 +- drivers/leds/leds-pwm.c | 1 + drivers/md/linear.c | 1 - drivers/md/md.c | 78 ++- drivers/md/md.h | 4 +- drivers/md/multipath.c | 1 - drivers/md/raid0.c | 42 +- drivers/md/raid1.c | 6 +- drivers/md/raid10.c | 13 +- drivers/md/raid5.c | 61 +- drivers/media/rc/ir-lirc-codec.c | 6 +- drivers/media/rc/keymaps/rc-rc6-mce.c | 6 + drivers/media/rc/mceusb.c | 9 +- drivers/media/rc/nuvoton-cir.c | 6 +- drivers/media/rc/rc-main.c | 28 +- drivers/media/rc/streamzap.c | 14 +- drivers/media/video/gspca/zc3xx.c | 31 +- drivers/media/video/hdpvr/hdpvr-core.c | 24 +- drivers/media/video/hdpvr/hdpvr-i2c.c | 30 +- drivers/media/video/hdpvr/hdpvr.h | 3 +- drivers/media/video/ir-kbd-i2c.c | 13 + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 - drivers/media/video/saa7115.c | 2 +- drivers/memstick/core/memstick.c | 2 +- drivers/message/fusion/mptbase.h | 4 +- drivers/message/fusion/mptctl.c | 8 + drivers/message/fusion/mptscsih.c | 7 +- drivers/misc/tifm_core.c | 2 +- drivers/misc/vmw_balloon.c | 2 +- drivers/mmc/host/bfin_sdh.c | 2 +- drivers/mmc/host/jz4740_mmc.c | 5 +- drivers/mmc/host/mmci.c | 109 +-- drivers/mmc/host/mmci.h | 5 +- drivers/mmc/host/msm_sdcc.c | 52 +- drivers/mmc/host/sdhci-s3c.c | 36 + drivers/mmc/host/ushc.c | 1 - drivers/mtd/nand/r852.c | 2 +- drivers/mtd/sm_ftl.c | 2 +- drivers/mtd/ubi/build.c | 28 +- drivers/net/atl1c/atl1c_main.c | 1 + drivers/net/benet/be_cmds.c | 5 + drivers/net/benet/be_main.c | 4 - drivers/net/bnx2.c | 21 +- drivers/net/bnx2.h | 1 + drivers/net/bnx2x/bnx2x.h | 4 +- drivers/net/bnx2x/bnx2x_link.c | 65 +- drivers/net/bnx2x/bnx2x_main.c | 59 +- drivers/net/bonding/bond_3ad.c | 4 + drivers/net/bonding/bond_alb.c | 4 + drivers/net/bonding/bond_main.c | 4 + drivers/net/can/Kconfig | 4 +- drivers/net/can/Makefile | 1 + drivers/net/can/at91_can.c | 138 ++- drivers/net/can/janz-ican3.c | 2 +- drivers/net/can/mcp251x.c | 2 +- drivers/net/can/mscan/Kconfig | 2 +- drivers/net/can/pch_can.c | 5 +- drivers/net/can/softing/Kconfig | 30 + drivers/net/can/softing/Makefile | 6 + drivers/net/can/softing/softing.h | 167 +++ drivers/net/can/softing/softing_cs.c | 360 +++++++ drivers/net/can/softing/softing_fw.c | 691 +++++++++++++ drivers/net/can/softing/softing_main.c | 893 ++++++++++++++++ drivers/net/can/softing/softing_platform.h | 40 + drivers/net/cnic.c | 12 +- drivers/net/cxgb4/cxgb4_main.c | 3 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 80 ++- drivers/net/cxgb4vf/t4vf_hw.c | 2 +- drivers/net/depca.c | 6 +- drivers/net/dl2k.c | 4 +- drivers/net/dm9000.c | 9 +- drivers/net/e1000/e1000_hw.c | 4 +- drivers/net/e1000/e1000_hw.h | 1 + drivers/net/e1000e/netdev.c | 53 +- drivers/net/enc28j60.c | 2 +- drivers/net/forcedeth.c | 2 + drivers/net/ixgbe/ixgbe_common.c | 3 + drivers/net/ixgbe/ixgbe_fcoe.c | 53 +- drivers/net/ixgbe/ixgbe_fcoe.h | 2 + drivers/net/ixgbe/ixgbe_main.c | 22 +- drivers/net/ixgbe/ixgbe_sriov.c | 2 - drivers/net/ixgbe/ixgbe_x540.c | 6 +- drivers/net/mlx4/main.c | 15 + drivers/net/niu.c | 61 +- drivers/net/pch_gbe/pch_gbe.h | 2 +- drivers/net/pch_gbe/pch_gbe_main.c | 118 ++- drivers/net/pcmcia/axnet_cs.c | 6 +- drivers/net/r8169.c | 85 +- drivers/net/sfc/ethtool.c | 22 +- drivers/net/sis900.c | 1 + drivers/net/stmmac/stmmac_main.c | 4 +- drivers/net/tg3.c | 103 +-- drivers/net/tg3.h | 3 - drivers/net/usb/cdc_ncm.c | 227 +++-- drivers/net/usb/dm9601.c | 4 + drivers/net/usb/hso.c | 12 +- drivers/net/usb/kaweth.c | 1 + drivers/net/usb/usbnet.c | 4 +- drivers/net/virtio_net.c | 27 +- drivers/net/vxge/vxge-config.c | 2 +- drivers/net/wireless/ath/ath5k/dma.c | 4 +- drivers/net/wireless/ath/ath5k/pcu.c | 4 +- drivers/net/wireless/ath/ath5k/phy.c | 143 ++- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 8 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 3 - drivers/net/wireless/ath/ath9k/htc_drv_main.c | 21 +- drivers/net/wireless/ath/ath9k/hw.c | 6 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/init.c | 15 +- drivers/net/wireless/ath/ath9k/main.c | 37 +- drivers/net/wireless/ath/ath9k/xmit.c | 9 +- drivers/net/wireless/ath/carl9170/rx.c | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 67 -- drivers/net/wireless/iwlwifi/iwl-4965.c | 1 + drivers/net/wireless/iwlwifi/iwl-6000.c | 2 + drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 11 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 6 + drivers/net/wireless/p54/p54pci.c | 14 +- drivers/net/wireless/rt2x00/rt2800pci.c | 8 + drivers/net/wireless/rt2x00/rt2800usb.c | 6 + drivers/net/wireless/rt2x00/rt73usb.c | 1 + drivers/net/wireless/rtlwifi/efuse.c | 40 +- drivers/net/wireless/rtlwifi/pci.c | 11 +- drivers/net/wireless/wl1251/main.c | 3 + drivers/net/wireless/wl12xx/spi.c | 3 +- drivers/net/xen-netfront.c | 96 ++- drivers/nfc/Kconfig | 2 +- drivers/nfc/pn544.c | 4 +- drivers/parport/share.c | 4 +- drivers/pci/pci-sysfs.c | 3 +- drivers/pcmcia/pcmcia_resource.c | 2 + drivers/pcmcia/pxa2xx_base.c | 2 +- drivers/pcmcia/pxa2xx_base.h | 1 + drivers/pcmcia/pxa2xx_lubbock.c | 1 + drivers/platform/x86/Kconfig | 2 +- drivers/platform/x86/acer-wmi.c | 4 +- drivers/platform/x86/asus_acpi.c | 8 +- drivers/platform/x86/dell-laptop.c | 24 +- drivers/platform/x86/intel_pmic_gpio.c | 116 +-- drivers/platform/x86/intel_scu_ipc.c | 8 +- drivers/platform/x86/intel_scu_ipcutil.c | 2 +- drivers/platform/x86/tc1100-wmi.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 8 +- drivers/pps/clients/pps-ktimer.c | 2 - drivers/pps/clients/pps_parport.c | 2 +- drivers/pps/generators/pps_gen_parport.c | 2 +- drivers/pps/kapi.c | 2 +- drivers/rapidio/rio-sysfs.c | 12 +- drivers/regulator/mc13xxx-regulator-core.c | 2 +- drivers/regulator/wm831x-dcdc.c | 1 + drivers/rtc/class.c | 1 + drivers/rtc/interface.c | 83 +- drivers/rtc/rtc-at32ap700x.c | 19 +- drivers/rtc/rtc-at91rm9200.c | 20 +- drivers/rtc/rtc-at91sam9.c | 20 +- drivers/rtc/rtc-bfin.c | 21 +- drivers/rtc/rtc-dev.c | 125 ++- drivers/rtc/rtc-ds1286.c | 41 +- drivers/rtc/rtc-ds1305.c | 43 +- drivers/rtc/rtc-ds1307.c | 49 +- drivers/rtc/rtc-ds1374.c | 37 +- drivers/rtc/rtc-ds3232.c | 14 +- drivers/rtc/rtc-m41t80.c | 30 +- drivers/rtc/rtc-m48t59.c | 21 +- drivers/rtc/rtc-mrst.c | 31 +- drivers/rtc/rtc-msm6242.c | 2 +- drivers/rtc/rtc-mv.c | 20 +- drivers/rtc/rtc-omap.c | 28 +- drivers/rtc/rtc-proc.c | 6 +- drivers/rtc/rtc-rp5c01.c | 2 +- drivers/rtc/rtc-rs5c372.c | 48 +- drivers/rtc/rtc-sa1100.c | 22 +- drivers/rtc/rtc-sh.c | 11 +- drivers/rtc/rtc-test.c | 21 +- drivers/rtc/rtc-vr41xx.c | 38 +- drivers/s390/block/dasd_alias.c | 6 + drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/cio/qdio_main.c | 4 +- drivers/s390/net/netiucv.c | 2 +- drivers/s390/net/qeth_core_main.c | 149 ++-- drivers/s390/net/qeth_l2_main.c | 4 +- drivers/s390/net/smsgiucv.c | 2 +- drivers/scsi/arcmsr/arcmsr.h | 11 +- drivers/scsi/arcmsr/arcmsr_attr.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 114 +-- drivers/scsi/libsas/sas_scsi_host.c | 1 + drivers/scsi/mpt2sas/mpt2sas_base.c | 19 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 64 +- drivers/scsi/qla2xxx/qla_attr.c | 5 +- drivers/scsi/qla2xxx/qla_init.c | 10 +- drivers/scsi/qla2xxx/qla_os.c | 10 +- drivers/scsi/scsi_debug.c | 2 +- drivers/sh/intc/chip.c | 6 +- drivers/spi/pxa2xx_spi_pci.c | 61 +- drivers/spi/spi_sh_msiof.c | 6 +- drivers/ssb/pcmcia.c | 2 +- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 4 +- drivers/staging/brcm80211/sys/wl_mac80211.c | 57 +- drivers/staging/brcm80211/sys/wlc_mac80211.c | 14 +- drivers/staging/brcm80211/sys/wlc_pub.h | 2 + drivers/staging/comedi/Kconfig | 5 +- drivers/staging/comedi/drivers/mite.c | 2 - drivers/staging/comedi/drivers/ni_6527.c | 4 + drivers/staging/comedi/drivers/ni_65xx.c | 4 + drivers/staging/comedi/drivers/ni_660x.c | 4 + drivers/staging/comedi/drivers/ni_670x.c | 4 + drivers/staging/comedi/drivers/ni_labpc.c | 3 +- drivers/staging/comedi/drivers/ni_pcidio.c | 4 + drivers/staging/comedi/drivers/ni_pcimio.c | 4 + drivers/staging/hv/blkvsc_drv.c | 1 + drivers/staging/hv/netvsc.c | 2 +- drivers/staging/hv/netvsc_drv.c | 2 +- drivers/staging/iio/adc/ad7476_core.c | 2 +- drivers/staging/iio/adc/ad7887_core.c | 2 +- drivers/staging/iio/adc/ad799x_core.c | 2 +- drivers/staging/iio/dac/ad5446.c | 2 +- drivers/staging/intel_sst/intelmid_v2_control.c | 5 +- drivers/staging/lirc/lirc_zilog.c | 32 +- drivers/staging/msm/msm_fb.c | 8 +- drivers/staging/olpc_dcon/olpc_dcon.c | 10 +- drivers/staging/rt2860/rt_main_dev.c | 2 - drivers/staging/rt2860/usb_main_dev.c | 1 + drivers/staging/rtl8712/hal_init.c | 11 +- drivers/staging/rtl8712/usb_intf.c | 145 ++- drivers/staging/sm7xx/smtcfb.c | 8 +- drivers/staging/speakup/kobjects.c | 2 +- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 19 +- drivers/staging/tidspbridge/core/io_sm.c | 8 +- drivers/staging/tidspbridge/core/tiomap3430.c | 15 +- .../staging/tidspbridge/include/dspbridge/io_sm.h | 21 +- drivers/staging/usbip/stub.h | 1 + drivers/staging/usbip/stub_dev.c | 18 +- drivers/staging/usbip/stub_rx.c | 4 +- drivers/staging/usbip/vhci.h | 6 +- drivers/staging/usbip/vhci_hcd.c | 54 +- drivers/staging/usbip/vhci_rx.c | 50 +- drivers/staging/xgifb/vb_setmode.c | 6 +- drivers/staging/zram/zram_drv.c | 4 + drivers/target/Makefile | 3 +- drivers/target/target_core_configfs.c | 155 ++-- drivers/target/target_core_device.c | 13 +- drivers/target/target_core_fabric_configfs.c | 92 ++- drivers/target/target_core_iblock.c | 8 +- drivers/target/target_core_mib.c | 1078 -------------------- drivers/target/target_core_mib.h | 28 - drivers/target/target_core_pscsi.c | 4 +- drivers/target/target_core_tmr.c | 5 + drivers/target/target_core_tpg.c | 29 +- drivers/target/target_core_transport.c | 56 +- drivers/tty/hvc/Makefile | 1 - drivers/tty/n_gsm.c | 1 + drivers/tty/n_hdlc.c | 90 +- drivers/tty/serial/68328serial.c | 29 +- drivers/tty/serial/68360serial.c | 1 + drivers/tty/serial/8250.c | 3 +- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/bfin_5xx.c | 15 +- drivers/tty/serial/max3100.c | 2 +- drivers/tty/serial/max3107.c | 2 +- drivers/tty/serial/sb1250-duart.c | 2 +- drivers/tty/sysrq.c | 19 +- drivers/tty/tty_io.c | 8 +- drivers/tty/vt/selection.c | 4 +- drivers/tty/vt/vc_screen.c | 16 +- drivers/tty/vt/vt.c | 135 ++-- drivers/tty/vt/vt_ioctl.c | 60 +- drivers/usb/class/cdc-acm.c | 1 + drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/core/endpoint.c | 2 +- drivers/usb/core/hcd-pci.c | 7 +- drivers/usb/core/hcd.c | 2 +- drivers/usb/core/hub.c | 44 +- drivers/usb/core/quirks.c | 8 + drivers/usb/gadget/Kconfig | 9 +- drivers/usb/gadget/ci13xxx_udc.c | 268 +++--- drivers/usb/gadget/ci13xxx_udc.h | 9 +- drivers/usb/gadget/composite.c | 5 +- drivers/usb/gadget/f_mass_storage.c | 3 +- drivers/usb/gadget/pch_udc.c | 127 ++- drivers/usb/gadget/printer.c | 19 +- drivers/usb/gadget/r8a66597-udc.c | 2 +- drivers/usb/host/Kconfig | 2 + drivers/usb/host/ehci-au1xxx.c | 2 +- drivers/usb/host/ehci-fsl.c | 13 - drivers/usb/host/ehci-fsl.h | 3 - drivers/usb/host/ehci-hcd.c | 19 +- drivers/usb/host/ehci-hub.c | 7 + drivers/usb/host/ehci-mxc.c | 25 +- drivers/usb/host/ehci-omap.c | 6 +- drivers/usb/host/ehci-pci.c | 35 +- drivers/usb/host/fsl-mph-dr-of.c | 11 +- drivers/usb/host/sl811-hcd.c | 1 + drivers/usb/host/xhci-dbg.c | 9 +- drivers/usb/host/xhci-mem.c | 10 +- drivers/usb/host/xhci-ring.c | 131 ++- drivers/usb/host/xhci.c | 74 +- drivers/usb/host/xhci.h | 18 +- drivers/usb/misc/usbled.c | 2 +- drivers/usb/misc/uss720.c | 1 - drivers/usb/musb/blackfin.c | 1 + drivers/usb/musb/musb_core.c | 11 +- drivers/usb/musb/musb_core.h | 13 + drivers/usb/musb/musb_dma.h | 3 + drivers/usb/musb/musb_gadget.c | 71 +- drivers/usb/musb/musb_gadget.h | 8 +- drivers/usb/musb/musb_host.c | 11 +- drivers/usb/musb/musbhsdma.h | 19 +- drivers/usb/musb/omap2430.c | 1 + drivers/usb/otg/Kconfig | 2 + drivers/usb/otg/nop-usb-xceiv.c | 2 + drivers/usb/otg/ulpi.c | 2 +- drivers/usb/serial/ch341.c | 10 + drivers/usb/serial/cp210x.c | 16 +- drivers/usb/serial/digi_acceleport.c | 10 - drivers/usb/serial/ftdi_sio.c | 39 +- drivers/usb/serial/ftdi_sio_ids.h | 32 +- drivers/usb/serial/generic.c | 20 + drivers/usb/serial/io_edgeport.c | 4 +- drivers/usb/serial/io_tables.h | 1 + drivers/usb/serial/iuu_phoenix.c | 1 + drivers/usb/serial/keyspan.h | 4 + drivers/usb/serial/keyspan_pda.c | 17 - drivers/usb/serial/moto_modem.c | 1 + drivers/usb/serial/option.c | 23 +- drivers/usb/serial/oti6858.c | 1 + drivers/usb/serial/pl2303.c | 12 + drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/qcaux.c | 3 + drivers/usb/serial/siemens_mpi.c | 1 + drivers/usb/serial/sierra.c | 3 + drivers/usb/serial/spcp8x5.c | 7 +- drivers/usb/serial/ti_usb_3410_5052.c | 2 +- drivers/usb/serial/usb-serial.c | 8 +- drivers/usb/serial/usb_debug.c | 1 + drivers/usb/serial/usb_wwan.c | 15 +- drivers/usb/serial/visor.c | 12 + drivers/usb/storage/unusual_cypress.h | 5 + drivers/usb/storage/unusual_devs.h | 32 + drivers/vhost/net.c | 9 +- drivers/vhost/vhost.h | 6 +- drivers/video/arkfb.c | 12 +- drivers/video/aty/aty128fb.c | 12 +- drivers/video/aty/atyfb_base.c | 10 +- drivers/video/aty/radeon_pm.c | 10 +- drivers/video/bf537-lq035.c | 58 +- drivers/video/chipsfb.c | 8 +- drivers/video/console/fbcon.c | 42 +- drivers/video/console/vgacon.c | 6 +- drivers/video/da8xx-fb.c | 11 +- drivers/video/fbmem.c | 12 +- drivers/video/fbsysfs.c | 20 +- drivers/video/geode/gxfb_core.c | 8 +- drivers/video/geode/lxfb_core.c | 8 +- drivers/video/i810/i810_main.c | 8 +- drivers/video/jz4740_fb.c | 8 +- drivers/video/mx3fb.c | 8 +- drivers/video/nuc900fb.c | 6 +- drivers/video/nvidia/nvidia.c | 8 +- drivers/video/ps3fb.c | 16 +- drivers/video/pxa168fb.c | 6 +- drivers/video/pxa3xx-gcu.c | 4 +- drivers/video/s3fb.c | 16 +- drivers/video/savage/savagefb_driver.c | 8 +- drivers/video/sh_mobile_hdmi.c | 8 +- drivers/video/sh_mobile_lcdcfb.c | 4 +- drivers/video/sm501fb.c | 8 +- drivers/video/tmiofb.c | 10 +- drivers/video/via/viafbdev.c | 8 +- drivers/video/vt8623fb.c | 12 +- drivers/video/xen-fbfront.c | 4 +- drivers/w1/masters/omap_hdq.c | 28 +- drivers/watchdog/Kconfig | 6 +- drivers/watchdog/Makefile | 2 +- drivers/watchdog/{m548x_wdt.c => m54xx_wdt.c} | 50 +- drivers/xen/manage.c | 10 + fs/afs/write.c | 1 + fs/aio.c | 52 +- fs/block_dev.c | 29 +- fs/btrfs/acl.c | 6 + fs/btrfs/compression.c | 27 +- fs/btrfs/ctree.h | 3 + fs/btrfs/disk-io.c | 15 +- fs/btrfs/export.c | 2 + fs/btrfs/extent-tree.c | 109 ++- fs/btrfs/extent_io.c | 192 +++- fs/btrfs/extent_io.h | 2 +- fs/btrfs/extent_map.c | 4 +- fs/btrfs/file-item.c | 5 + fs/btrfs/file.c | 21 +- fs/btrfs/free-space-cache.c | 162 ++-- fs/btrfs/inode.c | 164 +++- fs/btrfs/ioctl.c | 36 +- fs/btrfs/lzo.c | 21 +- fs/btrfs/ordered-data.c | 2 +- fs/btrfs/print-tree.c | 1 + fs/btrfs/relocation.c | 43 +- fs/btrfs/super.c | 16 +- fs/btrfs/transaction.c | 5 + fs/btrfs/tree-log.c | 35 +- fs/btrfs/volumes.c | 34 +- fs/ceph/caps.c | 43 +- fs/ceph/dir.c | 5 +- fs/ceph/inode.c | 10 +- fs/ceph/mds_client.c | 10 +- fs/ceph/snap.c | 14 +- fs/ceph/super.c | 2 + fs/ceph/super.h | 1 + fs/ceph/xattr.c | 3 + fs/cifs/Kconfig | 1 + fs/cifs/Makefile | 2 +- fs/cifs/README | 5 + fs/cifs/cifs_dfs_ref.c | 10 +- fs/cifs/cifsacl.c | 4 + fs/cifs/cifsencrypt.c | 38 +- fs/cifs/cifsencrypt.h | 33 - fs/cifs/cifsfs.c | 15 +- fs/cifs/cifsfs.h | 6 +- fs/cifs/cifsglob.h | 37 +- fs/cifs/cifsproto.h | 11 +- fs/cifs/cifssmb.c | 8 +- fs/cifs/connect.c | 70 +- fs/cifs/file.c | 211 ++++- fs/cifs/link.c | 59 +- fs/cifs/md4.c | 205 ---- fs/cifs/md5.c | 366 ------- fs/cifs/md5.h | 38 - fs/cifs/misc.c | 116 ++- fs/cifs/netmisc.c | 8 +- fs/cifs/readdir.c | 3 - fs/cifs/sess.c | 8 +- fs/cifs/smbdes.c | 1 - fs/cifs/smbencrypt.c | 92 ++- fs/cifs/transport.c | 69 +- fs/dlm/lowcomms.c | 6 +- fs/ecryptfs/dentry.c | 22 +- fs/ecryptfs/ecryptfs_kernel.h | 3 +- fs/ecryptfs/file.c | 1 + fs/ecryptfs/inode.c | 138 +-- fs/eventfd.c | 12 +- fs/eventpoll.c | 111 ++- fs/exec.c | 4 +- fs/exofs/inode.c | 2 - fs/ext4/ext4.h | 10 + fs/ext4/extents.c | 10 +- fs/ext4/file.c | 60 ++- fs/ext4/mballoc.c | 100 ++- fs/ext4/page-io.c | 36 +- fs/ext4/super.c | 66 +- fs/fcntl.c | 2 +- fs/file_table.c | 2 +- fs/gfs2/glock.c | 4 +- fs/gfs2/main.c | 11 +- fs/hfsplus/extents.c | 4 +- fs/hfsplus/part_tbl.c | 4 +- fs/hfsplus/super.c | 106 ++- fs/hfsplus/wrapper.c | 4 +- fs/inode.c | 31 +- fs/internal.h | 2 +- fs/ioctl.c | 7 + fs/jbd2/journal.c | 9 +- fs/jbd2/transaction.c | 21 +- fs/lockd/host.c | 9 +- fs/namei.c | 151 ++-- fs/namespace.c | 2 +- fs/nfs/callback.c | 109 +-- fs/nfs/callback.h | 4 +- fs/nfs/callback_proc.c | 12 +- fs/nfs/callback_xdr.c | 5 +- fs/nfs/client.c | 15 +- fs/nfs/delegation.c | 6 +- fs/nfs/direct.c | 34 +- fs/nfs/inode.c | 26 +- fs/nfs/internal.h | 3 +- fs/nfs/nfs3acl.c | 4 +- fs/nfs/nfs3xdr.c | 5 +- fs/nfs/nfs4filelayoutdev.c | 9 +- fs/nfs/nfs4proc.c | 30 +- fs/nfs/nfs4state.c | 6 - fs/nfs/nfs4xdr.c | 9 +- fs/nfs/pnfs.c | 2 +- fs/nfs/write.c | 2 +- fs/nfs_common/nfsacl.c | 54 +- fs/nfsd/nfs4callback.c | 6 +- fs/nfsd/nfs4state.c | 186 ++-- fs/nfsd/nfs4xdr.c | 8 +- fs/nfsd/state.h | 5 +- fs/nfsd/vfs.c | 21 +- fs/nilfs2/btnode.c | 5 - fs/nilfs2/btnode.h | 1 - fs/nilfs2/mdt.c | 4 +- fs/nilfs2/page.c | 13 - fs/nilfs2/page.h | 1 - fs/nilfs2/super.c | 5 +- fs/ntfs/mft.c | 11 +- fs/open.c | 2 + fs/partitions/ldm.c | 5 + fs/partitions/mac.c | 17 +- fs/posix_acl.c | 17 +- fs/proc/array.c | 3 - fs/proc/consoles.c | 4 +- fs/squashfs/block.c | 8 + fs/squashfs/xz_wrapper.c | 6 - fs/squashfs/zlib_wrapper.c | 6 - fs/super.c | 5 + fs/xfs/linux-2.6/xfs_discard.c | 2 + fs/xfs/linux-2.6/xfs_ioctl.c | 20 +- fs/xfs/quota/xfs_qm.c | 46 +- fs/xfs/xfs_alloc.h | 16 + fs/xfs/xfs_bmap.c | 61 +- fs/xfs/xfs_buf_item.c | 12 +- fs/xfs/xfs_extfree_item.c | 3 +- fs/xfs/xfs_fsops.c | 3 + fs/xfs/xfs_iomap.c | 7 +- fs/xfs/xfs_log.h | 2 +- fs/xfs/xfs_log_cil.c | 15 +- fs/xfs/xfs_trans.c | 41 +- include/asm-generic/vmlinux.lds.h | 24 +- include/drm/drmP.h | 2 +- include/drm/drm_crtc.h | 7 + include/drm/drm_pciids.h | 1 - include/drm/radeon_drm.h | 1 + include/linux/Kbuild | 1 + include/linux/caif/Kbuild | 2 + include/linux/console.h | 6 +- include/linux/dcbnl.h | 2 +- include/linux/freezer.h | 2 +- include/linux/fs.h | 9 +- include/linux/huge_mm.h | 3 +- include/linux/input/bu21013.h | 4 - include/linux/input/matrix_keypad.h | 4 +- include/linux/irq.h | 3 +- include/linux/kernel.h | 2 +- include/linux/klist.h | 2 +- include/linux/list.h | 12 +- include/linux/mmc/sh_mmcif.h | 4 +- include/linux/module.h | 6 +- include/linux/mroute.h | 1 + include/linux/mroute6.h | 1 + include/linux/nfsacl.h | 4 +- include/linux/oprofile.h | 13 +- include/linux/pm.h | 2 + include/linux/pm_wakeup.h | 25 +- include/linux/posix_acl.h | 1 + include/linux/res_counter.h | 20 + include/linux/rio_regs.h | 4 +- include/linux/rtc.h | 15 +- include/linux/sched.h | 2 +- include/linux/security.h | 6 +- include/linux/sunrpc/bc_xprt.h | 13 - include/linux/sunrpc/svc_xprt.h | 1 - include/linux/syscalls.h | 28 +- include/linux/sysrq.h | 3 + include/linux/tracepoint.h | 35 +- include/linux/usb/cdc.h | 23 +- include/linux/usb/hcd.h | 1 + include/linux/usb/msm_hsusb_hw.h | 4 - include/linux/usb/serial.h | 3 + include/linux/virtio_console.h | 3 +- include/linux/workqueue.h | 8 +- include/net/bluetooth/hci_core.h | 1 + include/net/genetlink.h | 3 +- include/net/ipv6.h | 12 + include/net/netfilter/nf_conntrack_ecache.h | 3 - include/net/netfilter/nf_tproxy_core.h | 12 +- include/net/sch_generic.h | 10 +- include/net/sock.h | 2 + include/pcmcia/ds.h | 1 + include/scsi/scsi.h | 1 + include/sound/wm8903.h | 10 +- include/target/target_core_base.h | 28 +- include/target/target_core_transport.h | 4 + include/trace/ftrace.h | 24 +- init/calibrate.c | 6 +- kernel/capability.c | 2 +- kernel/cred.c | 16 +- kernel/irq/internals.h | 6 + kernel/irq/irqdesc.c | 11 +- kernel/irq/manage.c | 2 +- kernel/irq/migration.c | 14 +- kernel/irq/resend.c | 2 +- kernel/module.c | 16 +- kernel/perf_event.c | 75 +- kernel/power/main.c | 2 +- kernel/power/process.c | 6 +- kernel/power/snapshot.c | 7 +- kernel/printk.c | 154 ++-- kernel/ptrace.c | 2 +- kernel/sched_fair.c | 91 ++- kernel/sched_rt.c | 2 +- kernel/sys.c | 3 +- kernel/sysctl.c | 3 +- kernel/time/tick-sched.c | 7 +- kernel/time/timer_list.c | 4 +- kernel/timer.c | 8 +- kernel/trace/blktrace.c | 7 + kernel/trace/trace_events.c | 12 +- kernel/trace/trace_export.c | 6 +- kernel/trace/trace_syscalls.c | 19 +- kernel/tracepoint.c | 31 +- kernel/watchdog.c | 53 +- kernel/workqueue.c | 37 +- lib/Kconfig.debug | 2 +- lib/list_debug.c | 39 +- lib/radix-tree.c | 7 +- lib/rbtree.c | 3 + lib/swiotlb.c | 6 +- lib/textsearch.c | 10 +- mm/Kconfig | 2 +- mm/huge_memory.c | 44 +- mm/kmemleak-test.c | 6 +- mm/kmemleak.c | 13 +- mm/memblock.c | 2 - mm/memcontrol.c | 98 ++- mm/memory-failure.c | 94 ++- mm/memory.c | 34 +- mm/mempolicy.c | 2 +- mm/migrate.c | 15 +- mm/mlock.c | 7 + mm/mremap.c | 4 +- mm/page_alloc.c | 23 +- mm/pgtable-generic.c | 1 + mm/swapfile.c | 2 +- mm/truncate.c | 2 + mm/vmscan.c | 39 +- net/batman-adv/unicast.c | 15 +- net/batman-adv/vis.c | 14 +- net/bluetooth/hci_conn.c | 16 +- net/bluetooth/hci_core.c | 4 + net/bluetooth/hci_event.c | 9 +- net/bluetooth/l2cap.c | 85 +- net/bluetooth/rfcomm/core.c | 3 +- net/bluetooth/rfcomm/tty.c | 2 + net/bridge/br_fdb.c | 4 +- net/bridge/br_input.c | 2 +- net/bridge/br_multicast.c | 42 +- net/bridge/br_private.h | 3 +- net/caif/chnl_net.c | 4 +- net/ceph/messenger.c | 62 +- net/core/dev.c | 44 +- net/core/ethtool.c | 2 +- net/core/rtnetlink.c | 6 +- net/core/skbuff.c | 9 +- net/dcb/dcbnl.c | 22 +- net/econet/af_econet.c | 4 +- net/ipv4/af_inet.c | 16 + net/ipv4/arp.c | 11 +- net/ipv4/devinet.c | 30 +- net/ipv4/inet_timewait_sock.c | 2 + net/ipv4/inetpeer.c | 2 +- net/ipv4/ip_gre.c | 1 + net/ipv4/ipmr.c | 76 ++ net/ipv4/netfilter/arpt_mangle.c | 6 +- net/ipv4/raw.c | 19 + net/ipv4/route.c | 7 + net/ipv4/tcp_input.c | 7 +- net/ipv4/tcp_ipv4.c | 1 - net/ipv4/tcp_output.c | 2 +- net/ipv6/addrconf.c | 81 +- net/ipv6/ip6mr.c | 75 ++ net/ipv6/netfilter/ip6t_LOG.c | 2 +- net/ipv6/raw.c | 19 + net/ipv6/route.c | 20 +- net/ipv6/sysctl_net_ipv6.c | 9 +- net/ipv6/xfrm6_policy.c | 6 + net/mac80211/cfg.c | 2 + net/mac80211/ieee80211_i.h | 2 +- net/mac80211/iface.c | 1 + net/mac80211/mlme.c | 6 + net/mac80211/status.c | 7 +- net/mac80211/tx.c | 5 +- net/mac80211/util.c | 2 + net/netfilter/core.c | 3 +- net/netfilter/nf_conntrack_core.c | 11 +- net/netfilter/nf_conntrack_ecache.c | 3 + net/netfilter/nf_conntrack_netlink.c | 1 + net/netfilter/nf_tproxy_core.c | 27 +- net/netfilter/xt_TPROXY.c | 22 +- net/netfilter/xt_iprange.c | 16 +- net/netfilter/xt_socket.c | 13 +- net/rxrpc/ar-key.c | 8 +- net/sched/sch_cbq.c | 3 +- net/sched/sch_drr.c | 2 +- net/sched/sch_dsmark.c | 2 +- net/sched/sch_fifo.c | 5 +- net/sched/sch_generic.c | 1 + net/sched/sch_hfsc.c | 2 +- net/sched/sch_htb.c | 12 +- net/sched/sch_multiq.c | 2 +- net/sched/sch_netem.c | 3 +- net/sched/sch_prio.c | 2 +- net/sched/sch_red.c | 11 +- net/sched/sch_sfq.c | 5 +- net/sched/sch_tbf.c | 2 +- net/sched/sch_teql.c | 3 +- net/sctp/sm_make_chunk.c | 10 +- net/sunrpc/svcsock.c | 4 +- net/wireless/wext-compat.c | 4 +- net/x25/x25_facilities.c | 28 +- net/x25/x25_in.c | 14 +- net/x25/x25_link.c | 5 +- net/xfrm/xfrm_policy.c | 7 +- scripts/basic/fixdep.c | 12 +- scripts/package/builddeb | 6 +- security/keys/internal.h | 6 +- security/keys/key.c | 8 +- security/keys/keyring.c | 31 +- security/keys/request_key.c | 2 +- security/security.c | 5 +- security/selinux/hooks.c | 6 +- sound/arm/aaci.c | 56 +- sound/atmel/ac97c.c | 5 +- sound/core/hrtimer.c | 7 +- sound/drivers/mtpav.c | 3 +- sound/oss/Makefile | 4 +- sound/pci/au88x0/au88x0_core.c | 14 +- sound/pci/azt3328.c | 38 +- sound/pci/hda/hda_eld.c | 2 +- sound/pci/hda/hda_intel.c | 3 +- sound/pci/hda/patch_conexant.c | 212 +++-- sound/pci/hda/patch_hdmi.c | 2 + sound/pci/hda/patch_realtek.c | 33 +- sound/pci/oxygen/oxygen.h | 2 + sound/pci/oxygen/oxygen_mixer.c | 2 + sound/pci/oxygen/xonar_cs43xx.c | 2 +- sound/pci/oxygen/xonar_dg.c | 36 + sound/pcmcia/pdaudiocf/pdaudiocf.h | 2 +- sound/pcmcia/vx/vxp_ops.c | 2 +- sound/soc/atmel/snd-soc-afeb9260.c | 2 +- sound/soc/blackfin/bf5xx-ssm2602.c | 2 +- sound/soc/codecs/cq93vc.c | 2 +- sound/soc/codecs/cx20442.c | 3 + sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8994.c | 221 ++++- sound/soc/codecs/wm8995.c | 2 +- sound/soc/codecs/wm_hubs.c | 15 +- sound/soc/davinci/davinci-evm.c | 20 +- sound/soc/omap/ams-delta.c | 2 - sound/soc/pxa/corgi.c | 4 +- sound/soc/pxa/poodle.c | 2 +- sound/soc/pxa/spitz.c | 4 +- sound/soc/samsung/neo1973_gta02_wm8753.c | 6 +- sound/soc/samsung/neo1973_wm8753.c | 6 +- sound/soc/samsung/s3c24xx_simtec_hermes.c | 4 +- sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 4 +- sound/soc/samsung/s3c24xx_uda134x.c | 2 +- sound/soc/soc-core.c | 5 +- sound/soc/soc-dapm.c | 29 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/midi.c | 2 +- sound/usb/mixer.c | 4 +- sound/usb/quirks-table.h | 7 + sound/usb/quirks.c | 3 +- tools/perf/Makefile | 9 +- tools/perf/builtin-annotate.c | 6 +- tools/perf/builtin-kmem.c | 4 +- tools/perf/builtin-lock.c | 6 +- tools/perf/builtin-record.c | 6 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-sched.c | 20 +- tools/perf/builtin-script.c | 6 +- tools/perf/builtin-stat.c | 4 +- tools/perf/builtin-test.c | 54 +- tools/perf/builtin-top.c | 11 +- tools/perf/util/event.c | 23 +- tools/perf/util/event.h | 6 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/header.c | 4 +- tools/perf/util/hist.c | 17 +- tools/perf/util/include/linux/bitops.h | 1 + tools/perf/util/map.c | 3 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/parse-events.h | 2 +- tools/perf/util/probe-event.c | 2 +- tools/perf/util/session.c | 28 +- tools/perf/util/svghelper.c | 9 +- tools/perf/util/symbol.c | 16 +- tools/perf/util/types.h | 10 +- tools/perf/util/ui/browsers/hists.c | 2 +- tools/perf/util/ui/browsers/map.c | 5 +- tools/perf/util/values.c | 10 +- tools/power/x86/turbostat/turbostat.c | 200 ++-- 1251 files changed, 16730 insertions(+), 9815 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-platform-at91 rename Documentation/{powerpc/dts-bindings/fsl/sata.txt => devicetree/bindings/ata/fsl-sata.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/eeprom.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl => devicetree/bindings/gpio}/8xxx_gpio.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/gpio/gpio.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/gpio/led.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl/i2c.txt => devicetree/bindings/i2c/fsl-i2c.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/marvell.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl/esdhc.txt => devicetree/bindings/mmc/fsl-esdhc.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/mmc}/mmc-spi-slot.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl/upm-nand.txt => devicetree/bindings/mtd/fsl-upm-nand.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/mtd}/mtd-physmap.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl/can.txt => devicetree/bindings/net/can/mpc5xxx-mscan.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/net}/can/sja1000.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl/tsec.txt => devicetree/bindings/net/fsl-tsec-phy.txt} (100%) rename Documentation/{powerpc/dts-bindings/gpio/mdio.txt => devicetree/bindings/net/mdio-gpio.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/net}/phy.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl => devicetree/bindings/pci}/83xx-512x-pci.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/cpm.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/emac.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/ndfc.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/ppc440spe-adma.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/reboot.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/board.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/brg.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/i2c.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/pic.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/usb.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/gpio.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/network.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/firmware.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/par_io.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/pincfg.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/ucc.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/usb.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/serial.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/diu.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/dma.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc/fsl}/ecm.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/gtm.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/guts.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/lbc.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mcm.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mcu-mpc8349emitx.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mpc5121-psc.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mpc5200.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mpic.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/msi-pic.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/pmc.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/sec.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/ssi.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/nintendo/gamecube.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/nintendo/wii.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl/spi.txt => devicetree/bindings/spi/fsl-spi.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/spi}/spi-bus.txt (100%) rename Documentation/{powerpc/dts-bindings/fsl/usb.txt => devicetree/bindings/usb/fsl-usb.txt} (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings/usb}/usb-ehci.txt (100%) rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/xilinx.txt (100%) rename Documentation/{powerpc => devicetree}/booting-without-of.txt (90%) create mode 100644 arch/arm/mach-tegra/include/mach/kbc.h delete mode 100644 arch/arm/plat-s5p/include/plat/sysmmu.h create mode 100644 arch/m68knommu/lib/memmove.c delete mode 100644 arch/x86/include/asm/system_64.h rename drivers/{tty/hvc => char}/virtio_console.c (99%) create mode 100644 drivers/input/keyboard/tegra-kbc.c create mode 100644 drivers/net/can/softing/Kconfig create mode 100644 drivers/net/can/softing/Makefile create mode 100644 drivers/net/can/softing/softing.h create mode 100644 drivers/net/can/softing/softing_cs.c create mode 100644 drivers/net/can/softing/softing_fw.c create mode 100644 drivers/net/can/softing/softing_main.c create mode 100644 drivers/net/can/softing/softing_platform.h delete mode 100644 drivers/staging/vme/bridges/Module.symvers delete mode 100644 drivers/target/target_core_mib.c delete mode 100644 drivers/target/target_core_mib.h rename drivers/watchdog/{m548x_wdt.c => m54xx_wdt.c} (80%) delete mode 100644 fs/cifs/cifsencrypt.h delete mode 100644 fs/cifs/md4.c delete mode 100644 fs/cifs/md5.c delete mode 100644 fs/cifs/md5.h create mode 100644 include/linux/caif/Kbuild ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Auto-merging MAINTAINERS Auto-merging block/blk-core.c Auto-merging drivers/net/bnx2x/bnx2x_main.c Auto-merging drivers/scsi/scsi_lib.c Merge made by recursive. Documentation/networking/00-INDEX | 6 - Documentation/networking/dns_resolver.txt | 9 ++- MAINTAINERS | 15 +++- Makefile | 2 +- arch/alpha/Kconfig | 1 + arch/alpha/kernel/irq.c | 13 ++- arch/alpha/kernel/irq_alpha.c | 11 +-- arch/alpha/kernel/irq_i8259.c | 18 ++-- arch/alpha/kernel/irq_impl.h | 8 +- arch/alpha/kernel/irq_pyxis.c | 20 ++-- arch/alpha/kernel/irq_srm.c | 16 ++-- arch/alpha/kernel/sys_alcor.c | 28 +++--- arch/alpha/kernel/sys_cabriolet.c | 16 ++-- arch/alpha/kernel/sys_dp264.c | 52 +++++----- arch/alpha/kernel/sys_eb64p.c | 18 ++-- arch/alpha/kernel/sys_eiger.c | 14 ++- arch/alpha/kernel/sys_jensen.c | 24 ++-- arch/alpha/kernel/sys_marvel.c | 42 ++++---- arch/alpha/kernel/sys_mikasa.c | 16 ++-- arch/alpha/kernel/sys_noritake.c | 16 ++-- arch/alpha/kernel/sys_rawhide.c | 17 ++-- arch/alpha/kernel/sys_rx164.c | 16 ++-- arch/alpha/kernel/sys_sable.c | 20 ++-- arch/alpha/kernel/sys_takara.c | 14 ++- arch/alpha/kernel/sys_titan.c | 22 +++-- arch/alpha/kernel/sys_wildfire.c | 32 ++++--- arch/arm/common/Kconfig | 2 + arch/arm/include/asm/mach/arch.h | 4 - arch/arm/include/asm/pgalloc.h | 2 + arch/arm/kernel/hw_breakpoint.c | 26 ++++- arch/arm/kernel/ptrace.c | 6 +- arch/arm/mach-davinci/cpufreq.c | 2 +- arch/arm/mach-davinci/devices-da8xx.c | 7 ++ arch/arm/mach-davinci/gpio-tnetv107x.c | 18 ++-- arch/arm/mach-davinci/include/mach/clkdev.h | 2 + arch/arm/mach-omap2/clkt_dpll.c | 2 +- arch/arm/mach-omap2/mailbox.c | 12 ++- arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/pm-debug.c | 8 +- arch/arm/mach-omap2/prcm_mpu44xx.h | 4 +- arch/arm/mach-omap2/smartreflex.c | 37 +++---- arch/arm/mach-omap2/timer-gp.c | 13 +++ arch/arm/mach-pxa/pxa25x.c | 1 + arch/arm/mach-pxa/tosa-bt.c | 2 - arch/arm/mach-pxa/tosa.c | 6 + arch/arm/mach-s3c2440/Kconfig | 1 + arch/arm/mach-s3c2440/include/mach/gta02.h | 26 +++--- arch/arm/mach-s3c64xx/clock.c | 6 + arch/arm/mach-s3c64xx/dma.c | 11 +- arch/arm/mach-s3c64xx/gpiolib.c | 4 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 13 ++- arch/arm/mach-s3c64xx/setup-keypad.c | 2 +- arch/arm/mach-s3c64xx/setup-sdhci.c | 2 +- arch/arm/mach-s5p64x0/include/mach/gpio.h | 4 +- arch/arm/mach-shmobile/board-ag5evm.c | 1 + arch/arm/mach-shmobile/board-ap4evb.c | 2 +- arch/arm/mach-shmobile/board-mackerel.c | 2 +- arch/arm/mach-shmobile/clock-sh73a0.c | 17 +++- .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 10 +- .../mach-shmobile/include/mach/head-mackerel.txt | 10 +- arch/arm/plat-omap/mailbox.c | 11 ++- arch/arm/plat-samsung/dev-uart.c | 2 + arch/blackfin/lib/outs.S | 16 ++- arch/blackfin/mach-common/cache.S | 2 + arch/powerpc/include/asm/lppaca.h | 16 +++ arch/powerpc/include/asm/machdep.h | 6 + arch/powerpc/kernel/machine_kexec.c | 5 +- arch/powerpc/kernel/paca.c | 14 --- arch/powerpc/kernel/process.c | 8 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/tlb_hash64.c | 6 +- arch/powerpc/platforms/iseries/dt.c | 6 +- arch/powerpc/platforms/iseries/setup.c | 1 + arch/sh/include/asm/sections.h | 2 +- arch/sh/kernel/cpu/sh4/setup-sh7750.c | 13 ++- arch/sh/lib/delay.c | 10 ++ arch/sh/mm/cache.c | 3 +- arch/x86/boot/compressed/mkpiggy.c | 7 +- arch/x86/include/asm/msr-index.h | 5 + arch/x86/include/asm/smpboot_hooks.h | 2 +- arch/x86/include/asm/uv/uv_bau.h | 2 +- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +- arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 2 +- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++- arch/x86/mm/numa_64.c | 6 +- arch/x86/platform/olpc/olpc_dt.c | 3 +- arch/x86/platform/uv/tlb_uv.c | 4 +- block/blk-core.c | 18 +-- block/blk-flush.c | 8 +- block/blk-lib.c | 21 ++--- block/blk-throttle.c | 29 +++-- block/cfq-iosched.c | 6 +- block/elevator.c | 4 +- drivers/acpi/acpica/aclocal.h | 7 +- drivers/acpi/acpica/evgpe.c | 17 +++- drivers/acpi/acpica/evxfgpe.c | 42 ++++++-- drivers/acpi/debugfs.c | 20 +++- drivers/block/loop.c | 5 - drivers/char/ipmi/ipmi_si_intf.c | 8 ++ drivers/char/tpm/tpm.c | 10 +- drivers/char/virtio_console.c | 8 ++ drivers/cpufreq/cpufreq.c | 27 +++-- drivers/gpu/drm/drm_fb_helper.c | 4 +- drivers/gpu/drm/drm_irq.c | 3 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_dma.c | 11 ++ drivers/gpu/drm/i915/i915_drv.c | 17 +++- drivers/gpu/drm/i915/i915_drv.h | 24 ++++- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 37 +++---- drivers/gpu/drm/i915/i915_reg.h | 12 ++ drivers/gpu/drm/i915/intel_display.c | 8 +- drivers/gpu/drm/i915/intel_panel.c | 36 ++++++ drivers/gpu/drm/i915/intel_ringbuffer.h | 13 ++- drivers/gpu/drm/nouveau/nouveau_bo.c | 5 +- drivers/gpu/drm/nouveau/nouveau_dma.c | 3 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 6 +- drivers/gpu/drm/nouveau/nouveau_mm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_notifier.c | 11 ++- drivers/gpu/drm/nouveau/nv50_instmem.c | 8 ++ drivers/gpu/drm/nouveau/nv50_vm.c | 4 + drivers/hwmon/ad7414.c | 1 + drivers/hwmon/adt7411.c | 1 + drivers/i2c/busses/i2c-eg20t.c | 1 + drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/i2c/busses/i2c-omap.c | 4 +- drivers/idle/intel_idle.c | 24 ++++ drivers/isdn/hardware/eicon/istream.c | 2 +- drivers/media/common/tuners/tda8290.c | 14 ++-- drivers/media/dvb/dvb-usb/dib0700_devices.c | 21 ++++- drivers/media/dvb/dvb-usb/lmedm04.c | 6 +- drivers/media/dvb/frontends/dib7000m.c | 19 ++++ drivers/media/dvb/frontends/dib7000m.h | 15 +++ drivers/media/dvb/mantis/mantis_pci.c | 1 - drivers/media/rc/ir-raw.c | 3 +- drivers/media/rc/mceusb.c | 27 +++-- drivers/media/rc/nuvoton-cir.c | 5 +- drivers/media/rc/nuvoton-cir.h | 7 +- drivers/media/rc/rc-main.c | 2 +- drivers/media/video/au0828/au0828-video.c | 28 ++++- drivers/media/video/cx18/cx18-cards.c | 50 +++++++++- drivers/media/video/cx18/cx18-driver.c | 25 ++++- drivers/media/video/cx18/cx18-driver.h | 3 +- drivers/media/video/cx18/cx18-dvb.c | 38 +++++++ drivers/media/video/cx23885/cx23885-i2c.c | 10 -- drivers/media/video/cx25840/cx25840-core.c | 3 +- drivers/media/video/ivtv/ivtv-irq.c | 58 +++++++++-- drivers/media/video/mem2mem_testdev.c | 1 - drivers/media/video/s2255drv.c | 10 +- drivers/mfd/asic3.c | 4 +- drivers/mfd/davinci_voicecodec.c | 4 +- drivers/mfd/tps6586x.c | 10 +- drivers/mfd/ucb1x00-ts.c | 12 ++- drivers/mfd/wm8994-core.c | 18 +++ drivers/misc/bmp085.c | 1 + drivers/mmc/core/core.c | 2 +- drivers/mmc/core/sdio.c | 3 +- drivers/net/bnx2x/bnx2x.h | 28 +++-- drivers/net/bnx2x/bnx2x_cmn.c | 65 +++++++++--- drivers/net/bnx2x/bnx2x_cmn.h | 20 ++++ drivers/net/bnx2x/bnx2x_ethtool.c | 25 ++--- drivers/net/bnx2x/bnx2x_init.h | 2 +- drivers/net/bnx2x/bnx2x_main.c | 18 +++- drivers/net/bnx2x/bnx2x_stats.c | 4 +- drivers/net/can/softing/softing_main.c | 1 + drivers/net/cnic.c | 33 +++++-- drivers/net/davinci_emac.c | 2 +- drivers/net/dnet.c | 3 +- drivers/net/e1000/e1000_osdep.h | 3 +- drivers/net/e1000e/netdev.c | 3 +- drivers/net/fec.c | 3 +- drivers/net/igbvf/vf.c | 2 +- drivers/net/macb.c | 2 +- drivers/net/pcmcia/fmvj18x_cs.c | 1 + drivers/net/r8169.c | 6 + drivers/net/skge.c | 3 - drivers/net/wireless/ath/ath9k/hif_usb.c | 9 +- drivers/net/wireless/ath/ath9k/mac.c | 5 +- drivers/net/wireless/ath/carl9170/usb.c | 2 + drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +- drivers/net/wireless/p54/p54usb.c | 1 + drivers/net/wireless/rndis_wlan.c | 3 + drivers/of/pdt.c | 112 ++++++++------------ drivers/pcmcia/pxa2xx_colibri.c | 3 + drivers/pps/generators/Kconfig | 2 +- drivers/rtc/rtc-s3c.c | 12 ++- drivers/s390/block/xpram.c | 4 +- drivers/s390/char/keyboard.c | 3 +- drivers/s390/char/tape.h | 8 ++ drivers/s390/char/tape_34xx.c | 59 +++++++--- drivers/s390/char/tape_3590.c | 83 ++++++++++++--- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_transport_fc.c | 2 +- drivers/thermal/Kconfig | 1 - drivers/thermal/thermal_sys.c | 40 ++++---- drivers/tty/serial/serial_cs.c | 1 + drivers/usb/gadget/f_phonet.c | 15 ++- drivers/usb/host/ehci-xilinx-of.c | 1 + drivers/video/backlight/ltv350qv.c | 9 ++- drivers/watchdog/sbc_fitpc2_wdt.c | 7 +- fs/block_dev.c | 1 + fs/ceph/dir.c | 30 +----- fs/ceph/inode.c | 2 +- fs/ceph/super.h | 1 - fs/dcache.c | 26 ++++- fs/exofs/namei.c | 8 +- fs/ext2/namei.c | 9 +-- fs/fat/namei_vfat.c | 4 +- fs/fuse/dir.c | 9 +- fs/fuse/file.c | 52 ++++++++-- fs/fuse/fuse_i.h | 6 +- fs/gfs2/dentry.c | 2 +- fs/hfs/dir.c | 50 +++------- fs/jfs/namei.c | 2 +- fs/minix/namei.c | 8 +- fs/namei.c | 14 ++- fs/nfs/nfs4proc.c | 44 ++++++++- fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4state.c | 13 ++- fs/nfsd/nfs4xdr.c | 4 +- fs/nilfs2/namei.c | 8 +-- fs/nilfs2/segment.c | 3 +- fs/ocfs2/dcache.c | 2 +- fs/ocfs2/journal.h | 6 +- fs/ocfs2/refcounttree.c | 7 +- fs/ocfs2/super.c | 28 ++++-- fs/open.c | 8 ++ fs/proc/base.c | 30 ----- fs/proc/inode.c | 8 +- fs/proc/proc_devtree.c | 2 +- fs/proc/proc_sysctl.c | 7 +- fs/reiserfs/namei.c | 2 +- fs/reiserfs/xattr.c | 2 - fs/sysv/namei.c | 8 +- fs/udf/namei.c | 11 +- fs/ufs/namei.c | 9 +-- fs/xfs/linux-2.6/xfs_ioctl.c | 11 ++- include/asm-generic/pgtable.h | 2 + include/drm/drmP.h | 2 +- include/keys/rxrpc-type.h | 1 - include/linux/blkdev.h | 5 +- include/linux/blktrace_api.h | 1 - include/linux/ceph/messenger.h | 2 +- include/linux/gfp.h | 11 ++- include/linux/mfd/wm8994/core.h | 1 + include/linux/netdevice.h | 3 + include/linux/ptrace.h | 3 - include/linux/sysctl.h | 14 ++- include/linux/thermal.h | 8 ++ include/trace/events/block.h | 6 +- kernel/cpuset.c | 7 +- kernel/ptrace.c | 6 +- kernel/sched_rt.c | 14 ++- kernel/sysctl.c | 15 ++- kernel/time/tick-broadcast.c | 10 ++ kernel/time/tick-common.c | 6 +- kernel/time/tick-internal.h | 3 + kernel/trace/blktrace.c | 16 --- lib/nlattr.c | 2 +- mm/huge_memory.c | 28 ++++-- mm/mempolicy.c | 14 ++-- net/ceph/messenger.c | 71 ++++++++++--- net/ceph/pagevec.c | 18 +++- net/core/dev.c | 12 ++- net/core/dev_addr_lists.c | 2 +- net/dcb/dcbnl.c | 2 +- net/dccp/input.c | 7 +- net/dns_resolver/dns_key.c | 20 +++- net/ipv4/ip_gre.c | 2 +- net/ipv4/ipip.c | 2 +- net/ipv6/route.c | 17 ++-- net/ipv6/sit.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 +- net/netfilter/nf_log.c | 4 + net/netlink/af_netlink.c | 18 +++- net/rxrpc/ar-input.c | 1 + sound/core/jack.c | 1 + sound/pci/hda/patch_cirrus.c | 2 + sound/pci/hda/patch_conexant.c | 5 + sound/pci/hda/patch_hdmi.c | 5 + sound/pci/hda/patch_realtek.c | 9 +- sound/pci/hda/patch_sigmatel.c | 15 ++- sound/pci/hda/patch_via.c | 2 +- sound/soc/codecs/wm8903.h | 2 +- sound/soc/codecs/wm8994.c | 56 ++++++++-- sound/soc/codecs/wm9081.c | 5 + sound/soc/codecs/wm_hubs.c | 3 + sound/soc/imx/eukrea-tlv320.c | 2 +- sound/soc/pxa/e740_wm9705.c | 4 +- sound/soc/pxa/e750_wm9705.c | 4 +- sound/soc/pxa/e800_wm9712.c | 4 +- sound/soc/pxa/em-x270.c | 4 +- sound/soc/pxa/mioa701_wm9713.c | 4 +- sound/soc/pxa/palm27x.c | 4 +- sound/soc/pxa/tosa.c | 4 +- sound/soc/pxa/zylonite.c | 4 +- sound/usb/card.c | 4 + sound/usb/pcm.c | 7 +- sound/usb/usbaudio.h | 1 + tools/perf/builtin-timechart.c | 6 +- tools/perf/util/header.c | 11 ++- tools/perf/util/hist.c | 7 +- tools/perf/util/svghelper.c | 6 +- tools/perf/util/symbol.c | 2 +- 306 files changed, 2196 insertions(+), 1187 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging block/blk-core.c Auto-merging block/blk-lib.c Auto-merging drivers/scsi/scsi_lib.c Merge made by recursive. .../ABI/testing/sysfs-bus-pci-devices-cciss | 12 + Documentation/block/biodoc.txt | 5 - Documentation/cgroups/blkio-controller.txt | 30 +- block/blk-cgroup.h | 2 +- block/blk-core.c | 646 ++++++++++------- block/blk-exec.c | 4 +- block/blk-flush.c | 439 ++++++++---- block/blk-lib.c | 2 - block/blk-settings.c | 15 - block/blk-sysfs.c | 2 - block/blk-throttle.c | 114 ++-- block/blk.h | 14 +- block/cfq-iosched.c | 98 +-- block/deadline-iosched.c | 9 - block/elevator.c | 56 +-- block/genhd.c | 18 +- block/noop-iosched.c | 8 - drivers/block/DAC960.c | 8 +- drivers/block/amiflop.c | 9 +- drivers/block/ataflop.c | 14 +- drivers/block/cciss.c | 92 ++- drivers/block/cciss_cmd.h | 1 + drivers/block/cciss_scsi.c | 13 +- drivers/block/cpqarray.c | 3 - drivers/block/drbd/drbd_actlog.c | 339 +++------- drivers/block/drbd/drbd_bitmap.c | 750 +++++++++++++------- drivers/block/drbd/drbd_int.h | 286 +++++---- drivers/block/drbd/drbd_main.c | 709 ++++++++++++------- drivers/block/drbd/drbd_nl.c | 183 ++++-- drivers/block/drbd/drbd_proc.c | 114 +++- drivers/block/drbd/drbd_receiver.c | 635 ++++++++++------- drivers/block/drbd/drbd_req.c | 173 ++++-- drivers/block/drbd/drbd_req.h | 36 +- drivers/block/drbd/drbd_strings.c | 6 +- drivers/block/drbd/drbd_worker.c | 361 +++++----- drivers/block/drbd/drbd_wrappers.h | 20 +- drivers/block/floppy.c | 11 +- drivers/block/loop.c | 16 - drivers/block/paride/pcd.c | 18 +- drivers/block/paride/pd.c | 7 +- drivers/block/paride/pf.c | 10 +- drivers/block/pktcdvd.c | 15 +- drivers/block/swim.c | 8 +- drivers/block/swim3.c | 11 +- drivers/block/ub.c | 10 +- drivers/block/umem.c | 26 +- drivers/block/xsysace.c | 9 +- drivers/cdrom/gdrom.c | 16 +- drivers/cdrom/viocd.c | 17 +- drivers/ide/ide-atapi.c | 3 +- drivers/ide/ide-cd.c | 23 +- drivers/ide/ide-cd.h | 3 +- drivers/ide/ide-cd_ioctl.c | 8 +- drivers/ide/ide-gd.c | 14 +- drivers/ide/ide-io.c | 4 - drivers/ide/ide-park.c | 2 +- drivers/md/bitmap.c | 5 +- drivers/md/dm-crypt.c | 9 +- drivers/md/dm-io.c | 2 +- drivers/md/dm-kcopyd.c | 55 +-- drivers/md/dm-raid.c | 2 +- drivers/md/dm-raid1.c | 2 - drivers/md/dm-table.c | 24 - drivers/md/dm.c | 33 +- drivers/md/linear.c | 17 - drivers/md/md.c | 12 +- drivers/md/multipath.c | 31 - drivers/md/raid0.c | 16 - drivers/md/raid1.c | 86 +-- drivers/md/raid10.c | 90 +-- drivers/md/raid5.c | 63 +-- drivers/md/raid5.h | 2 +- drivers/message/i2o/i2o_block.c | 17 +- drivers/mmc/card/queue.c | 3 +- drivers/s390/block/dasd.c | 2 +- drivers/s390/char/tape_block.c | 12 +- drivers/scsi/scsi_lib.c | 44 +- drivers/scsi/scsi_transport_fc.c | 2 +- drivers/scsi/scsi_transport_sas.c | 6 +- drivers/staging/hv/blkvsc_drv.c | 11 +- .../westbridge/astoria/block/cyasblkdev_block.c | 11 +- drivers/target/target_core_iblock.c | 7 +- fs/adfs/inode.c | 1 - fs/affs/file.c | 2 - fs/aio.c | 77 +-- fs/befs/linuxvfs.c | 1 - fs/bfs/file.c | 1 - fs/bio.c | 4 +- fs/block_dev.c | 25 +- fs/btrfs/disk-io.c | 79 -- fs/btrfs/extent_io.c | 2 +- fs/btrfs/inode.c | 1 - fs/btrfs/volumes.c | 91 +--- fs/buffer.c | 45 +- fs/cifs/file.c | 30 - fs/direct-io.c | 7 +- fs/efs/inode.c | 1 - fs/exofs/inode.c | 1 - fs/ext2/inode.c | 2 - fs/ext3/inode.c | 3 - fs/ext4/inode.c | 4 - fs/ext4/page-io.c | 3 +- fs/fat/inode.c | 1 - fs/freevxfs/vxfs_subr.c | 1 - fs/fuse/inode.c | 1 - fs/gfs2/aops.c | 3 - fs/gfs2/log.c | 4 +- fs/gfs2/lops.c | 12 +- fs/gfs2/meta_io.c | 3 +- fs/hfs/inode.c | 2 - fs/hfsplus/inode.c | 2 - fs/hpfs/file.c | 1 - fs/isofs/inode.c | 1 - fs/jbd/commit.c | 2 +- fs/jbd2/commit.c | 6 +- fs/jfs/inode.c | 1 - fs/jfs/jfs_metapage.c | 1 - fs/logfs/dev_bdev.c | 2 - fs/minix/inode.c | 1 - fs/mpage.c | 8 + fs/nilfs2/btnode.c | 7 +- fs/nilfs2/gcinode.c | 1 - fs/nilfs2/inode.c | 1 - fs/nilfs2/mdt.c | 9 +- fs/nilfs2/page.c | 5 +- fs/nilfs2/page.h | 3 +- fs/nilfs2/segbuf.c | 2 +- fs/ntfs/aops.c | 4 - fs/ntfs/compress.c | 3 +- fs/ocfs2/aops.c | 1 - fs/ocfs2/cluster/heartbeat.c | 4 - fs/omfs/file.c | 1 - fs/qnx4/inode.c | 1 - fs/reiserfs/inode.c | 1 - fs/sysv/itree.c | 1 - fs/ubifs/super.c | 1 - fs/udf/file.c | 1 - fs/udf/inode.c | 1 - fs/ufs/inode.c | 1 - fs/ufs/truncate.c | 2 +- fs/xfs/linux-2.6/xfs_aops.c | 4 +- fs/xfs/linux-2.6/xfs_buf.c | 13 +- include/linux/backing-dev.h | 16 - include/linux/bio.h | 1 - include/linux/blk_types.h | 6 +- include/linux/blkdev.h | 101 ++- include/linux/buffer_head.h | 1 - include/linux/device-mapper.h | 5 - include/linux/drbd.h | 23 +- include/linux/drbd_limits.h | 12 +- include/linux/drbd_nl.h | 13 +- include/linux/drbd_tag_magic.h | 1 + include/linux/elevator.h | 9 +- include/linux/fs.h | 29 +- include/linux/pagemap.h | 12 - include/linux/sched.h | 6 + include/linux/swap.h | 2 - kernel/exit.c | 1 + kernel/fork.c | 3 + kernel/power/block_io.c | 2 +- kernel/sched.c | 12 + kernel/trace/blktrace.c | 15 +- mm/backing-dev.c | 6 - mm/filemap.c | 74 +-- mm/memory-failure.c | 8 +- mm/nommu.c | 4 - mm/page-writeback.c | 2 +- mm/page_io.c | 2 +- mm/readahead.c | 18 +- mm/shmem.c | 1 - mm/swap_state.c | 5 +- mm/swapfile.c | 37 - mm/vmscan.c | 2 +- 173 files changed, 3527 insertions(+), 3422 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Auto-merging drivers/ata/libata-eh.c Merge made by recursive. drivers/ata/libata-eh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ## # gitfetch /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## ## # merge libata-upstream resolve /pub/linux/kernel/people/jejb/libata-conflict.git ## RESOLVE PATCH: /pub/linux/kernel/people/jejb/libata-conflict.git Auto-merging drivers/ata/libata-core.c Auto-merging drivers/scsi/ipr.c Auto-merging drivers/scsi/libsas/sas_ata.c CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c Auto-merging drivers/scsi/libsas/sas_scsi_host.c CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c Auto-merging include/linux/libata.h Automatic merge failed; fix conflicts and then commit the result. [2.6.38-rc2-stor53 c8fcd32] Resolve Patch: /pub/linux/kernel/people/jejb/libata-conflict.git Committer: James Bottomley Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author ## # quilt /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES ## sending incremental file list ./ base dm-add-flakey-target.patch dm-add-ioband.patch dm-bufio.patch dm-crypt-wipe-keys-string-immediately-after-key-is-set.patch dm-delay-unplug-queue.patch dm-emulate-BLKRRPART-ioctl.patch dm-export-dm_disk.patch dm-fix-opening-log-and-cow-devices-for-read-only-tables.patch dm-ioctl-add-flag-to-wipe-buffers-for-secure-data.patch dm-ioctl-prepare-for-crypt-key-wiping.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-allow-table-load-with-no-priority-groups.patch dm-mpath-fail-message-ioctl-if-specified-path-is-not-valid.patch dm-mpath-improve-err-mesgs.patch dm-mpath-pg_timeout.patch dm-mpath-refactor-pg_init-trigger.patch dm-multisnap-common.patch dm-multisnap-daniel.patch dm-multisnap-mikulas-alloc.patch dm-multisnap-mikulas-blocks.patch dm-multisnap-mikulas-btree.patch dm-multisnap-mikulas-commit.patch dm-multisnap-mikulas-common.patch dm-multisnap-mikulas-config.patch dm-multisnap-mikulas-delete.patch dm-multisnap-mikulas-freelist.patch dm-multisnap-mikulas-headers.patch dm-multisnap-mikulas-io.patch dm-multisnap-mikulas-snaps.patch dm-raid1-clear-region_hash-on-suspend.patch dm-raid1-increase-dm-io-pages.patch dm-raid1-mempool-bug-workaround-reversion.patch dm-raid1-read-balancing.patch dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.patch dm-raid45-to-be-split.patch dm-region_hash-change-primes.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-release-memory-if-invalid.patch dm-table-extend-device-name-lookups.patch dm-table-limit-max_segments-when-no-merge_bvec-fn.patch dm-throttle.patch dm-tidy-io-initialisation-functions.patch dm-userspace.patch end git-update1.patch git-update2.patch mm next series series.html uml-fixes.patch v6-1-4-dm-replicator-documentation-and-module-registry.patch v6-2-4-dm-replicator-replication-log-and-site-link-handler-interfaces-and-main-replicator-module.patch v6-3-4-dm-replicator-ringbuffer-replication-log-handler.patch v6-4-4-dm-replicator-blockdev-site-link-handler.patch sent 1838084 bytes received 1174 bytes 1226172.00 bytes/sec total size is 1832167 speedup is 1.00 Using base v2.6.38-rc4-213-g055d219 dm-fix-opening-log-and-cow-devices-for-read-only-tables.patch dm-add-flakey-target.patch dm-crypt-wipe-keys-string-immediately-after-key-is-set.patch dm-ioctl-prepare-for-crypt-key-wiping.patch dm-ioctl-add-flag-to-wipe-buffers-for-secure-data.patch dm-mpath-fail-message-ioctl-if-specified-path-is-not-valid.patch dm-mpath-allow-table-load-with-no-priority-groups.patch ## # gitrebase /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git master scsi-post-merge merge-base ## First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge to 2.6.38-rc2-stor53. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.38-rc2-stor53 444b02d] 2.6.38-rc2-stor53 Committer: James Bottomley Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/storage-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/storage-tree/log- ##