From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 a5bbef0..0cc9d52 master -> origin/master Checking out files: 6% (55/864) Checking out files: 7% (61/864) Checking out files: 8% (70/864) Checking out files: 9% (78/864) Checking out files: 10% (87/864) Checking out files: 11% (96## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## 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/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 Removing drivers/staging/vme/bridges/Module.symvers Removing drivers/target/target_core_mib.c Removing drivers/target/target_core_mib.h 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. .mailmap | 1 + Documentation/ABI/testing/sysfs-platform-at91 | 25 + Documentation/feature-removal-schedule.txt | 16 + Documentation/filesystems/ntfs.txt | 2 + Documentation/kernel-parameters.txt | 4 +- Documentation/networking/bonding.txt | 83 ++- Documentation/networking/ip-sysctl.txt | 2 +- Documentation/scheduler/sched-stats.txt | 33 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + MAINTAINERS | 46 +- Makefile | 2 +- arch/arm/include/asm/hardware/sp810.h | 6 + arch/arm/include/asm/io.h | 33 +- arch/arm/include/asm/memory.h | 2 +- arch/arm/kernel/head.S | 22 +- arch/arm/kernel/smp_twd.c | 7 +- arch/arm/mach-ep93xx/core.c | 2 +- arch/arm/mach-ep93xx/gpio.c | 7 + .../arm/mach-footbridge/include/mach/debug-macro.S | 4 +- arch/arm/mach-imx/mach-mx25_3ds.c | 2 +- arch/arm/mach-ixp4xx/common.c | 4 +- arch/arm/mach-ixp4xx/include/mach/timex.h | 5 +- arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 9 +- arch/arm/mach-mxs/clock-mx23.c | 4 +- arch/arm/mach-mxs/clock-mx28.c | 7 +- arch/arm/mach-mxs/clock.c | 2 - arch/arm/mach-mxs/gpio.c | 2 + arch/arm/mach-mxs/include/mach/clock.h | 2 - arch/arm/mach-omap1/Kconfig | 2 + arch/arm/mach-omap1/Makefile | 3 +- arch/arm/mach-omap1/include/mach/entry-macro.S | 13 - arch/arm/mach-omap1/irq.c | 2 +- arch/arm/mach-omap1/lcd_dma.c | 24 +- arch/arm/mach-omap1/time.c | 100 ++- arch/arm/mach-omap1/timer32k.c | 13 +- arch/arm/mach-omap2/board-cm-t3517.c | 29 +- arch/arm/mach-omap2/board-devkit8000.c | 30 +- arch/arm/mach-omap2/board-omap4panda.c | 2 - arch/arm/mach-omap2/board-rm680.c | 3 - arch/arm/mach-omap2/clock44xx_data.c | 1 - arch/arm/mach-omap2/clockdomain.c | 30 +- arch/arm/mach-omap2/clockdomains44xx_data.c | 2 - arch/arm/mach-omap2/dma.c | 2 +- arch/arm/mach-omap2/include/mach/entry-macro.S | 14 - arch/arm/mach-omap2/io.c | 6 +- arch/arm/mach-omap2/mux.c | 3 +- arch/arm/mach-omap2/pm24xx.c | 4 +- arch/arm/mach-omap2/pm34xx.c | 11 +- arch/arm/mach-omap2/powerdomain2xxx_3xxx.c From . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Died at /pub/linux/kernel/people/jejb/build.pl line 103. ig | 49 +- arch/arm/mach-realview/platsmp.c | 2 +- arch/arm/mach-s5pv310/Kconfig | 1 + arch/arm/mach-s5pv310/include/mach/map.h | 2 - arch/arm/mach-s5pv310/include/mach/sysmmu.h | 5 +- arch/arm/mach-shmobile/Kconfig | 2 + arch/arm/mach-shmobile/board-ag5evm.c | 180 ++++- arch/arm/mach-shmobile/board-g3evm.c | 1 - arch/arm/mach-shmobile/board-mackerel.c | 5 +- arch/arm/mach-shmobile/clock-sh7372.c | 4 +- arch/arm/mach-shmobile/clock-sh73a0.c | 29 +- arch/arm/mach-shmobile/intc-sh7372.c | 11 +- arch/arm/mach-shmobile/intc-sh73a0.c | 5 +- arch/arm/mach-tegra/gpio.c | 4 +- arch/arm/mach-tegra/include/mach/clk.h | 2 + arch/arm/mach-tegra/include/mach/clkdev.h | 2 + arch/arm/mach-tegra/include/mach/kbc.h | 61 ++ arch/arm/mach-tegra/irq.c | 18 +- arch/arm/mach-versatile/Kconfig | 10 +- arch/arm/mach-vexpress/platsmp.c | 2 +- arch/arm/mach-vexpress/v2m.c | 9 + arch/arm/mm/init.c | 6 + arch/arm/plat-mxc/include/mach/uncompress.h | 2 + arch/arm/plat-omap/Kconfig | 8 +- arch/arm/plat-omap/counter_32k.c | 22 +- arch/arm/plat-omap/dma.c | 7 +- arch/arm/plat-omap/include/plat/common.h | 3 + arch/arm/plat-s5p/Kconfig | 24 +- arch/arm/plat-s5p/Makefile | 2 +- arch/arm/plat-s5p/include/plat/sysmmu.h | 23 - arch/arm/plat-s5p/sysmmu.c | 4 +- arch/arm/plat-samsung/include/plat/pm.h | 2 + arch/arm/tools/mach-types | 105 ++- arch/avr32/include/asm/pgalloc.h | 1 + arch/blackfin/include/asm/bfin_serial.h | 2 + arch/m32r/kernel/irq.c | 2 +- arch/m68k/amiga/config.c | 16 +- arch/m68k/atari/ataints.c | 4 +- arch/m68k/atari/config.c | 2 +- arch/m68k/atari/debug.c | 14 +- arch/m68k/include/asm/atarihw.h | 2 +- arch/m68k/include/asm/string.h | 12 - arch/microblaze/include/asm/irqflags.h | 2 +- arch/microblaze/include/asm/pgtable.h | 27 +- arch/microblaze/kernel/cpu/pvr.c | 4 +- arch/microblaze/kernel/head.S | 29 +- arch/microblaze/kernel/hw_exception_handler.S | 4 - arch/microblaze/kernel/setup.c | 4 +- arch/microblaze/lib/fastcopy.S | 4 + arch/parisc/kernel/pdc_cons.c | 4 +- arch/powerpc/include/asm/mmu-book3e.h | 8 +- arch/powerpc/include/asm/page.h | 2 +- arch/powerpc/kernel/cpu_setup_6xx.S | 40 +- arch/powerpc/kernel/cputable.c | 4 +- arch/powerpc/kernel/perf_event_fsl_emb.c | 1 + arch/powerpc/mm/numa.c | 55 +- arch/powerpc/platforms/pseries/lpar.c | 37 + arch/s390/Kconfig | 2 +- arch/s390/include/asm/cacheflush.h | 23 +- arch/s390/include/asm/tlb.h | 1 + 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/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/smp.h | 5 +- arch/x86/include/asm/system_64.h | 22 - arch/x86/kernel/acpi/sleep.c | 15 +- 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 | 12 +- arch/x86/kernel/dumpstack_64.c | 2 +- arch/x86/kernel/head_32.S | 30 +- arch/x86/kernel/process.c | 3 +- arch/x86/kernel/smpboot.c | 7 +- arch/x86/kvm/svm.c | 2 +- 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 +- 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/base/power/runtime.c | 9 +- drivers/block/Makefile | 2 +- drivers/block/aoe/Makefile | 2 +- drivers/block/cciss.c | 2 +- drivers/block/loop.c | 3 + drivers/block/nbd.c | 3 - drivers/bluetooth/ath3k.c | 75 +- 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/intel-agp.c | 27 +- drivers/char/agp/intel-gtt.c | 19 +- drivers/char/bfin_jtag_comm.c | 8 +- drivers/char/ipmi/ipmi_si_intf.c | 12 +- drivers/char/tpm/tpm.c | 18 +- drivers/char/tpm/tpm.h | 2 + drivers/char/tpm/tpm_tis.c | 4 +- drivers/{tty/hvc => char}/virtio_console.c | 20 +- drivers/clocksource/acpi_pm.c | 6 +- drivers/clocksource/tcb_clksrc.c | 4 +- drivers/edac/amd64_edac.c | 28 +- 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_irq.c | 7 +- drivers/gpu/drm/i915/i915_dma.c | 35 +- drivers/gpu/drm/i915/i915_drv.c | 15 +- drivers/gpu/drm/i915/i915_drv.h | 5 +- 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_irq.c | 45 +- drivers/gpu/drm/i915/i915_reg.h | 6 + drivers/gpu/drm/i915/intel_crt.c | 10 + drivers/gpu/drm/i915/intel_display.c | 42 +- drivers/gpu/drm/i915/intel_opregion.c | 3 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 83 ++- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 + drivers/gpu/drm/i915/intel_sdvo.c | 46 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 15 + drivers/gpu/drm/nouveau/nouveau_drv.c | 8 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 - drivers/gpu/drm/nouveau/nouveau_pm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- 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 | 57 +- drivers/gpu/drm/radeon/atombios_dp.c | 4 +- drivers/gpu/drm/radeon/evergreen.c | 44 +- drivers/gpu/drm/radeon/evergreen_blit_kms.c | 43 +- drivers/gpu/drm/radeon/evergreend.h | 2 + drivers/gpu/drm/radeon/r100.c | 12 +- drivers/gpu/drm/radeon/r300.c | 7 +- drivers/gpu/drm/radeon/r420.c | 2 +- drivers/gpu/drm/radeon/r520.c | 4 +- drivers/gpu/drm/radeon/r600.c | 11 +- drivers/gpu/drm/radeon/r600_reg.h | 6 +- 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 | 73 +- drivers/gpu/drm/radeon/radeon_combios.c | 11 + drivers/gpu/drm/radeon/radeon_device.c | 10 +- drivers/gpu/drm/radeon/radeon_display.c | 132 +++- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_encoders.c | 8 +- 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 | 23 +- drivers/gpu/drm/radeon/radeon_pm.c | 5 +- drivers/gpu/drm/radeon/radeon_reg.h | 2 + drivers/gpu/drm/radeon/rs400.c | 15 +- drivers/gpu/drm/radeon/rv515.c | 10 +- drivers/gpu/drm/radeon/rv770.c | 19 +- drivers/gpu/stub/Kconfig | 2 + drivers/gpu/vga/vgaarb.c | 2 +- drivers/hwmon/applesmc.c | 1 + drivers/hwmon/asus_atk0110.c | 23 +- drivers/hwmon/emc1403.c | 2 +- drivers/hwmon/lis3lv02d.c | 2 +- drivers/hwmon/lm63.c | 59 +- 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/qib/qib_iba7322.c | 30 +- drivers/input/keyboard/Kconfig | 10 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/gpio_keys.c | 6 +- drivers/input/keyboard/tegra-kbc.c | 727 +++++++++++++ drivers/input/keyboard/tnetv107x-keypad.c | 5 +- drivers/input/misc/ixp4xx-beeper.c | 6 +- drivers/input/mouse/synaptics.c | 32 +- drivers/input/serio/ct82c710.c | 8 +- drivers/input/serio/serport.c | 24 +- drivers/input/sparse-keymap.c | 1 + drivers/input/tablet/wacom_wac.c | 27 +- drivers/input/touchscreen/bu21013_ts.c | 39 +- drivers/input/touchscreen/tnetv107x-ts.c | 5 +- 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/md.c | 47 +- drivers/md/md.h | 2 - drivers/md/raid0.c | 40 + drivers/md/raid10.c | 6 +- drivers/md/raid5.c | 60 +- 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/message/fusion/mptbase.h | 4 +- drivers/message/fusion/mptctl.c | 8 + drivers/message/fusion/mptscsih.c | 7 +- 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/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/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/depca.c | 6 +- drivers/net/dl2k.c | 4 +- drivers/net/e1000/e1000_hw.c | 4 +- drivers/net/e1000/e1000_hw.h | 1 + drivers/net/e1000e/netdev.c | 1 - drivers/net/enc28j60.c | 2 +- drivers/net/ixgbe/ixgbe_common.c | 3 + drivers/net/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ixgbe/ixgbe_main.c | 16 +- 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_main.c | 14 +- drivers/net/pcmcia/axnet_cs.c | 6 +- drivers/net/r8169.c | 41 +- drivers/net/sis900.c | 1 + drivers/net/tg3.c | 95 +-- drivers/net/tg3.h | 3 - drivers/net/usb/cdc_ncm.c | 227 +++-- drivers/net/usb/kaweth.c | 1 + 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/ath9k/ar9002_hw.c | 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- 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 | 7 +- drivers/net/wireless/ath/ath9k/main.c | 29 +- drivers/net/wireless/ath/ath9k/xmit.c | 9 +- drivers/net/wireless/ath/carl9170/rx.c | 2 +- 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/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/parport/share.c | 4 +- drivers/pci/pci-sysfs.c | 3 +- drivers/platform/x86/intel_scu_ipc.c | 8 +- drivers/platform/x86/intel_scu_ipcutil.c | 2 +- drivers/pps/clients/pps-ktimer.c | 2 - drivers/pps/clients/pps_parport.c | 2 +- drivers/pps/generators/pps_gen_parport.c | 2 +- drivers/rtc/Kconfig | 12 - drivers/rtc/class.c | 1 + drivers/rtc/interface.c | 64 +- drivers/rtc/rtc-proc.c | 6 +- drivers/s390/block/dasd_alias.c | 6 + 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/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_tpg.c | 29 +- drivers/target/target_core_transport.c | 48 +- drivers/tty/hvc/Makefile | 1 - drivers/tty/n_gsm.c | 1 + drivers/tty/n_hdlc.c | 90 +- 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/sb1250-duart.c | 2 +- drivers/tty/sysrq.c | 2 +- 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 | 26 + 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-ring.c | 91 +- drivers/usb/host/xhci.c | 60 +- drivers/usb/host/xhci.h | 16 +- drivers/usb/misc/usbled.c | 2 +- drivers/usb/misc/uss720.c | 1 - drivers/usb/musb/blackfin.c | 1 + drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_core.h | 12 + 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/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/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/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 +- fs/btrfs/acl.c | 6 + fs/btrfs/compression.c | 27 +- fs/btrfs/disk-io.c | 7 + fs/btrfs/export.c | 2 + fs/btrfs/extent-tree.c | 98 ++- fs/btrfs/extent_io.c | 6 +- fs/btrfs/file-item.c | 5 + fs/btrfs/file.c | 20 +- fs/btrfs/free-space-cache.c | 162 ++-- fs/btrfs/inode.c | 35 +- fs/btrfs/ioctl.c | 19 +- fs/btrfs/ordered-data.c | 2 +- fs/btrfs/print-tree.c | 1 + fs/btrfs/relocation.c | 29 +- fs/btrfs/super.c | 9 +- fs/btrfs/transaction.c | 5 + fs/btrfs/tree-log.c | 35 +- fs/btrfs/volumes.c | 19 +- fs/ceph/caps.c | 43 +- fs/ceph/inode.c | 10 +- fs/ceph/mds_client.c | 10 +- fs/ceph/super.c | 2 + 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/readdir.c | 3 - fs/cifs/smbdes.c | 1 - fs/cifs/smbencrypt.c | 92 ++- fs/cifs/transport.c | 69 +- fs/dlm/lowcomms.c | 6 +- fs/eventpoll.c | 16 +- fs/exec.c | 4 +- fs/exofs/inode.c | 2 - fs/fcntl.c | 2 +- fs/file_table.c | 2 +- fs/hfsplus/extents.c | 4 +- fs/hfsplus/part_tbl.c | 4 +- fs/hfsplus/super.c | 106 ++- fs/hfsplus/wrapper.c | 4 +- fs/ioctl.c | 7 + fs/lockd/host.c | 9 +- fs/namei.c | 20 +- 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/nilfs2/super.c | 3 +- fs/ntfs/mft.c | 11 +- fs/open.c | 2 + fs/posix_acl.c | 17 +- 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_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_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/fs.h | 5 +- include/linux/input/bu21013.h | 4 - include/linux/irq.h | 3 +- include/linux/kernel.h | 2 +- include/linux/mmc/sh_mmcif.h | 4 +- include/linux/module.h | 4 +- include/linux/mroute.h | 1 + include/linux/mroute6.h | 1 + include/linux/nfsacl.h | 4 +- include/linux/posix_acl.h | 1 + include/linux/res_counter.h | 20 + include/linux/rtc.h | 4 - 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/net/bluetooth/hci_core.h | 1 + include/net/genetlink.h | 3 +- include/net/netfilter/nf_conntrack_ecache.h | 3 - include/net/sch_generic.h | 8 +- include/net/sock.h | 2 + include/scsi/scsi.h | 1 + include/target/target_core_base.h | 28 +- include/target/target_core_transport.h | 2 + include/trace/ftrace.h | 24 +- init/calibrate.c | 6 +- kernel/capability.c | 2 +- kernel/cred.c | 16 +- kernel/irq/migration.c | 14 +- kernel/module.c | 16 +- kernel/perf_event.c | 56 +- 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/timer.c | 6 +- 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 | 43 +- lib/radix-tree.c | 7 +- lib/rbtree.c | 3 + lib/textsearch.c | 10 +- mm/Kconfig | 2 +- mm/huge_memory.c | 9 +- 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 | 32 +- mm/migrate.c | 9 +- mm/mlock.c | 7 + mm/page_alloc.c | 18 +- mm/pgtable-generic.c | 1 + mm/vmscan.c | 7 +- 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 | 84 +- net/bluetooth/rfcomm/core.c | 3 +- net/bridge/br_fdb.c | 4 +- net/caif/chnl_net.c | 4 +- net/core/dev.c | 35 +- net/core/ethtool.c | 2 +- net/core/rtnetlink.c | 6 +- net/core/skbuff.c | 9 +- net/dcb/dcbnl.c | 13 +- net/econet/af_econet.c | 4 +- net/ipv4/af_inet.c | 16 + net/ipv4/arp.c | 11 +- net/ipv4/inetpeer.c | 2 +- net/ipv4/ipmr.c | 76 ++ net/ipv4/netfilter/arpt_mangle.c | 6 +- net/ipv4/raw.c | 19 + net/ipv4/route.c | 6 + net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 1 - net/ipv6/addrconf.c | 81 +- net/ipv6/ip6mr.c | 75 ++ net/ipv6/raw.c | 19 + net/ipv6/route.c | 19 +- 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/status.c | 7 +- net/mac80211/tx.c | 5 +- net/netfilter/nf_conntrack_core.c | 11 +- net/netfilter/nf_conntrack_ecache.c | 3 + net/netfilter/nf_conntrack_netlink.c | 1 + net/netfilter/xt_iprange.c | 16 +- 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_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/sunrpc/svcsock.c | 4 +- net/x25/x25_facilities.c | 28 +- net/x25/x25_in.c | 14 +- net/x25/x25_link.c | 5 +- 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/drivers/mtpav.c | 3 +- sound/oss/Makefile | 4 +- sound/pci/azt3328.c | 38 +- sound/pci/hda/hda_eld.c | 2 +- sound/pci/hda/patch_conexant.c | 149 ++-- sound/pci/hda/patch_realtek.c | 6 +- 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/wm8994.c | 2 +- sound/soc/codecs/wm8995.c | 2 +- sound/soc/codecs/wm_hubs.c | 15 +- sound/soc/davinci/davinci-evm.c | 2 +- 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 | 3 - sound/soc/soc-dapm.c | 6 +- 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 | 2 +- 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 | 9 +- tools/perf/util/event.c | 5 +- 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 +- 855 files changed, 11432 insertions(+), 6596 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-platform-at91 create mode 100644 arch/arm/mach-tegra/include/mach/kbc.h delete mode 100644 arch/arm/plat-s5p/include/plat/sysmmu.h 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 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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging block/blk-core.c Merge made by recursive. block/blk-core.c | 85 +++++---- block/blk-flush.c | 441 +++++++++++++++++++++++++++++++-------------- block/blk.h | 12 +- block/cfq-iosched.c | 18 +- block/elevator.c | 9 +- include/linux/blk_types.h | 2 + include/linux/blkdev.h | 23 ++- include/linux/elevator.h | 1 + 8 files changed, 393 insertions(+), 198 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merging Documentation/devicetree/booting-without-of.txt Auto-merging MAINTAINERS 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.