From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 27d2d20..df30670 master -> scsi-misc Checking out files: 17% (90/522) Checking out files: 18% (94/522) Checking out files: 19% (100/522) Checking out files: 20% (105/522) Checking out files: 21% (110/522) Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Removing drivers/md/.gitignore Removing drivers/pci/pcie/pme/Makefile Removing drivers/pci/pcie/pme/pcie_pme.h Removing drivers/pci/pcie/pme/pcie_pme_acpi.c Auto-merging drivers/scsi/qla2xxx/qla_attr.c Auto-merging drivers/scsi/qla2xxx/qla_def.h Auto-merging drivers/scsi/qla2xxx/qla_init.c Auto-merging drivers/scsi/qla2xxx/qla_isr.c Auto-merging drivers/scsi/qla2xxx/qla_mbx.c Auto-merging drivers/scsi/qla2xxx/qla_nx.c Auto-merging drivers/scsi/qla2xxx/qla_os.c Auto-merging drivers/scsi/sd.c Merge made by recursive. Documentation/DocBook/device-drivers.tmpl | 1 - Documentation/DocBook/kernel-api.tmpl | 1 - Documentation/DocBook/kernel-locking.tmpl | 6 + Documentation/DocBook/tracepoint.tmpl | 5 + Documentation/block/cfq-iosched.txt | 45 +++ Documentation/cgroups/blkio-controller.txt | 28 ++ Documentation/gpio.txt | 22 +- Documentation/kernel-doc-nano-HOWTO.txt | 5 + Documentation/kernel-parameters.txt | 17 +- Documentation/mutex-design.txt | 3 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + MAINTAINERS | 36 ++- Makefile | 2 +- arch/alpha/include/asm/cache.h | 1 - arch/alpha/kernel/err_marvel.c | 6 +- arch/alpha/kernel/perf_event.c | 18 +- arch/alpha/kernel/proto.h | 3 - arch/alpha/kernel/sys_cabriolet.c | 19 +- arch/alpha/kernel/sys_takara.c | 11 +- arch/arm/Kconfig | 90 ----- arch/arm/boot/Makefile | 8 +- arch/arm/boot/compressed/Makefile | 4 + arch/arm/boot/compressed/head.S | 2 +- arch/arm/common/it8152.c | 8 + arch/arm/include/asm/dma-mapping.h | 8 - arch/arm/include/asm/perf_event.h | 2 +- arch/arm/include/asm/unistd.h | 3 + arch/arm/kernel/calls.S | 3 + arch/arm/kernel/perf_event.c | 12 +- arch/arm/mach-at91/at91sam9g45.c | 15 +- arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- arch/arm/mach-at91/board-sam9261ek.c | 31 +- arch/arm/mach-at91/clock.c | 3 +- arch/arm/mach-ep93xx/clock.c | 2 +- arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- arch/arm/mach-mx25/mach-cpuimx25.c | 4 +- arch/arm/mach-mx3/clock-imx35.c | 77 +++- arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- arch/arm/mach-mx3/mach-cpuimx35.c | 4 +- arch/arm/mach-mx5/clock-mx51.c | 2 +- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 +- arch/arm/mach-pxa/cpufreq-pxa3xx.c | 2 +- arch/arm/mach-pxa/include/mach/mfp-pxa300.h | From . * branch block-for-linus -> FETCH_HEAD From /pub/scm/linux/kernel/git/axboe/linux-2.6-block + 55264af...9f4306d for-next -> block-for-next (forced update) From . * branch block-for-next -> FETCH_HEAD Died at /pub/linux/kernel/people/jejb/build.pl line 103. | 169 ++++++++ arch/arm/mm/Kconfig | 2 +- arch/arm/mm/dma-mapping.c | 2 + arch/arm/plat-mxc/Kconfig | 1 + arch/arm/plat-mxc/include/mach/eukrea-baseboards.h | 4 +- arch/arm/plat-mxc/tzic.c | 5 +- arch/arm/plat-pxa/pwm.c | 2 +- arch/arm/tools/mach-types | 98 +++++- arch/h8300/include/asm/atomic.h | 15 +- arch/h8300/include/asm/system.h | 4 +- arch/h8300/kernel/sys_h8300.c | 4 +- arch/h8300/kernel/traps.c | 2 +- arch/ia64/include/asm/compat.h | 2 +- arch/ia64/kernel/fsys.S | 46 ++- arch/m68k/include/asm/unistd.h | 5 +- arch/m68k/kernel/entry.S | 3 + arch/m68knommu/kernel/syscalltable.S | 3 + arch/m68knommu/kernel/vmlinux.lds.S | 2 + arch/mips/include/asm/compat.h | 2 +- arch/mn10300/kernel/mn10300-serial.c | 22 +- arch/parisc/include/asm/compat.h | 2 +- arch/powerpc/include/asm/compat.h | 2 +- arch/powerpc/include/asm/fsldma.h | 1 + arch/powerpc/kernel/head_64.S | 12 +- arch/powerpc/kernel/misc_32.S | 3 + arch/powerpc/kernel/time.c | 23 +- arch/powerpc/platforms/83xx/mpc837x_mds.c | 9 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 + arch/powerpc/platforms/85xx/p1022_ds.c | 4 +- arch/powerpc/platforms/pseries/dlpar.c | 42 ++- arch/powerpc/sysdev/fsl_pci.c | 2 + arch/powerpc/sysdev/fsl_rio.c | 6 +- arch/powerpc/sysdev/qe_lib/qe.c | 1 + arch/s390/include/asm/compat.h | 2 +- arch/sparc/include/asm/compat.h | 2 +- arch/sparc/kernel/sys_sparc_32.c | 2 - arch/sparc/kernel/unaligned_32.c | 3 +- arch/sparc/kernel/windows.c | 2 - arch/tile/include/asm/compat.h | 2 +- arch/x86/ia32/ia32entry.S | 22 +- arch/x86/include/asm/compat.h | 2 +- arch/x86/include/asm/iomap.h | 4 +- arch/x86/include/asm/kvm_emulate.h | 7 +- arch/x86/include/asm/pci.h | 6 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 +- arch/x86/kernel/cpu/perf_event.c | 59 +++- arch/x86/kernel/cpu/perf_event_intel.c | 15 +- arch/x86/kernel/cpu/perf_event_p4.c | 2 +- arch/x86/kernel/trampoline.c | 3 +- arch/x86/kernel/tsc.c | 2 +- arch/x86/kvm/emulate.c | 9 +- arch/x86/kvm/i8259.c | 3 + arch/x86/kvm/irq.h | 2 +- arch/x86/mm/iomap_32.c | 6 +- arch/x86/oprofile/nmi_int.c | 22 +- block/blk-cgroup.c | 2 +- block/blk-core.c | 6 +- block/blk-sysfs.c | 1 + block/blk.h | 8 +- block/cfq-iosched.c | 103 ++++- block/elevator.c | 44 ++- crypto/Kconfig | 8 +- crypto/ahash.c | 7 +- crypto/algboss.c | 8 +- crypto/testmgr.c | 4 +- drivers/acpi/pci_root.c | 97 +++-- drivers/ata/ahci.c | 3 + drivers/ata/ata_piix.c | 4 + drivers/ata/libahci.c | 2 +- drivers/ata/libata-core.c | 14 +- drivers/ata/libata-eh.c | 4 + drivers/ata/libata-sff.c | 41 ++- drivers/ata/pata_artop.c | 3 +- drivers/ata/pata_via.c | 2 + drivers/ata/sata_mv.c | 2 +- drivers/base/power/main.c | 1 + drivers/block/cciss.c | 11 + drivers/block/loop.c | 2 +- drivers/block/mg_disk.c | 3 +- drivers/char/agp/intel-agp.c | 16 +- drivers/char/agp/intel-agp.h | 22 +- drivers/char/agp/intel-gtt.c | 66 +++- drivers/char/hw_random/n2-drv.c | 2 +- drivers/char/tty_io.c | 2 +- drivers/char/vt.c | 15 +- drivers/char/vt_ioctl.c | 16 +- drivers/gpio/sx150x.c | 26 +- drivers/gpu/drm/drm_crtc_helper.c | 24 +- drivers/gpu/drm/i915/i915_debugfs.c | 50 +++ drivers/gpu/drm/i915/i915_dma.c | 36 ++- drivers/gpu/drm/i915/i915_drv.c | 65 ++-- drivers/gpu/drm/i915/i915_drv.h | 27 +- drivers/gpu/drm/i915/i915_gem.c | 11 +- drivers/gpu/drm/i915/i915_irq.c | 73 +++- drivers/gpu/drm/i915/i915_reg.h | 9 + drivers/gpu/drm/i915/intel_display.c | 267 ++++++------- drivers/gpu/drm/i915/intel_dp.c | 58 ++-- drivers/gpu/drm/i915/intel_drv.h | 10 + drivers/gpu/drm/i915/intel_lvds.c | 2 - drivers/gpu/drm/i915/intel_overlay.c | 2 + drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +- drivers/gpu/drm/i915/intel_sdvo.c | 69 +++- drivers/gpu/drm/i915/intel_tv.c | 9 +- drivers/gpu/drm/nouveau/nouveau_fence.c | 6 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 7 +- drivers/gpu/drm/nouveau/nv50_instmem.c | 2 + drivers/gpu/drm/radeon/atombios_crtc.c | 48 ++- drivers/gpu/drm/radeon/evergreen.c | 48 ++- drivers/gpu/drm/radeon/r600.c | 16 +- drivers/gpu/drm/radeon/radeon.h | 8 +- drivers/gpu/drm/radeon/radeon_asic.c | 18 - drivers/gpu/drm/radeon/radeon_atombios.c | 27 ++ drivers/gpu/drm/radeon/radeon_clocks.c | 58 +--- drivers/gpu/drm/radeon/radeon_connectors.c | 78 ++-- drivers/gpu/drm/radeon/radeon_device.c | 28 +- drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- drivers/gpu/drm/radeon/radeon_mode.h | 1 - drivers/gpu/drm/radeon/rv770.c | 61 +++- drivers/hid/hid-core.c | 4 +- drivers/hid/hid-ids.h | 4 + drivers/hid/hid-mosart.c | 1 + drivers/hid/hid-topseed.c | 1 + drivers/hid/usbhid/hid-core.c | 8 +- drivers/hid/usbhid/hid-quirks.c | 4 + drivers/hid/usbhid/hiddev.c | 2 +- drivers/hid/usbhid/usbhid.h | 1 + drivers/hwmon/hp_accel.c | 2 + drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +- drivers/infiniband/hw/nes/nes_cm.c | 18 +- drivers/infiniband/hw/nes/nes_hw.c | 14 +- drivers/infiniband/hw/nes/nes_hw.h | 1 + drivers/infiniband/hw/nes/nes_nic.c | 4 +- drivers/input/input.c | 11 +- drivers/input/mouse/bcm5974.c | 12 +- drivers/input/serio/i8042.c | 2 +- drivers/input/tablet/wacom_wac.c | 4 +- drivers/md/.gitignore | 4 - drivers/md/bitmap.c | 3 +- drivers/md/md.c | 25 +- drivers/md/md.h | 2 +- drivers/mmc/core/sdio.c | 5 +- drivers/mmc/host/at91_mci.c | 1 + drivers/mmc/host/imxmmc.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 3 +- drivers/mmc/host/s3cmci.c | 2 +- drivers/mmc/host/tmio_mmc.c | 7 +- drivers/mmc/host/tmio_mmc.h | 13 +- drivers/mtd/nand/bf5xx_nand.c | 9 +- drivers/mtd/nand/mxc_nand.c | 47 ++- drivers/mtd/nand/pxa3xx_nand.c | 6 + drivers/mtd/onenand/samsung.c | 16 +- drivers/mtd/ubi/Kconfig.debug | 2 +- drivers/mtd/ubi/cdev.c | 12 +- drivers/mtd/ubi/scan.c | 2 +- drivers/mtd/ubi/wl.c | 3 +- drivers/net/3c59x.c | 15 +- drivers/net/b44.c | 9 + drivers/net/benet/be.h | 1 + drivers/net/benet/be_cmds.c | 8 +- drivers/net/benet/be_cmds.h | 2 +- drivers/net/benet/be_ethtool.c | 1 + drivers/net/benet/be_hw.h | 7 +- drivers/net/benet/be_main.c | 47 +-- drivers/net/bonding/bond_main.c | 56 ++- drivers/net/ks8851.c | 39 +- drivers/net/ll_temac_main.c | 1 + drivers/net/ll_temac_mdio.c | 1 + drivers/net/niu.c | 16 +- drivers/net/pcmcia/pcnet_cs.c | 1 + drivers/net/pxa168_eth.c | 2 + drivers/net/stmmac/stmmac_main.c | 9 +- drivers/net/usb/ipheth.c | 7 +- drivers/net/via-velocity.c | 2 +- drivers/net/wireless/ath/ath5k/base.c | 4 + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- drivers/net/wireless/ath/regd.h | 1 - drivers/net/wireless/libertas/if_sdio.c | 2 +- drivers/net/wireless/p54/txrx.c | 2 +- drivers/oprofile/buffer_sync.c | 27 +- drivers/oprofile/cpu_buffer.c | 2 - drivers/pci/hotplug/acpi_pcihp.c | 6 +- drivers/pci/hotplug/pciehp.h | 16 +- drivers/pci/hotplug/pciehp_acpi.c | 4 +- drivers/pci/hotplug/pciehp_core.c | 4 +- drivers/pci/pci.h | 2 + drivers/pci/pcie/Makefile | 3 +- drivers/pci/pcie/aer/aerdrv.c | 9 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 36 -- drivers/pci/pcie/aer/aerdrv_core.c | 14 +- drivers/pci/pcie/{pme/pcie_pme.c => pme.c} | 66 +--- drivers/pci/pcie/pme/Makefile | 8 - drivers/pci/pcie/pme/pcie_pme.h | 28 -- drivers/pci/pcie/pme/pcie_pme_acpi.c | 54 --- drivers/pci/pcie/portdrv.h | 22 + drivers/pci/pcie/portdrv_acpi.c | 77 ++++ drivers/pci/pcie/portdrv_core.c | 53 +++- drivers/pci/pcie/portdrv_pci.c | 38 ++- drivers/pci/slot.c | 2 +- drivers/rtc/rtc-bfin.c | 15 +- drivers/rtc/rtc-m41t80.c | 2 +- drivers/rtc/rtc-pl031.c | 2 +- drivers/s390/char/tape_block.c | 3 +- drivers/scsi/be2iscsi/be_iscsi.c | 5 +- drivers/scsi/be2iscsi/be_mgmt.c | 2 +- drivers/scsi/constants.c | 6 +- drivers/scsi/hpsa.c | 6 + drivers/scsi/osd/osd_initiator.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 23 +- drivers/scsi/qla2xxx/qla_dbg.h | 2 - drivers/scsi/qla2xxx/qla_def.h | 20 + drivers/scsi/qla2xxx/qla_init.c | 94 ++++- drivers/scsi/qla2xxx/qla_isr.c | 7 +- drivers/scsi/qla2xxx/qla_mbx.c | 7 +- drivers/scsi/qla2xxx/qla_mid.c | 68 +++- drivers/scsi/qla2xxx/qla_nx.c | 36 ++- drivers/scsi/qla2xxx/qla_os.c | 30 ++- drivers/scsi/qla2xxx/qla_version.h | 4 +- drivers/scsi/scsi.c | 4 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/sd.c | 8 +- drivers/scsi/sym53c8xx_2/sym_hipd.c | 10 +- drivers/serial/bfin_sport_uart.c | 2 +- drivers/serial/mpc52xx_uart.c | 1 + drivers/spi/amba-pl022.c | 16 +- drivers/spi/dw_spi.c | 24 +- drivers/spi/spi.c | 9 +- drivers/spi/spi_s3c64xx.c | 37 ++- drivers/staging/comedi/drivers/das08_cs.c | 1 - drivers/staging/hv/netvsc_drv.c | 3 + drivers/staging/hv/ring_buffer.c | 3 +- drivers/staging/hv/storvsc_api.h | 4 +- drivers/staging/hv/storvsc_drv.c | 11 +- drivers/staging/octeon/Kconfig | 2 +- drivers/staging/rt2860/usb_main_dev.c | 41 ++- drivers/staging/spectra/Kconfig | 1 + drivers/staging/spectra/ffsport.c | 1 + drivers/staging/wlan-ng/cfg80211.c | 3 + drivers/staging/zram/zram_drv.c | 1 + drivers/usb/atm/cxacru.c | 24 +- drivers/usb/class/cdc-acm.c | 23 +- drivers/usb/core/message.c | 22 +- drivers/usb/gadget/rndis.c | 12 +- drivers/usb/gadget/rndis.h | 2 +- drivers/usb/gadget/s3c-hsotg.c | 2 - drivers/usb/host/ehci-ppc-of.c | 12 +- drivers/usb/serial/cp210x.c | 11 +- drivers/usb/serial/ftdi_sio.c | 8 + drivers/usb/serial/ftdi_sio_ids.h | 12 + drivers/usb/serial/mos7840.c | 32 +- drivers/usb/serial/option.c | 119 ++++-- drivers/usb/serial/ssu100.c | 2 +- drivers/vhost/vhost.c | 85 +++-- drivers/video/pxa168fb.c | 6 +- fs/9p/fid.c | 3 +- fs/9p/vfs_dir.c | 6 +- fs/9p/vfs_inode.c | 9 +- fs/9p/vfs_super.c | 20 +- fs/aio.c | 3 + fs/binfmt_misc.c | 2 +- fs/bio-integrity.c | 4 +- fs/cifs/Kconfig | 2 - fs/cifs/asn1.c | 6 +- fs/cifs/cifsencrypt.c | 418 ++++---------------- fs/cifs/cifsglob.h | 25 +-- fs/cifs/cifspdu.h | 7 +- fs/cifs/cifsproto.h | 13 +- fs/cifs/cifssmb.c | 13 +- fs/cifs/connect.c | 71 +--- fs/cifs/inode.c | 30 +- fs/cifs/netmisc.c | 22 +- fs/cifs/ntlmssp.h | 13 - fs/cifs/sess.c | 132 ++----- fs/cifs/transport.c | 6 +- fs/direct-io.c | 4 +- fs/exec.c | 14 + fs/fcntl.c | 10 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 42 ++- fs/fuse/file.c | 8 +- fs/minix/namei.c | 2 +- fs/namespace.c | 23 +- fs/nfs/Kconfig | 1 + fs/nfs/client.c | 2 +- fs/nfs/file.c | 4 - fs/nfs/super.c | 10 +- fs/nfsd/Kconfig | 1 + fs/nfsd/nfs4state.c | 2 +- fs/nilfs2/the_nilfs.c | 1 + fs/ocfs2/alloc.c | 2 +- fs/ocfs2/blockcheck.c | 4 +- fs/ocfs2/file.c | 15 +- fs/ocfs2/inode.c | 6 +- fs/ocfs2/mmap.c | 8 +- fs/ocfs2/namei.c | 302 +++++++++++---- fs/ocfs2/refcounttree.c | 5 +- fs/ocfs2/suballoc.c | 219 +++++++++-- fs/ocfs2/suballoc.h | 21 + fs/proc/page.c | 2 +- fs/proc/task_mmu.c | 3 +- fs/sysfs/file.c | 2 +- fs/xfs/linux-2.6/xfs_buf.c | 11 +- fs/xfs/linux-2.6/xfs_buf.h | 1 - fs/xfs/linux-2.6/xfs_ioctl.c | 9 + fs/xfs/linux-2.6/xfs_iops.c | 2 +- fs/xfs/xfs_bmap.c | 14 +- fs/xfs/xfs_fs.h | 4 +- fs/xfs/xfs_vnodeops.c | 13 +- include/acpi/acpi_bus.h | 3 - include/asm-generic/gpio.h | 14 +- include/asm-generic/percpu.h | 15 +- include/linux/acpi.h | 4 +- include/linux/cgroup.h | 12 +- include/linux/compat.h | 3 + include/linux/elevator.h | 1 + include/linux/gpio.h | 1 + include/linux/i2c/sx150x.h | 4 + include/linux/intel-gtt.h | 20 + include/linux/io-mapping.h | 24 +- include/linux/kfifo.h | 58 ++-- include/linux/ksm.h | 20 +- include/linux/lglock.h | 4 +- include/linux/libata.h | 4 +- include/linux/mm.h | 6 + include/linux/mmc/sdio.h | 2 + include/linux/mmzone.h | 13 + include/linux/mutex.h | 8 + include/linux/pci.h | 3 + include/linux/pci_ids.h | 2 + include/linux/percpu.h | 2 +- include/linux/quotaops.h | 10 +- include/linux/semaphore.h | 3 + include/linux/serial.h | 3 +- include/linux/serial_core.h | 3 +- include/linux/spi/dw_spi.h | 2 + include/linux/sunrpc/clnt.h | 2 +- include/linux/swap.h | 11 +- include/linux/vmstat.h | 22 + include/linux/workqueue.h | 18 +- include/net/cls_cgroup.h | 10 +- include/net/ip_vs.h | 3 + include/net/sock.h | 1 + include/net/udp.h | 1 + kernel/cgroup.c | 13 +- kernel/compat.c | 21 + kernel/debug/kdb/kdb_bp.c | 2 - kernel/gcov/fs.c | 244 +++++++++--- kernel/groups.c | 5 +- kernel/hrtimer.c | 3 +- kernel/mutex.c | 23 +- kernel/perf_event.c | 32 ++- kernel/pm_qos_params.c | 4 +- kernel/power/hibernate.c | 1 - kernel/power/snapshot.c | 86 +++- kernel/power/swap.c | 6 +- kernel/sched.c | 6 + kernel/sched_fair.c | 11 +- kernel/sys.c | 2 + kernel/sysctl.c | 5 +- kernel/trace/ftrace.c | 19 +- kernel/trace/ring_buffer.c | 2 - kernel/trace/trace_event_perf.c | 3 + kernel/trace/trace_kprobe.c | 43 ++- kernel/watchdog.c | 17 +- kernel/workqueue.c | 53 ++- lib/raid6/.gitignore | 4 + lib/scatterlist.c | 14 +- mm/Kconfig | 2 +- mm/backing-dev.c | 7 +- mm/bounce.c | 2 +- mm/compaction.c | 7 +- mm/ksm.c | 3 - mm/memory.c | 39 ++- mm/memory_hotplug.c | 16 +- mm/mlock.c | 6 - mm/mmzone.c | 21 + mm/page_alloc.c | 33 ++- mm/percpu.c | 6 +- mm/percpu_up.c | 4 +- mm/swapfile.c | 129 +++---- mm/vmstat.c | 16 +- net/9p/client.c | 7 +- net/bridge/br_netfilter.c | 6 +- net/core/dev.c | 16 +- net/core/gen_estimator.c | 12 +- net/core/skbuff.c | 6 +- net/ipv4/Kconfig | 2 +- net/ipv4/datagram.c | 5 +- net/ipv4/fib_frontend.c | 15 +- net/ipv4/fib_trie.c | 8 +- net/ipv4/route.c | 7 +- net/ipv4/udp.c | 44 ++ net/ipv6/datagram.c | 7 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 80 +--- net/ipv6/reassembly.c | 71 +--- net/ipv6/udp.c | 10 + net/irda/af_irda.c | 4 +- net/irda/irlan/irlan_common.c | 2 +- net/mac80211/main.c | 6 + net/netfilter/ipvs/ip_vs_core.c | 1 + net/netfilter/ipvs/ip_vs_ftp.c | 9 +- net/netfilter/ipvs/ip_vs_xmit.c | 18 +- net/netlink/af_netlink.c | 22 + net/sched/act_police.c | 21 +- net/sched/sch_hfsc.c | 2 +- net/sctp/sm_statefuns.c | 46 ++-- net/sunrpc/auth.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 9 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 10 +- net/sunrpc/auth_gss/gss_spkm3_mech.c | 5 +- net/sunrpc/clnt.c | 116 +++--- net/sunrpc/rpc_pipe.c | 20 +- net/unix/af_unix.c | 15 +- net/wireless/core.c | 21 +- net/wireless/wext-compat.c | 3 + net/wireless/wext-core.c | 16 + net/xfrm/xfrm_user.c | 2 +- scripts/basic/docproc.c | 129 ++++++- scripts/kernel-doc | 54 +++- security/apparmor/include/resource.h | 4 +- security/apparmor/lib.c | 2 +- security/apparmor/lsm.c | 2 +- security/apparmor/path.c | 38 +-- security/apparmor/policy.c | 6 +- security/apparmor/resource.c | 20 +- security/integrity/ima/ima.h | 1 + security/integrity/ima/ima_iint.c | 4 +- security/integrity/ima/ima_main.c | 8 +- security/keys/keyctl.c | 6 +- sound/core/rawmidi.c | 2 + sound/core/seq/oss/seq_oss_init.c | 9 +- sound/isa/msnd/msnd_pinnacle.c | 8 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/patch_cirrus.c | 50 +++ sound/pci/hda/patch_conexant.c | 58 +++ sound/pci/hda/patch_realtek.c | 1 + sound/pci/oxygen/oxygen.h | 1 + sound/pci/oxygen/oxygen_lib.c | 21 +- sound/pci/oxygen/virtuoso.c | 1 + sound/pci/oxygen/xonar_wm87x6.c | 22 +- sound/usb/card.c | 19 +- sound/usb/clock.c | 3 +- sound/usb/endpoint.c | 11 +- sound/usb/format.c | 22 +- sound/usb/mixer.c | 10 +- sound/usb/pcm.c | 3 +- tools/perf/util/callchain.h | 1 + tools/perf/util/probe-event.c | 1 + tools/perf/util/probe-finder.c | 42 ++- tools/perf/util/symbol.c | 7 + tools/perf/util/symbol.h | 3 +- virt/kvm/kvm_main.c | 5 +- 500 files changed, 5572 insertions(+), 3265 deletions(-) create mode 100644 Documentation/block/cfq-iosched.txt create mode 100644 arch/arm/mach-shmobile/pm_runtime.c delete mode 100644 drivers/md/.gitignore rename drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (83%) delete mode 100644 drivers/pci/pcie/pme/Makefile delete mode 100644 drivers/pci/pcie/pme/pcie_pme.h delete mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c create mode 100644 drivers/pci/pcie/portdrv_acpi.c create mode 100644 include/linux/intel-gtt.h create mode 100644 lib/raid6/.gitignore ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Merge made by recursive. block/blk-map.c | 2 +- block/cfq-iosched.c | 16 +++++++++++++--- drivers/block/cciss.c | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Removing Documentation/block/barrier.txt Auto-merging Documentation/lguest/lguest.c Removing block/blk-barrier.c Auto-merging block/blk-core.c CONFLICT (content): Merge conflict in block/blk-core.c Auto-merging block/blk-map.c Auto-merging block/blk-sysfs.c Auto-merging block/blk.h Auto-merging block/elevator.c Auto-merging drivers/block/cciss.c Auto-merging drivers/block/loop.c CONFLICT (content): Merge conflict in drivers/block/loop.c Auto-merging drivers/block/xen-blkfront.c Auto-merging drivers/md/md.c Auto-merging drivers/md/md.h Auto-merging drivers/s390/scsi/zfcp_scsi.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/sd.c Auto-merging fs/nilfs2/the_nilfs.c Auto-merging fs/xfs/linux-2.6/xfs_buf.c Auto-merging fs/xfs/linux-2.6/xfs_buf.h Auto-merging fs/xfs/xfs_log.c Auto-merging mm/swapfile.c Automatic merge failed; fix conflicts and then commit the result.