$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 45d4474 Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 Merging origin/master $ git merge origin/master Updating 45d4474..22ef37e Fast forward Documentation/ABI/testing/sysfs-kernel-slab | 479 ++++++++++++++++++++ Documentation/DocBook/kgdb.tmpl | 2 +- Documentation/sysctl/vm.txt | 28 -- Makefile | 2 +- arch/arm/mach-davinci/include/mach/asp.h | 25 + arch/mips/Kconfig | 20 +- arch/mips/Makefile | 5 +- arch/mips/alchemy/common/time.c | 2 +- arch/mips/cavium-octeon/csrc-octeon.c | 2 +- arch/mips/include/asm/bitops.h | 4 +- arch/mips/include/asm/checksum.h | 4 +- arch/mips/include/asm/compat.h | 1 - arch/mips/include/asm/cpu-features.h | 9 + arch/mips/include/asm/div64.h | 142 ++---- arch/mips/include/asm/dma-mapping.h | 9 +- arch/mips/include/asm/fixmap.h | 3 + arch/mips/include/asm/hazards.h | 5 +- arch/mips/include/asm/highmem.h | 6 +- arch/mips/include/asm/mach-au1x00/au1000.h | 6 +- arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 17 - .../asm/mach-lemote/cpu-feature-overrides.h | 59 +++ arch/mips/include/asm/mipsregs.h | 38 +- arch/mips/include/asm/page.h | 3 + arch/mips/include/asm/pgtable-64.h | 6 + arch/mips/include/asm/sn/addrs.h | 4 +- arch/mips/include/asm/sn/nmi.h | 4 +- arch/mips/include/asm/thread_info.h | 3 + arch/mips/include/asm/time.h | 6 +- arch/mips/include/asm/uaccess.h | 66 ++- arch/mips/kernel/cevt-smtc.c | 2 +- arch/mips/kernel/scall64-n32.S | 4 +- arch/mips/kernel/scall64-o32.S | 4 +- arch/mips/kernel/unaligned.c | 6 +- arch/mips/lib/dump_tlb.c | 9 + arch/mips/mm/c-r4k.c | 2 +- arch/mips/mm/dma-default.c | 19 +- arch/mips/mm/highmem.c | 25 +- arch/mips/mm/init.c | 26 - arch/mips/mm/sc-rm7k.c | 4 +- arch/mips/pmc-sierra/Kconfig | 12 - arch/mips/pmc-sierra/msp71xx/msp_prom.c | 60 +--- arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 +- arch/mips/pmc-sierra/msp71xx/msp_time.c | 7 +- arch/mips/sgi-ip32/ip32-berr.c | 2 +- arch/mips/sgi-ip32/ip32-irq.c | 4 +- arch/mips/sibyte/bcm1480/irq.c | 7 +- arch/mips/sibyte/sb1250/irq.c | 7 +- arch/mips/txx9/generic/setup_tx4927.c | 2 +- arch/mips/txx9/generic/setup_tx4938.c | 2 +- arch/mips/txx9/generic/setup_tx4939.c | 2 +- arch/mips/txx9/rbtx4939/setup.c | 2 +- arch/powerpc/boot/Makefile | 2 +- arch/powerpc/boot/mktree.c | 10 +- arch/powerpc/configs/83xx/asp8347_defconfig | 104 +++-- arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 114 ++++-- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 114 ++++-- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 107 ++++- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 113 ++++-- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 108 ++++-- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 108 ++++-- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 103 ++++- arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 108 ++++-- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 96 +++- arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 104 ++++- arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 111 ++++-- arch/powerpc/configs/83xx/sbc834x_defconfig | 96 +++- arch/powerpc/configs/85xx/ksi8560_defconfig | 86 +++- arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 82 +++- arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 89 +++- arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 88 +++- arch/powerpc/configs/85xx/sbc8548_defconfig | 84 +++- arch/powerpc/configs/85xx/sbc8560_defconfig | 83 +++- arch/powerpc/configs/85xx/socrates_defconfig | 385 ++++++++++++---- arch/powerpc/configs/85xx/stx_gp3_defconfig | 105 ++++- arch/powerpc/configs/85xx/tqm8540_defconfig | 100 +++- arch/powerpc/configs/85xx/tqm8541_defconfig | 101 ++++- arch/powerpc/configs/85xx/tqm8548_defconfig | 64 ++- arch/powerpc/configs/85xx/tqm8555_defconfig | 101 ++++- arch/powerpc/configs/85xx/tqm8560_defconfig | 101 ++++- arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 92 +++- arch/powerpc/configs/86xx/gef_sbc310_defconfig | 92 +++- arch/powerpc/configs/86xx/gef_sbc610_defconfig | 122 ++++-- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 100 +++-- arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 211 ++++------ arch/powerpc/configs/86xx/sbc8641d_defconfig | 114 ++++-- arch/powerpc/configs/adder875_defconfig | 65 ++- arch/powerpc/configs/c2k_defconfig | 128 ++++-- arch/powerpc/configs/ep8248e_defconfig | 74 +++- arch/powerpc/configs/ep88xc_defconfig | 63 ++- arch/powerpc/configs/linkstation_defconfig | 96 +++- arch/powerpc/configs/mgcoge_defconfig | 74 +++- arch/powerpc/configs/mgsuvd_defconfig | 72 +++- arch/powerpc/configs/mpc7448_hpc2_defconfig | 91 +++- arch/powerpc/configs/mpc8272_ads_defconfig | 77 +++- arch/powerpc/configs/mpc83xx_defconfig | 115 ++++-- arch/powerpc/configs/mpc866_ads_defconfig | 77 +++- arch/powerpc/configs/mpc86xx_defconfig | 211 ++++------ arch/powerpc/configs/mpc885_ads_defconfig | 63 ++- arch/powerpc/configs/pq2fads_defconfig | 90 +++- arch/powerpc/configs/prpmc2800_defconfig | 120 ++++-- arch/powerpc/configs/storcenter_defconfig | 71 +++- arch/powerpc/include/asm/iseries/iommu.h | 4 - arch/powerpc/include/asm/system.h | 2 +- arch/powerpc/kernel/cputable.c | 2 +- arch/powerpc/kernel/machine_kexec.c | 4 +- arch/powerpc/kernel/pci-common.c | 21 +- arch/powerpc/kernel/pci_64.c | 15 +- arch/powerpc/kernel/prom.c | 8 +- arch/powerpc/mm/mem.c | 2 +- arch/powerpc/oprofile/op_model_power4.c | 9 +- arch/powerpc/platforms/40x/Kconfig | 1 + arch/powerpc/platforms/44x/Kconfig | 1 + arch/powerpc/platforms/cell/ras.c | 17 +- arch/powerpc/platforms/iseries/Kconfig | 1 + arch/powerpc/platforms/iseries/iommu.c | 6 +- arch/powerpc/platforms/iseries/pci.c | 1 - arch/powerpc/sysdev/fsl_soc.c | 46 -- arch/powerpc/sysdev/mpic.c | 16 +- arch/powerpc/sysdev/xilinx_intc.c | 117 +++++- arch/x86/kernel/kgdb.c | 3 +- block/blk-core.c | 4 +- crypto/api.c | 3 +- crypto/eseqiv.c | 3 +- drivers/acpi/acpica/Makefile | 27 +- drivers/acpi/acpica/aclocal.h | 7 +- drivers/acpi/bus.c | 2 +- drivers/acpi/processor_idle.c | 42 ++- drivers/acpi/processor_throttling.c | 25 + drivers/acpi/video.c | 38 ++ drivers/ata/libata-scsi.c | 34 ++- drivers/ata/sata_fsl.c | 15 +- drivers/ata/sata_sx4.c | 180 +++++--- drivers/char/sysrq.c | 4 +- drivers/crypto/ixp4xx_crypto.c | 33 ++- drivers/crypto/padlock-aes.c | 2 +- drivers/gpu/drm/Kconfig | 6 + drivers/gpu/drm/i915/i915_dma.c | 13 +- drivers/gpu/drm/i915/i915_drv.h | 11 +- drivers/gpu/drm/i915/i915_gem.c | 9 + drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/i915_suspend.c | 24 + drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 31 ++ drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_fb.c | 4 +- drivers/gpu/drm/i915/intel_hdmi.c | 17 +- drivers/gpu/drm/i915/intel_i2c.c | 17 + drivers/gpu/drm/i915/intel_lvds.c | 54 ++- drivers/gpu/drm/i915/intel_modes.c | 6 + drivers/ide/icside.c | 2 +- drivers/ide/ide-tape.c | 6 - drivers/ide/piix.c | 1 + drivers/net/wireless/airo.c | 10 +- drivers/net/wireless/ath5k/base.c | 22 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 8 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 + drivers/net/wireless/rtl818x/rtl8187.h | 57 ++- drivers/net/wireless/rtl818x/rtl8187_dev.c | 13 +- drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 8 +- drivers/pci/msi.c | 8 +- drivers/pci/pcie/aer/aerdrv.h | 3 + drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/platform/x86/asus-laptop.c | 6 +- drivers/platform/x86/eeepc-laptop.c | 47 ++- drivers/pnp/pnpacpi/core.c | 8 +- drivers/serial/nwpserial.c | 4 +- drivers/thermal/thermal_sys.c | 8 +- drivers/video/gbefb.c | 14 +- fs/btrfs/ctree.c | 39 ++- fs/btrfs/disk-io.c | 2 - fs/btrfs/extent-tree.c | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/ioctl.c | 4 - fs/btrfs/super.c | 4 +- fs/cifs/cifssmb.c | 12 +- fs/devpts/inode.c | 18 +- fs/ext4/extents.c | 19 +- fs/ext4/inode.c | 26 +- fs/reiserfs/super.c | 2 - fs/reiserfs/xattr.c | 81 ++-- include/drm/i915_drm.h | 10 + include/linux/ata.h | 28 ++ include/linux/reiserfs_xattr.h | 4 +- include/linux/writeback.h | 2 - kernel/kgdb.c | 4 +- kernel/panic.c | 35 +- kernel/power/disk.c | 4 +- kernel/sysctl.c | 23 - mm/page-writeback.c | 6 +- mm/pdflush.c | 31 +- mm/slob.c | 5 +- mm/slub.c | 6 +- net/bluetooth/hci_conn.c | 6 +- net/bluetooth/hci_event.c | 2 +- net/bluetooth/hci_sysfs.c | 3 + net/mac80211/rc80211_minstrel.c | 2 +- net/mac80211/rc80211_pid_algo.c | 2 +- sound/arm/pxa2xx-ac97-lib.c | 2 +- sound/drivers/pcsp/pcsp_mixer.c | 2 +- sound/pci/riptide/riptide.c | 10 +- sound/soc/davinci/Kconfig | 7 +- sound/soc/davinci/davinci-evm.c | 63 +++- sound/soc/davinci/davinci-i2s.c | 26 +- sound/soc/davinci/davinci-pcm.c | 71 ++-- sound/soc/soc-core.c | 3 + 205 files changed, 5656 insertions(+), 2296 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-slab create mode 100644 arch/arm/mach-davinci/include/mach/asp.h create mode 100644 arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/common/gic.c | 4 +- arch/arm/include/asm/hardware/gic.h | 2 +- arch/arm/include/asm/smp.h | 12 +--- arch/arm/kernel/smp.c | 46 +++++--------- arch/arm/mach-ep93xx/clock.c | 69 +++++++++++++++++++--- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 5 +- arch/arm/mach-omap2/clock24xx.c | 10 ++-- arch/arm/mach-omap2/clock34xx.c | 12 ++-- arch/arm/mach-omap2/clock34xx.h | 12 ++-- arch/arm/mach-omap2/devices.c | 6 +- arch/arm/mach-omap2/prm-regbits-34xx.h | 2 +- arch/arm/mach-omap2/usb-tusb6010.c | 2 +- arch/arm/mach-pxa/viper.c | 1 + arch/arm/mach-realview/core.c | 8 --- arch/arm/mach-realview/include/mach/smp.h | 11 +--- arch/arm/mach-realview/localtimer.c | 6 +- arch/arm/mach-realview/platsmp.c | 15 +---- arch/arm/mach-s3c2410/mach-bast.c | 3 +- arch/arm/nwfpe/fpa11.h | 4 + arch/arm/nwfpe/fpa11_cprt.c | 4 - arch/arm/nwfpe/softfloat.h | 2 + arch/arm/plat-omap/fb.c | 5 +- arch/arm/plat-omap/gpio.c | 2 +- arch/arm/plat-s3c/clock.c | 2 - arch/arm/plat-s3c24xx/dma.c | 2 +- arch/arm/plat-s3c64xx/gpiolib.c | 2 +- arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h | 20 +++--- drivers/video/omap/dispc.c | 14 +++-- drivers/video/omap/rfbi.c | 8 ++- 29 files changed, 157 insertions(+), 134 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Merge made by recursive. MAINTAINERS | 8 + drivers/misc/enclosure.c | 6 +- drivers/scsi/3w-9xxx.c | 3 +- drivers/scsi/3w-xxxx.c | 5 +- drivers/scsi/3w-xxxx.h | 2 +- drivers/scsi/Kconfig | 11 + drivers/scsi/Makefile | 1 + drivers/scsi/fnic/Makefile | 15 + drivers/scsi/fnic/cq_desc.h | 78 ++ drivers/scsi/fnic/cq_enet_desc.h | 167 ++++ drivers/scsi/fnic/cq_exch_desc.h | 182 ++++ drivers/scsi/fnic/fcpio.h | 780 +++++++++++++++ drivers/scsi/fnic/fnic.h | 265 +++++ drivers/scsi/fnic/fnic_attrs.c | 56 ++ drivers/scsi/fnic/fnic_fcs.c | 742 ++++++++++++++ drivers/scsi/fnic/fnic_io.h | 67 ++ drivers/scsi/fnic/fnic_isr.c | 332 +++++++ drivers/scsi/fnic/fnic_main.c | 942 ++++++++++++++++++ drivers/scsi/fnic/fnic_res.c | 444 +++++++++ drivers/scsi/fnic/fnic_res.h | 197 ++++ drivers/scsi/fnic/fnic_scsi.c | 1850 +++++++++++++++++++++++++++++++++++ drivers/scsi/fnic/rq_enet_desc.h | 58 ++ drivers/scsi/fnic/vnic_cq.c | 85 ++ drivers/scsi/fnic/vnic_cq.h | 121 +++ drivers/scsi/fnic/vnic_cq_copy.h | 62 ++ drivers/scsi/fnic/vnic_dev.c | 690 +++++++++++++ drivers/scsi/fnic/vnic_dev.h | 161 +++ drivers/scsi/fnic/vnic_devcmd.h | 281 ++++++ drivers/scsi/fnic/vnic_intr.c | 60 ++ drivers/scsi/fnic/vnic_intr.h | 118 +++ drivers/scsi/fnic/vnic_nic.h | 69 ++ drivers/scsi/fnic/vnic_resource.h | 61 ++ drivers/scsi/fnic/vnic_rq.c | 196 ++++ drivers/scsi/fnic/vnic_rq.h | 235 +++++ drivers/scsi/fnic/vnic_scsi.h | 99 ++ drivers/scsi/fnic/vnic_stats.h | 68 ++ drivers/scsi/fnic/vnic_wq.c | 182 ++++ drivers/scsi/fnic/vnic_wq.h | 175 ++++ drivers/scsi/fnic/vnic_wq_copy.c | 117 +++ drivers/scsi/fnic/vnic_wq_copy.h | 128 +++ drivers/scsi/fnic/wq_enet_desc.h | 96 ++ drivers/scsi/scsi_scan.c | 1 + drivers/scsi/scsi_transport_iscsi.c | 2 +- include/scsi/scsi_transport_fc.h | 4 +- 44 files changed, 9212 insertions(+), 10 deletions(-) create mode 100644 drivers/scsi/fnic/Makefile create mode 100644 drivers/scsi/fnic/cq_desc.h create mode 100644 drivers/scsi/fnic/cq_enet_desc.h create mode 100644 drivers/scsi/fnic/cq_exch_desc.h create mode 100644 drivers/scsi/fnic/fcpio.h create mode 100644 drivers/scsi/fnic/fnic.h create mode 100644 drivers/scsi/fnic/fnic_attrs.c create mode 100644 drivers/scsi/fnic/fnic_fcs.c create mode 100644 drivers/scsi/fnic/fnic_io.h create mode 100644 drivers/scsi/fnic/fnic_isr.c create mode 100644 drivers/scsi/fnic/fnic_main.c create mode 100644 drivers/scsi/fnic/fnic_res.c create mode 100644 drivers/scsi/fnic/fnic_res.h create mode 100644 drivers/scsi/fnic/fnic_scsi.c create mode 100644 drivers/scsi/fnic/rq_enet_desc.h create mode 100644 drivers/scsi/fnic/vnic_cq.c create mode 100644 drivers/scsi/fnic/vnic_cq.h create mode 100644 drivers/scsi/fnic/vnic_cq_copy.h create mode 100644 drivers/scsi/fnic/vnic_dev.c create mode 100644 drivers/scsi/fnic/vnic_dev.h create mode 100644 drivers/scsi/fnic/vnic_devcmd.h create mode 100644 drivers/scsi/fnic/vnic_intr.c create mode 100644 drivers/scsi/fnic/vnic_intr.h create mode 100644 drivers/scsi/fnic/vnic_nic.h create mode 100644 drivers/scsi/fnic/vnic_resource.h create mode 100644 drivers/scsi/fnic/vnic_rq.c create mode 100644 drivers/scsi/fnic/vnic_rq.h create mode 100644 drivers/scsi/fnic/vnic_scsi.h create mode 100644 drivers/scsi/fnic/vnic_stats.h create mode 100644 drivers/scsi/fnic/vnic_wq.c create mode 100644 drivers/scsi/fnic/vnic_wq.h create mode 100644 drivers/scsi/fnic/vnic_wq_copy.c create mode 100644 drivers/scsi/fnic/vnic_wq_copy.h create mode 100644 drivers/scsi/fnic/wq_enet_desc.h Merging net-current/master $ git merge net-current/master Already uptodate! Merge made by recursive. Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Merge made by recursive. fs/sysfs/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/class/cdc-acm.c | 3 +++ drivers/usb/gadget/atmel_usba_udc.c | 5 +++-- drivers/usb/host/isp1760-hcd.c | 24 ++++++++++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Merge made by recursive. arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 + arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Removing arch/arm/include/asm/hardware/arm_twd.h Removing arch/arm/mach-ep93xx/edb9302.c Removing arch/arm/mach-ep93xx/edb9302a.c Removing arch/arm/mach-ep93xx/edb9307.c Removing arch/arm/mach-ep93xx/edb9307a.c Removing arch/arm/mach-ep93xx/edb9312.c Removing arch/arm/mach-ep93xx/edb9315.c Removing arch/arm/mach-ep93xx/edb9315a.c Auto-merging arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h Removing arch/arm/mach-realview/include/mach/scu.h Auto-merging arch/arm/plat-s3c64xx/gpiolib.c Merge made by recursive. arch/arm/Kconfig | 184 ++- arch/arm/Makefile | 121 +- arch/arm/common/Kconfig | 7 + arch/arm/common/vic.c | 221 +++- arch/arm/configs/stmp378x_defconfig | 1141 +++++++++++++++ arch/arm/configs/stmp37xx_defconfig | 1002 +++++++++++++ arch/arm/include/asm/hardware/arm_twd.h | 21 - arch/arm/include/asm/hardware/vic.h | 2 +- arch/arm/include/asm/localtimer.h | 63 + arch/arm/include/asm/pgtable.h | 2 +- arch/arm/include/asm/smp.h | 40 - arch/arm/include/asm/smp_scu.h | 7 + arch/arm/include/asm/smp_twd.h | 12 + arch/arm/kernel/Makefile | 2 + arch/arm/kernel/smp.c | 56 +- arch/arm/kernel/smp_scu.c | 41 + arch/arm/kernel/smp_twd.c | 175 +++ arch/arm/mach-at91/clock.c | 151 ++- arch/arm/mach-at91/include/mach/at91_pmc.h | 26 +- arch/arm/mach-ep93xx/Kconfig | 52 +- arch/arm/mach-ep93xx/Makefile | 8 +- arch/arm/mach-ep93xx/core.c | 19 +- arch/arm/mach-ep93xx/edb9302.c | 68 - arch/arm/mach-ep93xx/edb9302a.c | 68 - arch/arm/mach-ep93xx/edb9307.c | 68 - arch/arm/mach-ep93xx/edb9307a.c | 80 -- arch/arm/mach-ep93xx/edb9312.c | 69 - arch/arm/mach-ep93xx/edb9315.c | 68 - arch/arm/mach-ep93xx/edb9315a.c | 68 - arch/arm/mach-ep93xx/edb93xx.c | 217 +++ arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 + arch/arm/mach-netx/generic.c | 2 +- arch/arm/mach-realview/Makefile | 3 +- arch/arm/mach-realview/core.h | 3 - arch/arm/mach-realview/include/mach/scu.h | 13 - arch/arm/mach-realview/localtimer.c | 188 +--- arch/arm/mach-realview/platsmp.c | 45 +- arch/arm/mach-realview/realview_eb.c | 1 + arch/arm/mach-realview/realview_pb11mp.c | 1 + arch/arm/mach-s3c2410/Kconfig | 8 + arch/arm/mach-s3c2410/include/mach/map.h | 2 +- arch/arm/mach-s3c2412/Kconfig | 3 + arch/arm/mach-s3c2440/Kconfig | 5 + arch/arm/mach-s3c6400/Kconfig | 25 +- arch/arm/mach-s3c6400/Makefile | 10 +- arch/arm/mach-s3c6400/include/mach/map.h | 3 + arch/arm/mach-s3c6400/include/mach/regs-clock.h | 16 + arch/arm/mach-s3c6400/mach-smdk6400.c | 96 ++ arch/arm/mach-s3c6400/s3c6400.c | 89 ++ arch/arm/mach-s3c6400/setup-sdhci.c | 63 + arch/arm/mach-s3c6410/Kconfig | 36 + arch/arm/mach-s3c6410/Makefile | 4 + arch/arm/mach-s3c6410/cpu.c | 3 +- arch/arm/mach-s3c6410/mach-anw6410.c | 245 ++++ arch/arm/mach-s3c6410/mach-ncp.c | 107 ++ arch/arm/mach-s3c6410/mach-smdk6410.c | 197 +++ arch/arm/mach-s3c6410/setup-sdhci.c | 34 - arch/arm/mach-stmp378x/Makefile | 2 + arch/arm/mach-stmp378x/Makefile.boot | 3 + arch/arm/mach-stmp378x/include/mach/entry-macro.S | 35 + arch/arm/mach-stmp378x/include/mach/irqs.h | 95 ++ arch/arm/mach-stmp378x/include/mach/pins.h | 151 ++ arch/arm/mach-stmp378x/include/mach/regs-apbh.h | 88 ++ arch/arm/mach-stmp378x/include/mach/regs-apbx.h | 79 + arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h | 276 ++++ arch/arm/mach-stmp378x/include/mach/regs-icoll.h | 213 +++ arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h | 143 ++ arch/arm/mach-stmp378x/include/mach/regs-power.h | 32 + arch/arm/mach-stmp378x/include/mach/regs-timrot.h | 216 +++ arch/arm/mach-stmp378x/stmp378x.c | 225 +++ arch/arm/mach-stmp378x/stmp378x.h | 24 + arch/arm/mach-stmp378x/stmp378x_devb.c | 80 ++ arch/arm/mach-stmp37xx/Makefile | 2 + arch/arm/mach-stmp37xx/Makefile.boot | 3 + arch/arm/mach-stmp37xx/include/mach/entry-macro.S | 37 + arch/arm/mach-stmp37xx/include/mach/irqs.h | 99 ++ arch/arm/mach-stmp37xx/include/mach/pins.h | 147 ++ arch/arm/mach-stmp37xx/include/mach/regs-apbh.h | 102 ++ arch/arm/mach-stmp37xx/include/mach/regs-apbx.h | 109 ++ arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h | 85 ++ arch/arm/mach-stmp37xx/include/mach/regs-icoll.h | 36 + arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h | 159 +++ arch/arm/mach-stmp37xx/include/mach/regs-power.h | 31 + arch/arm/mach-stmp37xx/include/mach/regs-timrot.h | 52 + arch/arm/mach-stmp37xx/stmp37xx.c | 217 +++ arch/arm/mach-stmp37xx/stmp37xx.h | 24 + arch/arm/mach-stmp37xx/stmp37xx_devb.c | 83 ++ arch/arm/mach-u300/Kconfig | 105 ++ arch/arm/mach-u300/Makefile | 11 + arch/arm/mach-u300/clock.c | 1487 ++++++++++++++++++++ arch/arm/mach-u300/clock.h | 53 + arch/arm/mach-u300/core.c | 649 +++++++++ arch/arm/mach-u300/gpio.c | 701 +++++++++ arch/arm/mach-u300/include/mach/clkdev.h | 7 + arch/arm/mach-u300/include/mach/debug-macro.S | 22 + arch/arm/mach-u300/include/mach/entry-macro.S | 40 + arch/arm/mach-u300/include/mach/gpio.h | 290 ++++ arch/arm/mach-u300/include/mach/hardware.h | 5 + arch/arm/mach-u300/include/mach/io.h | 20 + arch/arm/mach-u300/include/mach/irqs.h | 114 ++ arch/arm/mach-u300/include/mach/memory.h | 42 + arch/arm/mach-u300/include/mach/platform.h | 19 + arch/arm/mach-u300/include/mach/syscon.h | 644 +++++++++ arch/arm/mach-u300/include/mach/system.h | 42 + arch/arm/mach-u300/include/mach/timex.h | 17 + arch/arm/mach-u300/include/mach/u300-regs.h | 187 +++ arch/arm/mach-u300/include/mach/uncompress.h | 46 + arch/arm/mach-u300/include/mach/vmalloc.h | 12 + arch/arm/mach-u300/mmc.c | 216 +++ arch/arm/mach-u300/mmc.h | 18 + arch/arm/mach-u300/padmux.c | 58 + arch/arm/mach-u300/padmux.h | 19 + arch/arm/mach-u300/timer.c | 422 ++++++ arch/arm/mach-u300/u300.c | 55 + arch/arm/mach-versatile/core.c | 2 +- arch/arm/mach-w90x900/include/mach/irqs.h | 49 +- arch/arm/mach-w90x900/include/mach/map.h | 101 ++- arch/arm/mach-w90x900/include/mach/regs-clock.h | 31 + arch/arm/mach-w90x900/include/mach/regs-usb.h | 35 + arch/arm/mach-w90x900/mach-w90p910evb.c | 89 ++- arch/arm/mach-w90x900/w90p910.c | 9 +- arch/arm/mm/mmu.c | 14 + arch/arm/plat-s3c/Kconfig | 14 + arch/arm/plat-s3c/Makefile | 2 + arch/arm/plat-s3c/dev-usb.c | 50 + arch/arm/plat-s3c/gpio.c | 11 +- arch/arm/plat-s3c/include/plat/clock.h | 1 + arch/arm/plat-s3c/include/plat/cpu.h | 3 + arch/arm/plat-s3c/include/plat/gpio-core.h | 30 + arch/arm/plat-s3c/include/plat/pm.h | 15 + arch/arm/plat-s3c/include/plat/regs-serial.h | 5 + arch/arm/plat-s3c/include/plat/sdhci.h | 50 +- arch/arm/plat-s3c/pm-gpio.c | 380 +++++ arch/arm/plat-s3c/pm.c | 19 +- arch/arm/plat-s3c24xx/devs.c | 30 - arch/arm/plat-s3c24xx/gpiolib.c | 8 + arch/arm/plat-s3c24xx/include/plat/map.h | 1 - arch/arm/plat-s3c24xx/include/plat/pm-core.h | 5 + arch/arm/plat-s3c24xx/pm.c | 213 --- arch/arm/plat-s3c64xx/Kconfig | 6 + arch/arm/plat-s3c64xx/Makefile | 7 + arch/arm/plat-s3c64xx/clock.c | 19 + arch/arm/plat-s3c64xx/cpu.c | 27 + arch/arm/plat-s3c64xx/gpiolib.c | 10 +- arch/arm/plat-s3c64xx/include/plat/irqs.h | 1 + arch/arm/plat-s3c64xx/include/plat/pm-core.h | 98 ++ arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 1 + arch/arm/plat-s3c64xx/include/plat/s3c6400.h | 3 +- arch/arm/plat-s3c64xx/irq-eint.c | 3 + arch/arm/plat-s3c64xx/irq-pm.c | 111 ++ arch/arm/plat-s3c64xx/irq.c | 9 +- arch/arm/plat-s3c64xx/pm.c | 175 +++ arch/arm/plat-s3c64xx/s3c6400-clock.c | 106 ++- arch/arm/plat-s3c64xx/setup-sdhci-gpio.c | 55 + arch/arm/plat-s3c64xx/sleep.S | 144 ++ arch/arm/plat-stmp3xxx/Kconfig | 37 + arch/arm/plat-stmp3xxx/Makefile | 5 + arch/arm/plat-stmp3xxx/clock.c | 1112 +++++++++++++++ arch/arm/plat-stmp3xxx/clock.h | 61 + arch/arm/plat-stmp3xxx/core.c | 127 ++ arch/arm/plat-stmp3xxx/dma.c | 462 ++++++ arch/arm/plat-stmp3xxx/include/mach/clkdev.h | 18 + arch/arm/plat-stmp3xxx/include/mach/cputype.h | 33 + arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 42 + arch/arm/plat-stmp3xxx/include/mach/dma.h | 155 ++ arch/arm/plat-stmp3xxx/include/mach/gpio.h | 28 + arch/arm/plat-stmp3xxx/include/mach/hardware.h | 32 + arch/arm/plat-stmp3xxx/include/mach/io.h | 25 + arch/arm/plat-stmp3xxx/include/mach/memory.h | 22 + arch/arm/plat-stmp3xxx/include/mach/pinmux.h | 158 +++ arch/arm/plat-stmp3xxx/include/mach/pins.h | 30 + arch/arm/plat-stmp3xxx/include/mach/platform.h | 47 + arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h | 34 + .../arm/plat-stmp3xxx/include/mach/stmp3xxx_regs.h | 195 +++ arch/arm/plat-stmp3xxx/include/mach/system.h | 47 + arch/arm/plat-stmp3xxx/include/mach/timex.h | 20 + arch/arm/plat-stmp3xxx/include/mach/uncompress.h | 53 + arch/arm/plat-stmp3xxx/include/mach/vmalloc.h | 12 + arch/arm/plat-stmp3xxx/irq.c | 59 + arch/arm/plat-stmp3xxx/pinmux.c | 545 +++++++ arch/arm/plat-stmp3xxx/timer.c | 172 +++ drivers/rtc/rtc-ep93xx.c | 149 ++- 182 files changed, 17676 insertions(+), 1357 deletions(-) create mode 100644 arch/arm/configs/stmp378x_defconfig create mode 100644 arch/arm/configs/stmp37xx_defconfig delete mode 100644 arch/arm/include/asm/hardware/arm_twd.h create mode 100644 arch/arm/include/asm/localtimer.h create mode 100644 arch/arm/include/asm/smp_scu.h create mode 100644 arch/arm/include/asm/smp_twd.h create mode 100644 arch/arm/kernel/smp_scu.c create mode 100644 arch/arm/kernel/smp_twd.c delete mode 100644 arch/arm/mach-ep93xx/edb9302.c delete mode 100644 arch/arm/mach-ep93xx/edb9302a.c delete mode 100644 arch/arm/mach-ep93xx/edb9307.c delete mode 100644 arch/arm/mach-ep93xx/edb9307a.c delete mode 100644 arch/arm/mach-ep93xx/edb9312.c delete mode 100644 arch/arm/mach-ep93xx/edb9315.c delete mode 100644 arch/arm/mach-ep93xx/edb9315a.c create mode 100644 arch/arm/mach-ep93xx/edb93xx.c delete mode 100644 arch/arm/mach-realview/include/mach/scu.h create mode 100644 arch/arm/mach-s3c6400/include/mach/regs-clock.h create mode 100644 arch/arm/mach-s3c6400/mach-smdk6400.c create mode 100644 arch/arm/mach-s3c6400/s3c6400.c create mode 100644 arch/arm/mach-s3c6400/setup-sdhci.c create mode 100644 arch/arm/mach-s3c6410/mach-anw6410.c create mode 100644 arch/arm/mach-s3c6410/mach-ncp.c create mode 100644 arch/arm/mach-stmp378x/Makefile create mode 100644 arch/arm/mach-stmp378x/Makefile.boot create mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S create mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h create mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h create mode 100644 arch/arm/mach-stmp378x/stmp378x.c create mode 100644 arch/arm/mach-stmp378x/stmp378x.h create mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c create mode 100644 arch/arm/mach-stmp37xx/Makefile create mode 100644 arch/arm/mach-stmp37xx/Makefile.boot create mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S create mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h create mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c create mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h create mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c create mode 100644 arch/arm/mach-u300/Kconfig create mode 100644 arch/arm/mach-u300/Makefile create mode 100644 arch/arm/mach-u300/clock.c create mode 100644 arch/arm/mach-u300/clock.h create mode 100644 arch/arm/mach-u300/core.c create mode 100644 arch/arm/mach-u300/gpio.c create mode 100644 arch/arm/mach-u300/include/mach/clkdev.h create mode 100644 arch/arm/mach-u300/include/mach/debug-macro.S create mode 100644 arch/arm/mach-u300/include/mach/entry-macro.S create mode 100644 arch/arm/mach-u300/include/mach/gpio.h create mode 100644 arch/arm/mach-u300/include/mach/hardware.h create mode 100644 arch/arm/mach-u300/include/mach/io.h create mode 100644 arch/arm/mach-u300/include/mach/irqs.h create mode 100644 arch/arm/mach-u300/include/mach/memory.h create mode 100644 arch/arm/mach-u300/include/mach/platform.h create mode 100644 arch/arm/mach-u300/include/mach/syscon.h create mode 100644 arch/arm/mach-u300/include/mach/system.h create mode 100644 arch/arm/mach-u300/include/mach/timex.h create mode 100644 arch/arm/mach-u300/include/mach/u300-regs.h create mode 100644 arch/arm/mach-u300/include/mach/uncompress.h create mode 100644 arch/arm/mach-u300/include/mach/vmalloc.h create mode 100644 arch/arm/mach-u300/mmc.c create mode 100644 arch/arm/mach-u300/mmc.h create mode 100644 arch/arm/mach-u300/padmux.c create mode 100644 arch/arm/mach-u300/padmux.h create mode 100644 arch/arm/mach-u300/timer.c create mode 100644 arch/arm/mach-u300/u300.c create mode 100644 arch/arm/mach-w90x900/include/mach/regs-clock.h create mode 100644 arch/arm/mach-w90x900/include/mach/regs-usb.h create mode 100644 arch/arm/plat-s3c/dev-usb.c create mode 100644 arch/arm/plat-s3c/pm-gpio.c create mode 100644 arch/arm/plat-s3c64xx/include/plat/pm-core.h create mode 100644 arch/arm/plat-s3c64xx/irq-pm.c create mode 100644 arch/arm/plat-s3c64xx/pm.c create mode 100644 arch/arm/plat-s3c64xx/setup-sdhci-gpio.c create mode 100644 arch/arm/plat-s3c64xx/sleep.S create mode 100644 arch/arm/plat-stmp3xxx/Kconfig create mode 100644 arch/arm/plat-stmp3xxx/Makefile create mode 100644 arch/arm/plat-stmp3xxx/clock.c create mode 100644 arch/arm/plat-stmp3xxx/clock.h create mode 100644 arch/arm/plat-stmp3xxx/core.c create mode 100644 arch/arm/plat-stmp3xxx/dma.c create mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S create mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx_regs.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h create mode 100644 arch/arm/plat-stmp3xxx/irq.c create mode 100644 arch/arm/plat-stmp3xxx/pinmux.c create mode 100644 arch/arm/plat-stmp3xxx/timer.c Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/boards/merisc/setup.c | 7 ++++--- arch/avr32/include/asm/hw_irq.h | 2 +- drivers/mmc/host/atmel-mci.c | 12 +++++++++--- include/linux/atmel-mci.h | 2 ++ 4 files changed, 16 insertions(+), 7 deletions(-) Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Merge made by recursive. drivers/rtc/Kconfig | 19 +++ drivers/rtc/Makefile | 2 + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ 4 files changed, 511 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-msm6242.c create mode 100644 drivers/rtc/rtc-rp5c01.c Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/checksum_mm.h Removing arch/m68k/include/asm/checksum_no.h Removing arch/m68k/include/asm/dma_mm.h Removing arch/m68k/include/asm/dma_no.h Removing arch/m68k/include/asm/hardirq_mm.h Removing arch/m68k/include/asm/hardirq_no.h Removing arch/m68k/include/asm/irq_mm.h Removing arch/m68k/include/asm/irq_no.h Removing arch/m68k/include/asm/processor_mm.h Removing arch/m68k/include/asm/processor_no.h Merge made by recursive. arch/m68k/include/asm/checksum.h | 160 ++++++++- arch/m68k/include/asm/checksum_mm.h | 148 -------- arch/m68k/include/asm/checksum_no.h | 132 ------- arch/m68k/include/asm/dma.h | 493 +++++++++++++++++++++++++- arch/m68k/include/asm/dma_mm.h | 16 - arch/m68k/include/asm/dma_no.h | 494 -------------------------- arch/m68k/include/asm/hardirq.h | 21 +- arch/m68k/include/asm/hardirq_mm.h | 16 - arch/m68k/include/asm/hardirq_no.h | 27 -- arch/m68k/include/asm/irq.h | 135 +++++++- arch/m68k/include/asm/irq_mm.h | 126 ------- arch/m68k/include/asm/irq_no.h | 26 -- arch/m68k/include/asm/m520xsim.h | 28 ++- arch/m68k/include/asm/m523xsim.h | 9 + arch/m68k/include/asm/m527xsim.h | 9 + arch/m68k/include/asm/m528xsim.h | 8 + arch/m68k/include/asm/m532xsim.h | 55 +-- arch/m68k/include/asm/mcfsim.h | 14 - arch/m68k/include/asm/processor.h | 171 +++++++++- arch/m68k/include/asm/processor_mm.h | 130 ------- arch/m68k/include/asm/processor_no.h | 143 -------- arch/m68k/include/asm/system_no.h | 107 ------ arch/m68knommu/kernel/entry.S | 1 - arch/m68knommu/kernel/irq.c | 21 -- arch/m68knommu/lib/checksum.c | 9 - arch/m68knommu/platform/5206/config.c | 18 +- arch/m68knommu/platform/5206e/config.c | 18 +- arch/m68knommu/platform/520x/config.c | 35 +-- arch/m68knommu/platform/523x/config.c | 69 +---- arch/m68knommu/platform/5249/config.c | 18 +- arch/m68knommu/platform/5272/config.c | 18 +- arch/m68knommu/platform/527x/config.c | 54 +--- arch/m68knommu/platform/528x/config.c | 54 +--- arch/m68knommu/platform/5307/config.c | 16 +- arch/m68knommu/platform/532x/config.c | 44 +-- arch/m68knommu/platform/5407/config.c | 16 +- arch/m68knommu/platform/68328/ints.c | 72 ++-- arch/m68knommu/platform/68360/ints.c | 44 ++- arch/m68knommu/platform/coldfire/Makefile | 22 +- arch/m68knommu/platform/coldfire/intc-2.c | 93 +++++ arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ arch/m68knommu/platform/coldfire/intc.c | 55 +++ arch/m68knommu/platform/coldfire/pit.c | 8 - arch/m68knommu/platform/coldfire/vectors.c | 27 +-- 44 files changed, 1439 insertions(+), 1819 deletions(-) delete mode 100644 arch/m68k/include/asm/checksum_mm.h delete mode 100644 arch/m68k/include/asm/checksum_no.h delete mode 100644 arch/m68k/include/asm/dma_mm.h delete mode 100644 arch/m68k/include/asm/dma_no.h delete mode 100644 arch/m68k/include/asm/hardirq_mm.h delete mode 100644 arch/m68k/include/asm/hardirq_no.h delete mode 100644 arch/m68k/include/asm/irq_mm.h delete mode 100644 arch/m68k/include/asm/irq_no.h delete mode 100644 arch/m68k/include/asm/processor_mm.h delete mode 100644 arch/m68k/include/asm/processor_no.h create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c create mode 100644 arch/m68knommu/platform/coldfire/intc.c Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Auto-merging arch/mips/Kconfig Auto-merging arch/mips/mm/c-r4k.c Auto-merging arch/mips/mm/dma-default.c Auto-merging arch/mips/txx9/generic/setup_tx4927.c Auto-merging arch/mips/txx9/generic/setup_tx4938.c Auto-merging arch/mips/txx9/generic/setup_tx4939.c Auto-merging arch/mips/txx9/rbtx4939/setup.c Merge made by recursive. arch/mips/Kconfig | 2 + arch/mips/cavium-octeon/Makefile | 4 + arch/mips/cavium-octeon/dma-octeon.c | 311 +++- arch/mips/cavium-octeon/executive/Makefile | 1 + .../cavium-octeon/executive/cvmx-helper-errata.c | 70 + .../cavium-octeon/executive/cvmx-helper-jtag.c | 144 ++ arch/mips/cavium-octeon/msi.c | 288 +++ arch/mips/cavium-octeon/octeon-irq.c | 2 + arch/mips/cavium-octeon/pci-common.c | 137 ++ arch/mips/cavium-octeon/pci-common.h | 39 + arch/mips/cavium-octeon/pci.c | 568 +++++ arch/mips/cavium-octeon/pcie.c | 1370 +++++++++++ .../include/asm/mach-cavium-octeon/dma-coherence.h | 6 +- arch/mips/include/asm/mach-generic/dma-coherence.h | 6 +- arch/mips/include/asm/mach-ip27/dma-coherence.h | 6 +- arch/mips/include/asm/mach-ip32/dma-coherence.h | 6 +- arch/mips/include/asm/mach-jazz/dma-coherence.h | 6 +- arch/mips/include/asm/mach-lemote/dma-coherence.h | 6 +- arch/mips/include/asm/octeon/cvmx-helper-errata.h | 33 + arch/mips/include/asm/octeon/cvmx-helper-jtag.h | 43 + arch/mips/include/asm/octeon/cvmx-npei-defs.h | 2560 ++++++++++++++++++++ arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1735 +++++++++++++ arch/mips/include/asm/octeon/cvmx-pci-defs.h | 1645 +++++++++++++ arch/mips/include/asm/octeon/cvmx-pcieep-defs.h | 1365 +++++++++++ arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1397 +++++++++++ arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 410 ++++ arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 229 ++ arch/mips/include/asm/octeon/cvmx.h | 12 + arch/mips/include/asm/octeon/octeon.h | 2 + arch/mips/include/asm/r4kcache.h | 1 + arch/mips/include/asm/txx9/dmac.h | 51 + arch/mips/include/asm/txx9/tx4927.h | 2 + arch/mips/include/asm/txx9/tx4938.h | 1 + arch/mips/include/asm/txx9/tx4939.h | 1 + arch/mips/kernel/cevt-txx9.c | 67 +- arch/mips/mm/c-r4k.c | 12 + arch/mips/mm/dma-default.c | 23 +- arch/mips/txx9/generic/setup.c | 55 + arch/mips/txx9/generic/setup_tx4927.c | 12 + arch/mips/txx9/generic/setup_tx4938.c | 21 +- arch/mips/txx9/generic/setup_tx4939.c | 21 +- arch/mips/txx9/rbtx4927/setup.c | 4 + arch/mips/txx9/rbtx4938/setup.c | 1 + arch/mips/txx9/rbtx4939/setup.c | 1 + drivers/dma/Kconfig | 8 + drivers/dma/Makefile | 1 + drivers/dma/txx9dmac.c | 1354 +++++++++++ drivers/dma/txx9dmac.h | 307 +++ 48 files changed, 14287 insertions(+), 59 deletions(-) create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-errata.c create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-jtag.c create mode 100644 arch/mips/cavium-octeon/msi.c create mode 100644 arch/mips/cavium-octeon/pci-common.c create mode 100644 arch/mips/cavium-octeon/pci-common.h create mode 100644 arch/mips/cavium-octeon/pci.c create mode 100644 arch/mips/cavium-octeon/pcie.c create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-errata.h create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-jtag.h create mode 100644 arch/mips/include/asm/octeon/cvmx-npei-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-npi-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pci-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pcieep-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pciercx-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pescx-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pexp-defs.h create mode 100644 arch/mips/include/asm/txx9/dmac.h create mode 100644 drivers/dma/txx9dmac.c create mode 100644 drivers/dma/txx9dmac.h Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Merge made by recursive. arch/powerpc/configs/40x/acadia_defconfig | 2 +- arch/powerpc/configs/40x/ep405_defconfig | 2 +- arch/powerpc/configs/40x/kilauea_defconfig | 2 +- arch/powerpc/configs/40x/makalu_defconfig | 2 +- arch/powerpc/configs/40x/virtex_defconfig | 2 +- arch/powerpc/configs/44x/arches_defconfig | 2 +- arch/powerpc/configs/44x/bamboo_defconfig | 2 +- arch/powerpc/configs/44x/canyonlands_defconfig | 6 +++--- arch/powerpc/configs/44x/ebony_defconfig | 2 +- arch/powerpc/configs/44x/katmai_defconfig | 2 +- arch/powerpc/configs/44x/rainier_defconfig | 2 +- arch/powerpc/configs/44x/redwood_defconfig | 2 +- arch/powerpc/configs/44x/sam440ep_defconfig | 2 +- arch/powerpc/configs/44x/sequoia_defconfig | 2 +- arch/powerpc/configs/44x/taishan_defconfig | 2 +- arch/powerpc/configs/44x/virtex5_defconfig | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) Merging galak/next $ git merge galak/next Removing arch/powerpc/include/asm/mpc86xx.h Merge made by recursive. Documentation/powerpc/dts-bindings/ecm.txt | 64 ++ .../powerpc/dts-bindings/fsl/cpm_qe/qe.txt | 3 + Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 5 +- Documentation/powerpc/dts-bindings/fsl/mcm.txt | 64 ++ arch/powerpc/boot/dts/gef_ppc9a.dts | 14 +- arch/powerpc/boot/dts/gef_sbc310.dts | 14 +- arch/powerpc/boot/dts/gef_sbc610.dts | 14 +- arch/powerpc/boot/dts/ksi8560.dts | 13 + arch/powerpc/boot/dts/mpc832x_mds.dts | 3 +- arch/powerpc/boot/dts/mpc832x_rdb.dts | 3 +- arch/powerpc/boot/dts/mpc8349emitx.dts | 2 - arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - arch/powerpc/boot/dts/mpc834x_mds.dts | 2 - arch/powerpc/boot/dts/mpc836x_mds.dts | 3 +- arch/powerpc/boot/dts/mpc836x_rdk.dts | 2 + arch/powerpc/boot/dts/mpc8377_mds.dts | 1 - arch/powerpc/boot/dts/mpc8378_mds.dts | 1 - arch/powerpc/boot/dts/mpc8379_mds.dts | 1 - arch/powerpc/boot/dts/mpc8536ds.dts | 18 +- arch/powerpc/boot/dts/mpc8540ads.dts | 15 +- arch/powerpc/boot/dts/mpc8541cds.dts | 16 +- arch/powerpc/boot/dts/mpc8544ds.dts | 18 +- arch/powerpc/boot/dts/mpc8548cds.dts | 17 +- arch/powerpc/boot/dts/mpc8555cds.dts | 16 +- arch/powerpc/boot/dts/mpc8560ads.dts | 15 +- arch/powerpc/boot/dts/mpc8568mds.dts | 51 ++- arch/powerpc/boot/dts/mpc8569mds.dts | 583 ++++++++++++++++ arch/powerpc/boot/dts/mpc8572ds.dts | 17 +- arch/powerpc/boot/dts/mpc8572ds_36b.dts | 39 +- arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 16 +- arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 2 - arch/powerpc/boot/dts/mpc8610_hpcd.dts | 16 +- arch/powerpc/boot/dts/mpc8641_hpcn.dts | 16 +- arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts | 609 +++++++++++++++++ arch/powerpc/boot/dts/p2020ds.dts | 704 ++++++++++++++++++++ arch/powerpc/boot/dts/sbc8349.dts | 1 - arch/powerpc/boot/dts/sbc8548.dts | 16 +- arch/powerpc/boot/dts/sbc8560.dts | 15 +- arch/powerpc/boot/dts/sbc8641d.dts | 16 +- arch/powerpc/boot/dts/socrates.dts | 15 +- arch/powerpc/boot/dts/stx_gp3_8560.dts | 15 +- arch/powerpc/boot/dts/tqm8540.dts | 15 +- arch/powerpc/boot/dts/tqm8541.dts | 15 +- arch/powerpc/boot/dts/tqm8548-bigflash.dts | 16 +- arch/powerpc/boot/dts/tqm8548.dts | 16 +- arch/powerpc/boot/dts/tqm8555.dts | 15 +- arch/powerpc/boot/dts/tqm8560.dts | 15 +- arch/powerpc/include/asm/cpm1.h | 2 - arch/powerpc/include/asm/cpm2.h | 4 - arch/powerpc/include/asm/mpc86xx.h | 33 - arch/powerpc/include/asm/pci-bridge.h | 6 +- arch/powerpc/include/asm/qe.h | 21 +- arch/powerpc/oprofile/op_model_fsl_emb.c | 14 - arch/powerpc/platforms/82xx/pq2ads.h | 13 - arch/powerpc/platforms/85xx/Kconfig | 1 + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 43 ++- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 52 ++- arch/powerpc/platforms/86xx/gef_ppc9a.c | 1 - arch/powerpc/platforms/86xx/gef_sbc310.c | 1 - arch/powerpc/platforms/86xx/gef_sbc610.c | 1 - arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 1 - arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 - arch/powerpc/platforms/86xx/mpc86xx_smp.c | 8 +- arch/powerpc/platforms/86xx/sbc8641d.c | 1 - arch/powerpc/platforms/8xx/mpc885ads.h | 4 - arch/powerpc/platforms/fsl_uli1575.c | 24 +- arch/powerpc/sysdev/cpm2.c | 2 +- arch/powerpc/sysdev/fsl_msi.c | 9 +- arch/powerpc/sysdev/fsl_pci.c | 132 ++++- arch/powerpc/sysdev/fsl_pci.h | 6 +- arch/powerpc/sysdev/fsl_rio.c | 15 +- arch/powerpc/sysdev/fsl_soc.c | 14 +- arch/powerpc/sysdev/qe_lib/qe.c | 75 ++- drivers/dma/fsldma.c | 13 +- drivers/net/ucc_geth.c | 24 +- drivers/net/ucc_geth.h | 4 +- drivers/of/base.c | 1 + drivers/rapidio/rio-scan.c | 6 +- include/linux/pci_ids.h | 4 + 79 files changed, 2810 insertions(+), 274 deletions(-) create mode 100644 Documentation/powerpc/dts-bindings/ecm.txt create mode 100644 Documentation/powerpc/dts-bindings/fsl/mcm.txt create mode 100644 arch/powerpc/boot/dts/mpc8569mds.dts create mode 100644 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts create mode 100644 arch/powerpc/boot/dts/p2020ds.dts delete mode 100644 arch/powerpc/include/asm/mpc86xx.h Merging pxa/for-next $ git merge pxa/for-next Recorded preimage for 'arch/arm/mach-pxa/viper.c' Auto-merging arch/arm/kernel/sys_oabi-compat.c Auto-merging arch/arm/mach-pxa/Kconfig Auto-merging arch/arm/mach-pxa/corgi.c Auto-merging arch/arm/mach-pxa/littleton.c Auto-merging arch/arm/mach-pxa/spitz.c Auto-merging arch/arm/mach-pxa/viper.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/viper.c Auto-merging arch/arm/mach-pxa/zylonite_pxa300.c Auto-merging drivers/i2c/busses/i2c-pxa.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-pxa/viper.c'. [master 5075256] Merge commit 'pxa/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-mmp/include/mach/irqs.h | 1 + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 27 +++++ arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 8 ++ arch/arm/mach-mmp/include/mach/pxa168.h | 44 +++++++ arch/arm/mach-mmp/include/mach/pxa910.h | 44 +++++++ arch/arm/mach-mmp/include/mach/regs-apbc.h | 14 ++- arch/arm/mach-mmp/pxa168.c | 18 +++ arch/arm/mach-mmp/pxa910.c | 18 +++ arch/arm/mach-pxa/Kconfig | 7 +- arch/arm/mach-pxa/Makefile | 1 - arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/corgi.c | 47 +------- arch/arm/mach-pxa/csb726.c | 18 +++- arch/arm/mach-pxa/devices.c | 4 +- arch/arm/mach-pxa/em-x270.c | 2 +- arch/arm/mach-pxa/ezx.c | 2 +- arch/arm/mach-pxa/imote2.c | 21 +--- arch/arm/mach-pxa/include/mach/irqs.h | 16 ++- arch/arm/mach-pxa/littleton.c | 19 +--- arch/arm/mach-pxa/magician.c | 12 ++- arch/arm/mach-pxa/mainstone.c | 2 +- arch/arm/mach-pxa/mioa701.c | 2 +- arch/arm/mach-pxa/palmt5.c | 14 ++- arch/arm/mach-pxa/palmte2.c | 32 +++++- arch/arm/mach-pxa/palmtx.c | 14 ++- arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- arch/arm/mach-pxa/poodle.c | 17 +--- arch/arm/mach-pxa/pxa27x.c | 2 +- arch/arm/mach-pxa/pxa3xx.c | 4 +- arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-pxa/spitz.c | 55 +--------- arch/arm/mach-pxa/tosa.c | 2 +- arch/arm/mach-pxa/trizeps4.c | 2 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- arch/arm/plat-pxa/Makefile | 2 + .../include/mach => plat-pxa/include/plat}/i2c.h | 0 arch/arm/{mach-pxa => plat-pxa}/pwm.c | 119 +++++++++----------- drivers/i2c/busses/i2c-pxa.c | 22 +++- sound/soc/pxa/Kconfig | 7 +- sound/soc/pxa/palm27x.c | 2 +- 41 files changed, 365 insertions(+), 266 deletions(-) rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/i2c.h (100%) rename arch/arm/{mach-pxa => plat-pxa}/pwm.c (77%) Merging s390/features $ git merge s390/features Removing arch/s390/include/asm/cpu.h Merge made by recursive. arch/s390/Kconfig | 18 ++ arch/s390/include/asm/compat.h | 19 ++- arch/s390/include/asm/cpu.h | 32 ---- arch/s390/include/asm/cputime.h | 19 ++ arch/s390/include/asm/lowcore.h | 1 + arch/s390/include/asm/seccomp.h | 16 ++ arch/s390/include/asm/spinlock.h | 19 ++- arch/s390/include/asm/thread_info.h | 10 +- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/entry.S | 5 +- arch/s390/kernel/entry64.S | 5 +- arch/s390/kernel/head.S | 65 +++++-- arch/s390/kernel/nmi.c | 2 +- arch/s390/kernel/process.c | 3 +- arch/s390/kernel/ptrace.c | 16 +- arch/s390/kernel/s390_ext.c | 2 +- arch/s390/kernel/sclp.S | 327 +++++++++++++++++++++++++++++++++++ arch/s390/kernel/signal.c | 3 +- arch/s390/kernel/smp.c | 2 +- arch/s390/kernel/vdso.c | 16 ++- arch/s390/kernel/vtime.c | 2 +- arch/s390/lib/spinlock.c | 40 +++++ arch/s390/mm/fault.c | 3 +- arch/s390/mm/mmap.c | 11 +- drivers/s390/cio/cio.c | 2 +- drivers/s390/cio/device_ops.c | 24 +-- drivers/s390/cio/qdio_main.c | 44 ++---- 27 files changed, 572 insertions(+), 136 deletions(-) delete mode 100644 arch/s390/include/asm/cpu.h create mode 100644 arch/s390/include/asm/seccomp.h create mode 100644 arch/s390/kernel/sclp.S Merging sh/master $ git merge sh/master Removing arch/sh/boards/mach-se/7751/pci.c Removing arch/sh/boot/compressed/Makefile_32 Removing arch/sh/boot/compressed/Makefile_64 Removing arch/sh/boot/compressed/vmlinux_64.lds Removing arch/sh/drivers/pci/fixups-lboxre2.c Removing arch/sh/drivers/pci/fixups-se7780.c Removing arch/sh/drivers/pci/fixups-sh7785lcr.c Removing arch/sh/drivers/pci/ops-landisk.c Removing arch/sh/drivers/pci/ops-lboxre2.c Removing arch/sh/drivers/pci/ops-r7780rp.c Removing arch/sh/drivers/pci/ops-rts7751r2d.c Removing arch/sh/drivers/pci/ops-sdk7780.c Removing arch/sh/drivers/pci/ops-se7780.c Removing arch/sh/drivers/pci/ops-sh03.c Removing arch/sh/drivers/pci/ops-sh7785lcr.c Removing arch/sh/drivers/pci/ops-snapgear.c Removing arch/sh/drivers/pci/ops-titan.c Removing arch/sh/drivers/pci/pci-auto.c Removing arch/sh/include/asm/timer.h Removing arch/sh/include/cpu-sh3/cpu/timer.h Removing arch/sh/include/cpu-sh4/cpu/timer.h Removing arch/sh/kernel/time_32.c Removing arch/sh/kernel/time_64.c Removing arch/sh/kernel/timers/Makefile Removing arch/sh/kernel/timers/timer-cmt.c Removing arch/sh/kernel/timers/timer-mtu2.c Removing arch/sh/kernel/timers/timer-tmu.c Removing arch/sh/kernel/timers/timer.c Removing arch/sh/kernel/vmlinux_32.lds.S Removing arch/sh/kernel/vmlinux_64.lds.S Removing arch/sh/lib64/.gitignore Auto-merging drivers/rtc/Kconfig Removing include/linux/sh_cmt.h Merge made by recursive. arch/sh/Kconfig | 105 +- arch/sh/Kconfig.cpu | 5 - arch/sh/Kconfig.debug | 23 +- arch/sh/Makefile | 57 +- arch/sh/boards/Kconfig | 6 +- arch/sh/boards/mach-cayman/Makefile | 2 +- arch/sh/boards/mach-cayman/irq.c | 17 +- arch/sh/boards/mach-cayman/panic.c | 49 + arch/sh/boards/mach-cayman/setup.c | 2 +- arch/sh/boards/mach-dreamcast/setup.c | 6 - arch/sh/boards/mach-r2d/setup.c | 50 + arch/sh/boards/mach-se/7751/Makefile | 2 - arch/sh/boards/mach-se/7751/io.c | 16 - arch/sh/boards/mach-se/7751/pci.c | 147 -- arch/sh/boards/mach-se/7780/irq.c | 27 +- arch/sh/boards/mach-sh03/rtc.c | 10 +- arch/sh/boards/mach-snapgear/io.c | 16 - arch/sh/boards/mach-systemh/io.c | 16 - arch/sh/boards/mach-titan/io.c | 20 +- arch/sh/boot/Makefile | 6 +- arch/sh/boot/compressed/Makefile | 50 +- arch/sh/boot/compressed/Makefile_32 | 46 - arch/sh/boot/compressed/Makefile_64 | 43 - arch/sh/boot/compressed/head_64.S | 5 +- arch/sh/boot/compressed/vmlinux_64.lds | 64 - arch/sh/cchips/Kconfig | 5 - arch/sh/configs/ap325rxa_defconfig | 37 +- arch/sh/configs/cayman_defconfig | 71 +- arch/sh/configs/dreamcast_defconfig | 39 +- arch/sh/configs/edosk7705_defconfig | 29 +- arch/sh/configs/edosk7760_defconfig | 32 +- arch/sh/configs/espt_defconfig | 39 +- arch/sh/configs/hp6xx_defconfig | 35 +- arch/sh/configs/landisk_defconfig | 48 +- arch/sh/configs/lboxre2_defconfig | 44 +- arch/sh/configs/magicpanelr2_defconfig | 30 +- arch/sh/configs/microdev_defconfig | 36 +- arch/sh/configs/migor_defconfig | 36 +- arch/sh/configs/polaris_defconfig | 30 +- arch/sh/configs/r7780mp_defconfig | 38 +- arch/sh/configs/r7785rp_defconfig | 38 +- arch/sh/configs/rsk7201_defconfig | 37 +- arch/sh/configs/rsk7203_defconfig | 40 +- arch/sh/configs/rts7751r2d1_defconfig | 43 +- arch/sh/configs/rts7751r2dplus_defconfig | 130 ++- arch/sh/configs/sdk7780_defconfig | 38 +- arch/sh/configs/se7206_defconfig | 35 +- arch/sh/configs/se7343_defconfig | 42 +- arch/sh/configs/se7619_defconfig | 35 +- arch/sh/configs/se7705_defconfig | 34 +- arch/sh/configs/se7712_defconfig | 30 +- arch/sh/configs/se7721_defconfig | 33 +- arch/sh/configs/se7722_defconfig | 38 +- arch/sh/configs/se7750_defconfig | 34 +- arch/sh/configs/se7751_defconfig | 34 +- arch/sh/configs/se7780_defconfig | 38 +- arch/sh/configs/sh03_defconfig | 43 +- arch/sh/configs/sh7710voipgw_defconfig | 35 +- arch/sh/configs/sh7724_generic_defconfig | 707 +++++++ arch/sh/configs/sh7763rdp_defconfig | 35 +- arch/sh/configs/sh7770_generic_defconfig | 700 ++++++ arch/sh/configs/sh7785lcr_32bit_defconfig | 37 +- arch/sh/configs/sh7785lcr_defconfig | 6 +- arch/sh/configs/shmin_defconfig | 31 +- arch/sh/configs/shx3_defconfig | 32 +- arch/sh/configs/snapgear_defconfig | 40 +- arch/sh/configs/systemh_defconfig | 39 +- arch/sh/configs/titan_defconfig | 40 +- arch/sh/configs/ul2_defconfig | 37 +- arch/sh/configs/urquell_defconfig | 39 +- arch/sh/drivers/dma/Kconfig | 3 +- arch/sh/drivers/pci/Kconfig | 18 - arch/sh/drivers/pci/Makefile | 28 +- .../drivers/pci/{ops-cayman.c => fixups-cayman.c} | 12 - arch/sh/drivers/pci/fixups-dreamcast.c | 9 +- arch/sh/drivers/pci/fixups-landisk.c | 34 + arch/sh/drivers/pci/fixups-lboxre2.c | 41 - arch/sh/drivers/pci/fixups-r7780rp.c | 41 +- arch/sh/drivers/pci/fixups-rts7751r2d.c | 48 +- arch/sh/drivers/pci/fixups-sdk7780.c | 63 +- arch/sh/drivers/pci/fixups-se7751.c | 111 + arch/sh/drivers/pci/fixups-se7780.c | 60 - arch/sh/drivers/pci/fixups-sh7785lcr.c | 46 - arch/sh/drivers/pci/fixups-snapgear.c | 38 + arch/sh/drivers/pci/fixups-titan.c | 38 + arch/sh/drivers/pci/ops-dreamcast.c | 107 +- arch/sh/drivers/pci/ops-landisk.c | 67 - arch/sh/drivers/pci/ops-lboxre2.c | 63 - arch/sh/drivers/pci/ops-r7780rp.c | 68 - arch/sh/drivers/pci/ops-rts7751r2d.c | 74 - arch/sh/drivers/pci/ops-sdk7780.c | 73 - arch/sh/drivers/pci/ops-se7780.c | 96 - arch/sh/drivers/pci/ops-sh03.c | 45 - arch/sh/drivers/pci/ops-sh4.c | 79 +- arch/sh/drivers/pci/ops-sh5.c | 25 - arch/sh/drivers/pci/ops-sh7785lcr.c | 66 - arch/sh/drivers/pci/ops-snapgear.c | 94 - arch/sh/drivers/pci/ops-titan.c | 77 - arch/sh/drivers/pci/pci-auto.c | 545 ----- arch/sh/drivers/pci/pci-dreamcast.c | 102 + arch/sh/drivers/pci/pci-sh4.h | 19 +- arch/sh/drivers/pci/pci-sh5.c | 55 +- arch/sh/drivers/pci/pci-sh5.h | 3 - arch/sh/drivers/pci/pci-sh7751.c | 216 +- arch/sh/drivers/pci/pci-sh7751.h | 12 +- arch/sh/drivers/pci/pci-sh7780.c | 227 +- arch/sh/drivers/pci/pci-sh7780.h | 16 +- arch/sh/drivers/pci/pci.c | 279 ++- arch/sh/include/asm/cacheflush.h | 2 - arch/sh/include/asm/clock.h | 4 +- arch/sh/include/asm/device.h | 2 + arch/sh/include/asm/hd64461.h | 146 +- arch/sh/include/asm/io.h | 22 +- arch/sh/include/asm/kprobes.h | 2 +- arch/sh/include/asm/pci.h | 98 +- arch/sh/include/asm/pgtable.h | 4 + arch/sh/include/asm/processor.h | 2 +- arch/sh/include/asm/ptrace.h | 5 + arch/sh/include/asm/rtc.h | 11 + arch/sh/include/asm/swab.h | 12 +- arch/sh/include/asm/system_32.h | 2 +- arch/sh/include/asm/timer.h | 44 - arch/sh/include/asm/types.h | 4 +- arch/sh/include/asm/ubc.h | 11 + arch/sh/include/cpu-sh2a/cpu/ubc.h | 29 +- arch/sh/include/cpu-sh3/cpu/timer.h | 67 - arch/sh/include/cpu-sh4/cpu/freq.h | 18 + arch/sh/include/cpu-sh4/cpu/sh7724.h | 255 +++ arch/sh/include/cpu-sh4/cpu/timer.h | 60 - arch/sh/include/cpu-sh5/cpu/irq.h | 1 - arch/sh/include/mach-common/mach/sh7785lcr.h | 10 +- arch/sh/include/mach-dreamcast/mach/pci.h | 2 + arch/sh/kernel/Makefile_32 | 6 +- arch/sh/kernel/Makefile_64 | 9 +- arch/sh/kernel/cpu/clock.c | 63 +- arch/sh/kernel/cpu/irq/imask.c | 2 +- arch/sh/kernel/cpu/irq/intc-sh5.c | 26 +- arch/sh/kernel/cpu/sh2/setup-sh7619.c | 84 + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 111 +- arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 115 + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 154 ++ arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 187 ++ arch/sh/kernel/cpu/sh3/setup-sh7705.c | 108 + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 108 + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 108 + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 270 +++ arch/sh/kernel/cpu/sh4/probe.c | 6 + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 164 ++- arch/sh/kernel/cpu/sh4/setup-sh7750.c | 187 ++ arch/sh/kernel/cpu/sh4/setup-sh7760.c | 140 ++- arch/sh/kernel/cpu/sh4a/Makefile | 3 + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 112 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 2230 ++++++++++++++++++++ arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 116 +- arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 113 +- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 117 +- arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 216 ++- arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 757 +++++++ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 204 ++ arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 546 +++++ arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 204 ++ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 204 ++ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 393 ++++ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 209 ++- arch/sh/kernel/cpu/sh5/Makefile | 3 + arch/sh/kernel/cpu/sh5/clock-sh5.c | 2 +- arch/sh/kernel/cpu/sh5/entry.S | 65 +- arch/sh/kernel/cpu/sh5/setup-sh5.c | 195 ++ arch/sh/kernel/io.c | 1 + arch/sh/kernel/io_trapped.c | 2 +- arch/sh/kernel/kgdb.c | 4 +- .../{timers/timer-broadcast.c => localtimer.c} | 0 arch/sh/kernel/module.c | 2 +- arch/sh/kernel/process_32.c | 4 +- arch/sh/kernel/ptrace_32.c | 8 + arch/sh/kernel/setup.c | 14 +- arch/sh/kernel/sh_ksyms_32.c | 3 +- arch/sh/kernel/sh_ksyms_64.c | 2 + arch/sh/kernel/time.c | 125 ++ arch/sh/kernel/time_32.c | 240 --- arch/sh/kernel/time_64.c | 363 ---- arch/sh/kernel/timers/Makefile | 11 - arch/sh/kernel/timers/timer-cmt.c | 188 -- arch/sh/kernel/timers/timer-mtu2.c | 202 -- arch/sh/kernel/timers/timer-tmu.c | 297 --- arch/sh/kernel/timers/timer.c | 55 - arch/sh/kernel/traps.c | 6 +- arch/sh/kernel/traps_32.c | 15 +- arch/sh/kernel/traps_64.c | 35 +- arch/sh/kernel/vmlinux.lds.S | 179 ++- arch/sh/kernel/vmlinux_32.lds.S | 154 -- arch/sh/kernel/vmlinux_64.lds.S | 163 -- arch/sh/lib64/.gitignore | 1 - arch/sh/lib64/dbg.c | 182 -- arch/sh/lib64/panic.c | 43 - arch/sh/lib64/sdivsi3.S | 6 +- arch/sh/lib64/udelay.c | 2 +- arch/sh/mm/Kconfig | 31 +- arch/sh/mm/cache-sh5.c | 8 +- arch/sh/mm/ioremap_32.c | 14 +- arch/sh/mm/ioremap_64.c | 265 +-- arch/sh/mm/mmap.c | 136 ++- arch/sh/oprofile/common.c | 1 + drivers/clocksource/Makefile | 2 + drivers/clocksource/sh_cmt.c | 116 +- drivers/clocksource/sh_mtu2.c | 357 ++++ drivers/clocksource/sh_tmu.c | 461 ++++ drivers/rtc/Kconfig | 2 +- drivers/serial/sh-sci.c | 385 ++-- drivers/serial/sh-sci.h | 42 +- include/linux/clocksource.h | 10 +- include/linux/serial_sci.h | 3 +- include/linux/sh_cmt.h | 13 - include/linux/sh_timer.h | 13 + include/linux/time.h | 15 + kernel/time/clocksource.c | 3 - kernel/time/timekeeping.c | 7 + sound/oss/Kconfig | 2 +- sound/oss/sh_dac_audio.c | 85 +- 219 files changed, 13670 insertions(+), 5795 deletions(-) create mode 100644 arch/sh/boards/mach-cayman/panic.c delete mode 100644 arch/sh/boards/mach-se/7751/pci.c delete mode 100644 arch/sh/boot/compressed/Makefile_32 delete mode 100644 arch/sh/boot/compressed/Makefile_64 delete mode 100644 arch/sh/boot/compressed/vmlinux_64.lds create mode 100644 arch/sh/configs/sh7724_generic_defconfig create mode 100644 arch/sh/configs/sh7770_generic_defconfig rename arch/sh/drivers/pci/{ops-cayman.c => fixups-cayman.c} (88%) create mode 100644 arch/sh/drivers/pci/fixups-landisk.c delete mode 100644 arch/sh/drivers/pci/fixups-lboxre2.c create mode 100644 arch/sh/drivers/pci/fixups-se7751.c delete mode 100644 arch/sh/drivers/pci/fixups-se7780.c delete mode 100644 arch/sh/drivers/pci/fixups-sh7785lcr.c create mode 100644 arch/sh/drivers/pci/fixups-snapgear.c create mode 100644 arch/sh/drivers/pci/fixups-titan.c delete mode 100644 arch/sh/drivers/pci/ops-landisk.c delete mode 100644 arch/sh/drivers/pci/ops-lboxre2.c delete mode 100644 arch/sh/drivers/pci/ops-r7780rp.c delete mode 100644 arch/sh/drivers/pci/ops-rts7751r2d.c delete mode 100644 arch/sh/drivers/pci/ops-sdk7780.c delete mode 100644 arch/sh/drivers/pci/ops-se7780.c delete mode 100644 arch/sh/drivers/pci/ops-sh03.c delete mode 100644 arch/sh/drivers/pci/ops-sh7785lcr.c delete mode 100644 arch/sh/drivers/pci/ops-snapgear.c delete mode 100644 arch/sh/drivers/pci/ops-titan.c delete mode 100644 arch/sh/drivers/pci/pci-auto.c create mode 100644 arch/sh/drivers/pci/pci-dreamcast.c delete mode 100644 arch/sh/include/asm/timer.h delete mode 100644 arch/sh/include/cpu-sh3/cpu/timer.h create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7724.h delete mode 100644 arch/sh/include/cpu-sh4/cpu/timer.h create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7724.c create mode 100644 arch/sh/kernel/cpu/sh5/setup-sh5.c rename arch/sh/kernel/{timers/timer-broadcast.c => localtimer.c} (100%) create mode 100644 arch/sh/kernel/time.c delete mode 100644 arch/sh/kernel/time_32.c delete mode 100644 arch/sh/kernel/time_64.c delete mode 100644 arch/sh/kernel/timers/Makefile delete mode 100644 arch/sh/kernel/timers/timer-cmt.c delete mode 100644 arch/sh/kernel/timers/timer-mtu2.c delete mode 100644 arch/sh/kernel/timers/timer-tmu.c delete mode 100644 arch/sh/kernel/timers/timer.c delete mode 100644 arch/sh/kernel/vmlinux_32.lds.S delete mode 100644 arch/sh/kernel/vmlinux_64.lds.S delete mode 100644 arch/sh/lib64/.gitignore create mode 100644 drivers/clocksource/sh_mtu2.c create mode 100644 drivers/clocksource/sh_tmu.c delete mode 100644 include/linux/sh_cmt.h create mode 100644 include/linux/sh_timer.h Merging sparc/master $ git merge sparc/master Auto-merging arch/sparc/kernel/head_64.S Auto-merging arch/sparc/kernel/smp_64.c Merge made by recursive. arch/sparc/Kconfig | 3 + arch/sparc/include/asm/cpudata_64.h | 197 +----------------------------- arch/sparc/include/asm/mdesc.h | 3 +- arch/sparc/include/asm/percpu_64.h | 8 +- arch/sparc/include/asm/prom.h | 2 + arch/sparc/include/asm/trap_block.h | 207 +++++++++++++++++++++++++++++++ arch/sparc/kernel/ds.c | 3 +- arch/sparc/kernel/head_64.S | 22 ---- arch/sparc/kernel/mdesc.c | 149 +++++++++++++--------- arch/sparc/kernel/prom.h | 1 - arch/sparc/kernel/prom_64.c | 234 +++++++++++++++++++---------------- arch/sparc/kernel/prom_common.c | 2 - arch/sparc/kernel/smp_64.c | 192 ++++++++++++++++++++++++----- arch/sparc/kernel/traps_64.c | 170 ++++++++++++++------------ arch/sparc/mm/init_32.c | 1 + arch/sparc/mm/init_64.c | 16 +-- 16 files changed, 692 insertions(+), 518 deletions(-) create mode 100644 arch/sparc/include/asm/trap_block.h Merging x86/auto-x86-next $ git merge x86/auto-x86-next Removing arch/x86/boot/compressed/vmlinux.scr Removing arch/x86/boot/compressed/vmlinux_32.lds Removing arch/x86/kernel/irqinit_64.c Auto-merging arch/x86/kernel/kgdb.c Removing arch/x86/kernel/vmlinux_32.lds.S Removing arch/x86/kernel/vmlinux_64.lds.S Auto-merging drivers/pci/intel-iommu.c Removing scripts/bin_size Merge made by recursive. .../ABI/testing/sysfs-devices-cache_disable | 18 + Documentation/kernel-parameters.txt | 3 + Documentation/x86/x86_64/mm.txt | 9 +- arch/x86/Kbuild | 16 + arch/x86/Kconfig | 12 +- arch/x86/Makefile | 19 +- arch/x86/boot/Makefile | 5 +- arch/x86/boot/a20.c | 9 +- arch/x86/boot/apm.c | 76 ++-- arch/x86/boot/bioscall.S | 82 ++++ arch/x86/boot/boot.h | 48 ++ arch/x86/boot/compressed/Makefile | 54 +-- arch/x86/boot/compressed/head_32.S | 181 ++++---- arch/x86/boot/compressed/head_64.S | 147 +++--- arch/x86/boot/compressed/mkpiggy.c | 97 ++++ .../compressed/{vmlinux_64.lds => vmlinux.lds.S} | 29 +- arch/x86/boot/compressed/vmlinux.scr | 10 - arch/x86/boot/compressed/vmlinux_32.lds | 43 -- arch/x86/boot/edd.c | 71 ++-- arch/x86/boot/header.S | 2 +- arch/x86/boot/main.c | 39 +- arch/x86/boot/mca.c | 27 +- arch/x86/boot/memory.c | 81 ++-- arch/x86/boot/regs.c | 29 ++ arch/x86/boot/setup.ld | 6 + arch/x86/boot/tty.c | 52 ++- arch/x86/boot/video-bios.c | 27 +- arch/x86/boot/video-vesa.c | 137 +++--- arch/x86/boot/video-vga.c | 95 +++-- arch/x86/boot/video.c | 42 +- arch/x86/boot/video.h | 14 - arch/x86/include/asm/alternative.h | 59 +-- arch/x86/include/asm/apic.h | 31 +- arch/x86/include/asm/apicdef.h | 8 +- arch/x86/include/asm/cpufeature.h | 6 +- arch/x86/include/asm/hw_irq.h | 4 + arch/x86/include/asm/i387.h | 31 +- arch/x86/include/asm/i8259.h | 4 - arch/x86/include/asm/io_apic.h | 4 - arch/x86/include/asm/iomap.h | 5 + arch/x86/include/asm/irq_remapping.h | 2 +- arch/x86/include/asm/irq_vectors.h | 1 + arch/x86/include/asm/k8.h | 13 + arch/x86/include/asm/msr-index.h | 1 - arch/x86/include/asm/page_32_types.h | 4 - arch/x86/include/asm/page_64_types.h | 8 +- arch/x86/include/asm/page_types.h | 6 + arch/x86/include/asm/paravirt.h | 22 +- arch/x86/include/asm/percpu.h | 10 +- arch/x86/include/asm/pgtable.h | 4 + arch/x86/include/asm/pgtable_64.h | 6 - arch/x86/include/asm/pgtable_64_types.h | 8 +- arch/x86/include/asm/pgtable_types.h | 1 - arch/x86/include/asm/processor.h | 8 +- arch/x86/include/asm/ptrace.h | 7 +- arch/x86/include/asm/required-features.h | 8 +- arch/x86/include/asm/setup.h | 1 - arch/x86/include/asm/sparsemem.h | 2 +- arch/x86/include/asm/syscalls.h | 45 +- arch/x86/include/asm/thread_info.h | 4 +- arch/x86/include/asm/traps.h | 5 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/acpi/realmode/Makefile | 2 +- arch/x86/kernel/acpi/realmode/bioscall.S | 1 + arch/x86/kernel/acpi/realmode/regs.c | 1 + arch/x86/kernel/apic/apic.c | 277 +++++++---- arch/x86/kernel/apic/apic_flat_64.c | 2 +- arch/x86/kernel/apic/es7000_32.c | 10 +- arch/x86/kernel/apic/io_apic.c | 374 +++++++-------- arch/x86/kernel/apic/nmi.c | 2 +- arch/x86/kernel/apic/probe_32.c | 1 - arch/x86/kernel/apic/probe_64.c | 2 +- arch/x86/kernel/apic/summit_32.c | 7 - arch/x86/kernel/apic/x2apic_cluster.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 5 +- arch/x86/kernel/cpu/common.c | 17 +- arch/x86/kernel/cpu/cpu_debug.c | 14 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 153 +++---- arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 1 - arch/x86/kernel/cpu/mtrr/generic.c | 6 +- arch/x86/kernel/dumpstack.h | 1 - arch/x86/kernel/e820.c | 46 ++- arch/x86/kernel/early-quirks.c | 2 + arch/x86/kernel/entry_64.S | 5 + arch/x86/kernel/head_32.S | 7 - arch/x86/kernel/irq.c | 20 +- arch/x86/kernel/{irqinit_32.c => irqinit.c} | 149 +++++-- arch/x86/kernel/irqinit_64.c | 177 ------- arch/x86/kernel/kgdb.c | 2 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/paravirt.c | 56 +-- arch/x86/kernel/process.c | 1 + arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/quirks.c | 37 ++ arch/x86/kernel/setup.c | 30 +- arch/x86/kernel/smp.c | 20 +- arch/x86/kernel/smpboot.c | 14 +- arch/x86/kernel/traps.c | 10 +- arch/x86/kernel/tsc.c | 8 +- arch/x86/kernel/tsc_sync.c | 14 +- arch/x86/kernel/vm86_32.c | 4 +- arch/x86/kernel/vmi_32.c | 20 +- arch/x86/kernel/vmlinux.lds.S | 432 +++++++++++++++++- arch/x86/kernel/vmlinux_32.lds.S | 229 --------- arch/x86/kernel/vmlinux_64.lds.S | 298 ------------ arch/x86/lguest/boot.c | 16 +- arch/x86/mm/dump_pagetables.c | 7 +- arch/x86/mm/fault.c | 57 +-- arch/x86/mm/highmem_32.c | 2 - arch/x86/mm/init.c | 78 +++- arch/x86/mm/init_32.c | 57 +--- arch/x86/mm/init_64.c | 47 +-- arch/x86/mm/iomap_32.c | 1 - arch/x86/mm/numa_64.c | 15 - arch/x86/mm/pageattr.c | 14 - arch/x86/mm/srat_64.c | 6 +- arch/x86/oprofile/backtrace.c | 2 +- arch/x86/vdso/vma.c | 1 + arch/x86/xen/enlighten.c | 65 +++- arch/x86/xen/mmu.c | 23 +- arch/x86/xen/setup.c | 6 +- arch/x86/xen/xen-ops.h | 1 - drivers/pci/intel-iommu.c | 9 - drivers/pci/intr_remapping.c | 39 +- drivers/xen/Kconfig | 20 + drivers/xen/Makefile | 4 +- drivers/xen/events.c | 6 + drivers/xen/evtchn.c | 507 ++++++++++++++++++++ drivers/xen/manage.c | 9 +- drivers/xen/sys-hypervisor.c | 445 +++++++++++++++++ drivers/xen/xenbus/xenbus_probe.c | 61 +-- drivers/xen/xenbus/xenbus_xs.c | 2 + drivers/xen/xenfs/super.c | 19 +- include/Kbuild | 1 + include/asm-generic/pgtable.h | 21 +- include/linux/dmar.h | 3 + include/xen/Kbuild | 1 + include/xen/events.h | 3 + include/xen/evtchn.h | 88 ++++ include/xen/interface/version.h | 3 + include/xen/xenbus.h | 3 +- kernel/sched.c | 2 +- scripts/Makefile.lib | 28 +- scripts/bin_size | 10 - 145 files changed, 3533 insertions(+), 2414 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-devices-cache_disable create mode 100644 arch/x86/Kbuild create mode 100644 arch/x86/boot/bioscall.S create mode 100644 arch/x86/boot/compressed/mkpiggy.c rename arch/x86/boot/compressed/{vmlinux_64.lds => vmlinux.lds.S} (57%) delete mode 100644 arch/x86/boot/compressed/vmlinux.scr delete mode 100644 arch/x86/boot/compressed/vmlinux_32.lds create mode 100644 arch/x86/boot/regs.c create mode 100644 arch/x86/kernel/acpi/realmode/bioscall.S create mode 100644 arch/x86/kernel/acpi/realmode/regs.c rename arch/x86/kernel/{irqinit_32.c => irqinit.c} (68%) delete mode 100644 arch/x86/kernel/irqinit_64.c delete mode 100644 arch/x86/kernel/vmlinux_32.lds.S delete mode 100644 arch/x86/kernel/vmlinux_64.lds.S create mode 100644 drivers/xen/evtchn.c create mode 100644 drivers/xen/sys-hypervisor.c create mode 100644 include/xen/Kbuild create mode 100644 include/xen/evtchn.h delete mode 100644 scripts/bin_size Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging configfs/linux-next $ git merge configfs/linux-next Merge made by recursive. fs/configfs/configfs_internal.h | 3 + fs/configfs/dir.c | 193 ++++++++++++++++++++++++++++----------- fs/configfs/inode.c | 38 ++++++++ 3 files changed, 180 insertions(+), 54 deletions(-) Merging ext4/next $ git merge ext4/next Removing fs/ext4/ext4_i.h Removing fs/ext4/ext4_sb.h Removing fs/ext4/group.h Removing fs/ext4/namei.h Merge made by recursive. fs/buffer.c | 2 + fs/ext3/acl.c | 13 ++- fs/ext4/acl.c | 15 ++- fs/ext4/balloc.c | 28 ++--- fs/ext4/dir.c | 3 +- fs/ext4/ext4.h | 343 ++++++++++++++++++++++++++++++++++++++++++++++----- fs/ext4/ext4_i.h | 140 --------------------- fs/ext4/ext4_sb.h | 161 ------------------------ fs/ext4/extents.c | 44 ++++--- fs/ext4/group.h | 29 ----- fs/ext4/ialloc.c | 70 +++++------ fs/ext4/inode.c | 359 ++++++++++++++++++++++++++++++----------------------- fs/ext4/mballoc.c | 155 ++++++++++-------------- fs/ext4/mballoc.h | 1 - fs/ext4/namei.c | 22 ++-- fs/ext4/namei.h | 8 -- fs/ext4/resize.c | 36 +++--- fs/ext4/super.c | 222 +++++++++++++++++---------------- fs/ioctl.c | 14 ++- fs/mpage.c | 6 +- 20 files changed, 833 insertions(+), 838 deletions(-) delete mode 100644 fs/ext4/ext4_i.h delete mode 100644 fs/ext4/ext4_sb.h delete mode 100644 fs/ext4/group.h delete mode 100644 fs/ext4/namei.h Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Auto-merging fs/fuse/inode.c Merge made by recursive. fs/Kconfig | 10 + fs/fuse/Makefile | 1 + fs/fuse/cuse.c | 610 +++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/dev.c | 15 +- fs/fuse/dir.c | 33 +-- fs/fuse/file.c | 346 ++++++++++++++++------------ fs/fuse/fuse_i.h | 47 +++- fs/fuse/inode.c | 118 ++++++---- include/linux/fuse.h | 31 +++ include/linux/magic.h | 5 +- 10 files changed, 983 insertions(+), 233 deletions(-) create mode 100644 fs/fuse/cuse.c Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/incore.h | 1 + fs/gfs2/log.c | 6 +- fs/gfs2/lops.c | 14 ++++--- fs/gfs2/meta_io.c | 104 +++++++++++++++++++++++++++++++++++++++--------- fs/gfs2/mount.c | 10 +++++ fs/gfs2/ops_address.c | 20 +++++----- fs/gfs2/ops_file.c | 29 +++++++------ fs/gfs2/ops_fstype.c | 4 +- fs/gfs2/ops_super.c | 13 ++++++- fs/gfs2/sys.c | 105 ++++++++++++++++--------------------------------- fs/gfs2/trans.c | 9 +--- 11 files changed, 184 insertions(+), 131 deletions(-) Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/super.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Auto-merging fs/nfs/super.c Merge made by recursive. fs/nfs/Kconfig | 9 + fs/nfs/client.c | 124 ++++- fs/nfs/direct.c | 9 + fs/nfs/internal.h | 62 +++ fs/nfs/nfs4_fs.h | 37 ++- fs/nfs/nfs4proc.c | 1229 ++++++++++++++++++++++++++++++++++++++++-- fs/nfs/nfs4renewd.c | 6 +- fs/nfs/nfs4state.c | 130 ++++- fs/nfs/nfs4xdr.c | 1078 ++++++++++++++++++++++++++++++++----- fs/nfs/read.c | 33 +- fs/nfs/super.c | 12 + fs/nfs/unlink.c | 20 +- fs/nfs/write.c | 31 +- include/linux/nfs4.h | 18 + include/linux/nfs_fs_sb.h | 67 +++- include/linux/nfs_xdr.h | 174 ++++++ include/linux/nfsd/state.h | 1 - include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/sched.h | 1 + net/sunrpc/clnt.c | 13 + net/sunrpc/sched.c | 2 +- 21 files changed, 2838 insertions(+), 219 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging include/linux/fs.h Auto-merging include/linux/nfsd/state.h Merge made by recursive. Documentation/filesystems/00-INDEX | 4 + fs/lockd/svclock.c | 2 + fs/locks.c | 3 +- fs/nfsd/export.c | 13 +- fs/nfsd/nfs3xdr.c | 1 + fs/nfsd/nfs4callback.c | 222 +++++++++++++++++----------- fs/nfsd/nfs4state.c | 119 +++++++++------- fs/nfsd/nfs4xdr.c | 248 +++++++++++++++---------------- fs/nfsd/nfsctl.c | 284 ++++++++++++++++++++++-------------- include/linux/fs.h | 1 + include/linux/nfsd/nfsfh.h | 7 + include/linux/nfsd/state.h | 23 +-- include/linux/nfsd/xdr4.h | 17 ++- include/linux/sunrpc/svc_xprt.h | 7 +- include/linux/sunrpc/svcsock.h | 7 +- net/sunrpc/svc_xprt.c | 57 +++++-- net/sunrpc/svcsock.c | 87 +++++++++--- 17 files changed, 655 insertions(+), 447 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Already up-to-date. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/cluster/masklog.h | 35 +++++++++++++++++------------------ fs/ocfs2/xattr.c | 5 +++-- 2 files changed, 20 insertions(+), 20 deletions(-) Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'net/9p/protocol.c' using previous resolution. Auto-merging net/9p/protocol.c CONFLICT (content): Merge conflict in net/9p/protocol.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 78abdb4] Merge commit 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging ubifs/linux-next $ git merge ubifs/linux-next Auto-merging fs/ubifs/super.c Merge made by recursive. fs/ubifs/budget.c | 3 ++- fs/ubifs/super.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) Merging xfs/master $ git merge xfs/master Merge made by recursive. fs/xfs/xfs_dfrag.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Merge made by recursive. Documentation/RCU/trace.txt | 102 ++- Documentation/futex-requeue-pi.txt | 131 ++++ arch/sparc/include/asm/thread_info_64.h | 4 +- arch/x86/ia32/ia32entry.S | 1 + arch/x86/include/asm/unistd_32.h | 1 + arch/x86/include/asm/unistd_64.h | 2 + arch/x86/kernel/syscall_table_32.S | 1 + include/linux/compat.h | 2 + include/linux/futex.h | 6 + include/linux/mutex.h | 1 + include/linux/rculist.h | 30 +- include/linux/rcutree.h | 9 +- include/linux/sched.h | 8 +- include/linux/signal.h | 2 + include/linux/thread_info.h | 3 +- init/Kconfig | 2 +- ipc/sem.c | 4 +- kernel/compat.c | 11 + kernel/futex.c | 1200 +++++++++++++++++++++++-------- kernel/mutex.c | 25 +- kernel/rcupreempt.c | 8 +- kernel/rcutree.c | 25 +- kernel/rcutree_trace.c | 64 ++- kernel/rtmutex.c | 248 +++++-- kernel/rtmutex_common.h | 8 + kernel/signal.c | 56 ++- lib/vsprintf.c | 56 ++- mm/percpu.c | 141 ++--- security/integrity/ima/ima_fs.c | 4 +- security/smack/smackfs.c | 8 +- 30 files changed, 1649 insertions(+), 514 deletions(-) create mode 100644 Documentation/futex-requeue-pi.txt Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Already up-to-date. Merging tracing/auto-tracing-next $ git merge tracing/auto-tracing-next Auto-merging arch/x86/include/asm/processor.h Auto-merging arch/x86/include/asm/ptrace.h Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/kernel/entry_64.S Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/kernel/process_32.c Auto-merging arch/x86/kernel/process_64.c Auto-merging block/blk-core.c Auto-merging include/linux/sched.h Removing include/trace/irq.h Removing include/trace/irq_event_types.h Removing include/trace/kmemtrace.h Removing include/trace/lockdep.h Removing include/trace/lockdep_event_types.h Removing include/trace/sched.h Removing include/trace/skb.h Removing include/trace/trace_event_types.h Removing include/trace/trace_events.h Auto-merging kernel/sched.c Auto-merging kernel/signal.c Removing kernel/trace/events.c Removing kernel/trace/trace_events_stage_1.h Removing kernel/trace/trace_events_stage_2.h Removing kernel/trace/trace_events_stage_3.h Auto-merging mm/slob.c Auto-merging mm/slub.c Merge made by recursive. Documentation/DocBook/Makefile | 3 +- Documentation/DocBook/tracepoint.tmpl | 89 ++ Documentation/trace/events.txt | 135 +++ Documentation/trace/power.txt | 17 + arch/x86/Kconfig.cpu | 1 - arch/x86/Kconfig.debug | 9 + arch/x86/include/asm/ds.h | 82 +- arch/x86/include/asm/processor.h | 35 +- arch/x86/include/asm/ptrace.h | 9 +- arch/x86/include/asm/tlbflush.h | 8 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/ds.c | 921 +++++++++++----- arch/x86/kernel/ds_selftest.c | 408 +++++++ arch/x86/kernel/ds_selftest.h | 15 + arch/x86/kernel/entry_64.S | 19 +- arch/x86/kernel/process.c | 5 +- arch/x86/kernel/process_32.c | 3 +- arch/x86/kernel/process_64.c | 3 +- arch/x86/kernel/ptrace.c | 284 +++-- arch/x86/mm/kmmio.c | 104 +- arch/x86/mm/mmio-mod.c | 2 + block/blk-core.c | 5 +- block/blk-sysfs.c | 7 +- block/compat_ioctl.c | 2 +- drivers/md/dm.c | 3 +- drivers/scsi/sg.c | 1 + include/asm-generic/vmlinux.lds.h | 2 +- include/linux/blktrace_api.h | 32 +- include/linux/ftrace.h | 17 +- include/linux/ftrace_event.h | 158 +++ include/linux/init_task.h | 1 + include/linux/kmemtrace.h | 25 + include/linux/mm.h | 7 +- include/linux/mmiotrace.h | 2 + include/linux/module.h | 8 + include/linux/ptrace.h | 10 - include/linux/ring_buffer.h | 52 +- include/linux/sched.h | 17 +- include/linux/slab_def.h | 2 +- include/linux/slub_def.h | 2 +- include/linux/trace_seq.h | 90 ++ include/linux/tracepoint.h | 8 +- include/trace/block.h | 4 +- include/trace/define_trace.h | 75 ++ include/trace/events/irq.h | 134 +++ include/trace/events/kmem.h | 194 ++++ include/trace/events/lockdep.h | 96 ++ include/trace/events/mm.h | 48 + .../trace/{sched_event_types.h => events/sched.h} | 20 +- include/trace/events/skb.h | 40 + include/trace/ftrace.h | 509 +++++++++ include/trace/irq.h | 9 - include/trace/irq_event_types.h | 55 - include/trace/kmemtrace.h | 63 - include/trace/lockdep.h | 9 - include/trace/lockdep_event_types.h | 44 - include/trace/sched.h | 9 - include/trace/skb.h | 11 - include/trace/trace_event_types.h | 5 - include/trace/trace_events.h | 5 - init/main.c | 2 +- kernel/Makefile | 1 + kernel/exit.c | 6 +- kernel/fork.c | 9 +- kernel/irq/handle.c | 5 +- kernel/kthread.c | 5 +- kernel/lockdep.c | 16 +- kernel/module.c | 26 +- kernel/ptrace.c | 10 - kernel/sched.c | 55 +- kernel/signal.c | 4 +- kernel/softirq.c | 7 +- kernel/trace/Kconfig | 90 ++- kernel/trace/Makefile | 16 +- kernel/trace/blktrace.c | 193 +++- kernel/trace/events.c | 14 - kernel/trace/ftrace.c | 726 +++++++++++-- kernel/trace/kmemtrace.c | 10 +- kernel/trace/ring_buffer.c | 657 +++++++---- kernel/trace/ring_buffer_benchmark.c | 408 +++++++ kernel/trace/trace.c | 370 ++++--- kernel/trace/trace.h | 243 ++--- kernel/trace/trace_boot.c | 5 +- kernel/trace/trace_branch.c | 8 +- kernel/trace/trace_event_profile.c | 24 +- kernel/trace/trace_event_types.h | 12 +- kernel/trace/trace_events.c | 833 ++++++++++++--- kernel/trace/trace_events_filter.c | 1200 ++++++++++++++++---- kernel/trace/trace_events_stage_1.h | 39 - kernel/trace/trace_events_stage_2.h | 176 --- kernel/trace/trace_events_stage_3.h | 281 ----- kernel/trace/trace_export.c | 110 ++- kernel/trace/trace_functions_graph.c | 25 +- kernel/trace/trace_hw_branches.c | 203 ++-- kernel/trace/trace_mm.c | 172 +++ kernel/trace/trace_mmiotrace.c | 6 +- kernel/trace/trace_output.c | 82 ++- kernel/trace/trace_output.h | 28 +- kernel/trace/trace_power.c | 8 +- kernel/trace/trace_printk.c | 6 +- kernel/trace/trace_sched_switch.c | 12 +- kernel/trace/trace_sched_wakeup.c | 8 +- kernel/trace/trace_selftest.c | 58 + kernel/trace/trace_stack.c | 13 +- kernel/trace/trace_stat.c | 2 +- kernel/trace/trace_stat.h | 2 +- kernel/trace/trace_sysprof.c | 6 +- kernel/trace/trace_workqueue.c | 2 +- mm/mlock.c | 51 +- mm/slab.c | 2 +- mm/slob.c | 2 +- mm/slub.c | 2 +- mm/util.c | 11 +- net/core/drop_monitor.c | 2 +- net/core/net-traces.c | 4 +- net/core/skbuff.c | 2 +- samples/Kconfig | 6 + samples/Makefile | 2 +- samples/trace_events/Makefile | 6 + samples/trace_events/trace-events-sample.c | 52 + samples/trace_events/trace-events-sample.h | 129 +++ scripts/kernel-doc | 22 + scripts/recordmcount.pl | 6 +- 123 files changed, 7850 insertions(+), 2577 deletions(-) create mode 100644 Documentation/DocBook/tracepoint.tmpl create mode 100644 Documentation/trace/events.txt create mode 100644 Documentation/trace/power.txt create mode 100644 arch/x86/kernel/ds_selftest.c create mode 100644 arch/x86/kernel/ds_selftest.h create mode 100644 include/linux/ftrace_event.h create mode 100644 include/linux/kmemtrace.h create mode 100644 include/linux/trace_seq.h create mode 100644 include/trace/define_trace.h create mode 100644 include/trace/events/irq.h create mode 100644 include/trace/events/kmem.h create mode 100644 include/trace/events/lockdep.h create mode 100644 include/trace/events/mm.h rename include/trace/{sched_event_types.h => events/sched.h} (95%) create mode 100644 include/trace/events/skb.h create mode 100644 include/trace/ftrace.h delete mode 100644 include/trace/irq.h delete mode 100644 include/trace/irq_event_types.h delete mode 100644 include/trace/kmemtrace.h delete mode 100644 include/trace/lockdep.h delete mode 100644 include/trace/lockdep_event_types.h delete mode 100644 include/trace/sched.h delete mode 100644 include/trace/skb.h delete mode 100644 include/trace/trace_event_types.h delete mode 100644 include/trace/trace_events.h delete mode 100644 kernel/trace/events.c create mode 100644 kernel/trace/ring_buffer_benchmark.c delete mode 100644 kernel/trace/trace_events_stage_1.h delete mode 100644 kernel/trace/trace_events_stage_2.h delete mode 100644 kernel/trace/trace_events_stage_3.h create mode 100644 kernel/trace/trace_mm.c create mode 100644 samples/trace_events/Makefile create mode 100644 samples/trace_events/trace-events-sample.c create mode 100644 samples/trace_events/trace-events-sample.h Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Recorded preimage for 'arch/mips/sibyte/bcm1480/irq.c' Recorded preimage for 'arch/mips/sibyte/sb1250/irq.c' Auto-merging arch/arm/common/gic.c Auto-merging arch/mips/cavium-octeon/octeon-irq.c Auto-merging arch/mips/sibyte/bcm1480/irq.c CONFLICT (content): Merge conflict in arch/mips/sibyte/bcm1480/irq.c Auto-merging arch/mips/sibyte/sb1250/irq.c CONFLICT (content): Merge conflict in arch/mips/sibyte/sb1250/irq.c Auto-merging arch/powerpc/sysdev/mpic.c Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging arch/x86/lguest/boot.c Auto-merging drivers/xen/events.c Auto-merging kernel/irq/handle.c Auto-merging kernel/softirq.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/mips/sibyte/bcm1480/irq.c'. Recorded resolution for 'arch/mips/sibyte/sb1250/irq.c'. [master 9401ad2] Merge commit 'genirq/auto-genirq-next' $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/sys_dp264.c | 8 +- arch/alpha/kernel/sys_titan.c | 4 +- arch/arm/common/gic.c | 4 +- arch/cris/arch-v32/kernel/irq.c | 4 +- arch/ia64/hp/sim/hpsim_irq.c | 3 +- arch/ia64/kernel/acpi.c | 5 +- arch/ia64/kernel/iosapic.c | 10 +- arch/ia64/kernel/msi_ia64.c | 16 ++- arch/ia64/sn/kernel/irq.c | 4 +- arch/ia64/sn/kernel/msi_sn.c | 8 +- arch/mips/cavium-octeon/octeon-irq.c | 8 +- arch/mips/include/asm/irq.h | 2 +- arch/mips/kernel/irq-gic.c | 5 +- arch/mips/mti-malta/malta-smtc.c | 4 +- arch/mips/sibyte/bcm1480/irq.c | 8 +- arch/mips/sibyte/sb1250/irq.c | 8 +- arch/parisc/kernel/irq.c | 6 +- arch/powerpc/platforms/pseries/xics.c | 12 +- arch/powerpc/sysdev/mpic.c | 4 +- arch/powerpc/sysdev/mpic.h | 2 +- arch/sparc/kernel/irq_64.c | 12 ++- arch/x86/Kconfig | 10 +-- arch/x86/configs/x86_64_defconfig | 1 - arch/x86/include/asm/io_apic.h | 4 +- arch/x86/include/asm/mpspec.h | 4 +- arch/x86/kernel/acpi/boot.c | 8 +- arch/x86/kernel/apic/io_apic.c | 203 +++++++++++++++------------------ arch/x86/lguest/boot.c | 2 +- drivers/acpi/pci_irq.c | 5 +- drivers/char/hpet.c | 4 +- drivers/parisc/iosapic.c | 6 +- drivers/pci/htirq.c | 4 +- drivers/pci/intr_remapping.c | 15 +-- drivers/pnp/pnpacpi/rsparser.c | 2 +- drivers/xen/events.c | 14 ++- include/linux/acpi.h | 2 +- include/linux/interrupt.h | 2 +- include/linux/irq.h | 58 +++++----- kernel/irq/Makefile | 2 +- kernel/irq/chip.c | 12 +-- kernel/irq/handle.c | 44 +++---- kernel/irq/internals.h | 5 +- kernel/irq/manage.c | 19 ++- kernel/irq/migration.c | 14 ++- kernel/irq/numa_migrate.c | 38 ++---- kernel/softirq.c | 2 +- 46 files changed, 311 insertions(+), 306 deletions(-) Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merging arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 5 +++++ include/linux/poison.h | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Auto-merging kernel/mutex.c Auto-merging kernel/sched.c Merge made by recursive. Documentation/memory-barriers.txt | 129 ++++++++++++++++++- Documentation/scheduler/sched-rt-group.txt | 18 +++ arch/x86/include/asm/topology.h | 3 +- include/linux/wait.h | 2 - kernel/mutex.c | 4 +- kernel/sched.c | 198 ++++++++++++++++++++++++---- kernel/sched_clock.c | 3 +- kernel/sched_fair.c | 13 +-- kernel/wait.c | 2 +- 9 files changed, 332 insertions(+), 40 deletions(-) Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Already up-to-date. Merging timers/auto-timers-next $ git merge timers/auto-timers-next Merge made by recursive. include/linux/timex.h | 42 +++++++++++++++++++++++++++++++----------- kernel/time/clockevents.c | 2 ++ kernel/time/tick-broadcast.c | 2 +- kernel/timer.c | 3 +++ 4 files changed, 37 insertions(+), 12 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Auto-merging drivers/pci/msi.c Merge made by recursive. arch/x86/include/asm/pci.h | 1 + drivers/pci/bus.c | 7 +- drivers/pci/hotplug/Kconfig | 2 +- drivers/pci/hotplug/cpqphp.h | 167 +++--- drivers/pci/hotplug/cpqphp_core.c | 1101 +++++++++++++++++------------------- drivers/pci/hotplug/cpqphp_ctrl.c | 371 +++++++------ drivers/pci/hotplug/cpqphp_nvram.c | 97 ++-- drivers/pci/hotplug/cpqphp_pci.c | 599 ++++++++++---------- drivers/pci/hotplug/ibmphp_core.c | 1 + drivers/pci/msi.c | 2 +- drivers/pci/msi.h | 14 +- drivers/pci/pcie/portdrv_core.c | 2 +- drivers/pci/probe.c | 9 +- drivers/pci/search.c | 30 - drivers/pci/setup-bus.c | 53 ++- drivers/pci/setup-res.c | 49 ++- include/linux/ioport.h | 2 + include/linux/pci.h | 12 +- include/linux/pci_regs.h | 4 +- 19 files changed, 1269 insertions(+), 1254 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Auto-merging drivers/md/dm.c Merge made by recursive. Documentation/device-mapper/dm-queue-length.txt | 39 ++++ drivers/md/Kconfig | 9 + drivers/md/Makefile | 1 + drivers/md/dm-crypt.c | 8 + drivers/md/dm-delay.c | 6 +- drivers/md/dm-io.c | 14 ++- drivers/md/dm-linear.c | 4 +- drivers/md/dm-mpath.c | 120 ++++++----- drivers/md/dm-path-selector.h | 8 +- drivers/md/dm-queue-length.c | 263 +++++++++++++++++++++++ drivers/md/dm-region-hash.c | 2 +- drivers/md/dm-round-robin.c | 2 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-snap.c | 11 + drivers/md/dm-stripe.c | 15 +- drivers/md/dm-table.c | 131 ++++++++++-- drivers/md/dm.c | 200 ++++++++++-------- include/linux/device-mapper.h | 11 + 18 files changed, 679 insertions(+), 167 deletions(-) create mode 100644 Documentation/device-mapper/dm-queue-length.txt create mode 100644 drivers/md/dm-queue-length.c Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 92 ++++++++++++++--- drivers/hid/Makefile | 10 +- drivers/hid/hid-core.c | 2 + drivers/hid/hid-drff.c | 8 ++ drivers/hid/hid-gaff.c | 8 ++ drivers/hid/hid-ids.h | 2 + drivers/hid/hid-lgff.c | 10 ++- drivers/hid/hid-sjoy.c | 180 ++++++++++++++++++++++++++++++++ drivers/hid/hid-tmff.c | 17 ++- drivers/hid/hid-wacom.c | 259 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-zpff.c | 7 ++ 11 files changed, 569 insertions(+), 26 deletions(-) create mode 100644 drivers/hid/hid-sjoy.c create mode 100644 drivers/hid/hid-wacom.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. Documentation/i2c/busses/i2c-viapro | 4 + arch/mips/configs/bigsur_defconfig | 2 +- arch/mips/configs/mtx1_defconfig | 2 +- arch/powerpc/configs/ppc6xx_defconfig | 2 +- drivers/i2c/busses/Kconfig | 6 +- drivers/i2c/busses/i2c-viapro.c | 4 + drivers/i2c/busses/i2c-voodoo3.c | 1 - drivers/i2c/chips/Kconfig | 15 --- drivers/i2c/chips/Makefile | 1 - drivers/i2c/i2c-core.c | 43 ++++++--- drivers/macintosh/therm_adt746x.c | 84 +++++++++--------- drivers/macintosh/therm_pm72.c | 95 +++++++++---------- drivers/macintosh/therm_windtunnel.c | 126 ++++++++++++------------- drivers/macintosh/windfarm_lm75_sensor.c | 129 +++++++++++++++----------- drivers/macintosh/windfarm_max6690_sensor.c | 103 ++++++++++++--------- drivers/macintosh/windfarm_smu_sat.c | 109 +++++++++++++--------- drivers/misc/eeprom/Kconfig | 14 +++ drivers/misc/eeprom/Makefile | 1 + drivers/{i2c/chips => misc/eeprom}/max6875.c | 2 +- drivers/video/tdfxfb.c | 1 - 20 files changed, 403 insertions(+), 341 deletions(-) rename drivers/{i2c/chips => misc/eeprom}/max6875.c (99%) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/ibmaem | 2 +- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/ibmaem.c | 1 + drivers/hwmon/lm78.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c Merge made by recursive. Documentation/dvb/get_dvb_firmware | 6 +- Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.em28xx | 1 + Documentation/video4linux/CARDLIST.saa7134 | 18 +- Documentation/video4linux/gspca.txt | 7 + Documentation/video4linux/pxa_camera.txt | 49 + Documentation/video4linux/v4l2-framework.txt | 5 + arch/arm/mach-pxa/pcm990-baseboard.c | 23 +- drivers/media/dvb/dvb-usb/af9015.c | 80 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- drivers/media/dvb/frontends/Kconfig | 22 + drivers/media/dvb/frontends/Makefile | 4 +- drivers/media/dvb/frontends/isl6423.c | 308 ++ drivers/media/dvb/frontends/isl6423.h | 63 + drivers/media/dvb/frontends/stv0900_priv.h | 2 - drivers/media/dvb/frontends/stv090x.c | 4299 ++++++++++++++++++++ drivers/media/dvb/frontends/stv090x.h | 106 + drivers/media/dvb/frontends/stv090x_priv.h | 269 ++ drivers/media/dvb/frontends/stv090x_reg.h | 2373 +++++++++++ drivers/media/dvb/frontends/stv6110x.c | 373 ++ drivers/media/dvb/frontends/stv6110x.h | 71 + drivers/media/dvb/frontends/stv6110x_priv.h | 75 + drivers/media/dvb/frontends/stv6110x_reg.h | 82 + drivers/media/dvb/frontends/tda10048.c | 219 +- drivers/media/dvb/frontends/tda10048.h | 14 + drivers/media/dvb/siano/smscoreapi.c | 36 - drivers/media/dvb/siano/smscoreapi.h | 119 +- drivers/media/dvb/siano/smsendian.c | 100 + drivers/media/dvb/siano/smsendian.h | 32 + drivers/media/dvb/siano/smsir.c | 301 ++ drivers/media/dvb/siano/smsir.h | 93 + drivers/media/dvb/siano/smssdio.c | 354 ++ drivers/media/dvb/ttpci/av7110_hw.c | 2 +- drivers/media/dvb/ttpci/budget.c | 85 + drivers/media/radio/radio-si470x.c | 1 - drivers/media/video/Makefile | 9 +- drivers/media/video/cx18/cx18-audio.c | 44 +- drivers/media/video/cx18/cx18-av-core.c | 234 +- drivers/media/video/cx18/cx18-av-firmware.c | 82 +- drivers/media/video/cx18/cx18-controls.c | 6 +- drivers/media/video/cx18/cx18-driver.c | 95 +- drivers/media/video/cx18/cx18-driver.h | 17 +- drivers/media/video/cx18/cx18-dvb.c | 1 + drivers/media/video/cx18/cx18-fileops.c | 7 +- drivers/media/video/cx18/cx18-mailbox.c | 114 +- drivers/media/video/cx18/cx18-mailbox.h | 2 +- drivers/media/video/cx18/cx18-queue.c | 85 +- drivers/media/video/cx18/cx18-streams.c | 35 +- drivers/media/video/cx18/cx18-streams.h | 20 +- drivers/media/video/cx18/cx18-version.h | 2 +- drivers/media/video/cx231xx/cx231xx-avcore.c | 1 - drivers/media/video/cx231xx/cx231xx-vbi.c | 1 - drivers/media/video/cx23885/cx23885-core.c | 10 +- drivers/media/video/cx23885/cx23885-dvb.c | 4 +- drivers/media/video/cx88/Makefile | 2 +- drivers/media/video/cx88/cx88-cards.c | 13 + drivers/media/video/cx88/cx88-core.c | 26 +- drivers/media/video/cx88/cx88-dsp.c | 312 ++ drivers/media/video/cx88/cx88-input.c | 2 + drivers/media/video/cx88/cx88-tvaudio.c | 115 +- drivers/media/video/cx88/cx88.h | 11 + drivers/media/video/em28xx/em28xx-cards.c | 27 + drivers/media/video/em28xx/em28xx-core.c | 2 +- drivers/media/video/em28xx/em28xx-dvb.c | 1 + drivers/media/video/em28xx/em28xx.h | 1 + drivers/media/video/gspca/finepix.c | 1 + drivers/media/video/gspca/gspca.c | 50 +- drivers/media/video/gspca/gspca.h | 6 +- drivers/media/video/gspca/m5602/Makefile | 3 +- drivers/media/video/gspca/m5602/m5602_bridge.h | 26 +- drivers/media/video/gspca/m5602/m5602_core.c | 44 +- drivers/media/video/gspca/m5602/m5602_mt9m111.c | 400 ++- drivers/media/video/gspca/m5602/m5602_mt9m111.h | 805 +---- drivers/media/video/gspca/m5602/m5602_ov7660.c | 227 + drivers/media/video/gspca/m5602/m5602_ov7660.h | 279 ++ drivers/media/video/gspca/m5602/m5602_ov9650.c | 195 +- drivers/media/video/gspca/m5602/m5602_ov9650.h | 57 +- drivers/media/video/gspca/m5602/m5602_po1030.c | 494 ++- drivers/media/video/gspca/m5602/m5602_po1030.h | 439 +-- drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 385 ++- drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 93 +- drivers/media/video/gspca/m5602/m5602_s5k83a.c | 473 ++- drivers/media/video/gspca/m5602/m5602_s5k83a.h | 280 +-- drivers/media/video/gspca/m5602/m5602_sensor.h | 9 +- drivers/media/video/gspca/mr97310a.c | 8 +- drivers/media/video/gspca/ov534.c | 30 +- drivers/media/video/gspca/sonixb.c | 2 + drivers/media/video/gspca/sonixj.c | 66 +- drivers/media/video/gspca/spca500.c | 33 +- drivers/media/video/gspca/sq905.c | 1 + drivers/media/video/gspca/sq905c.c | 1 + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 76 +- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 10 +- drivers/media/video/gspca/sunplus.c | 33 +- drivers/media/video/gspca/t613.c | 2 +- drivers/media/video/gspca/vc032x.c | 22 +- drivers/media/video/gspca/zc3xx.c | 22 +- drivers/media/video/ivtv/ivtv-driver.c | 7 +- drivers/media/video/mt9m001.c | 108 +- drivers/media/video/mt9m111.c | 73 +- drivers/media/video/mt9t031.c | 135 +- drivers/media/video/mt9v022.c | 138 +- drivers/media/video/mx1_camera.c | 50 +- drivers/media/video/mx3_camera.c | 40 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 2 + drivers/media/video/pxa_camera.c | 120 +- drivers/media/video/s2255drv.c | 47 +- drivers/media/video/saa7134/saa7134-cards.c | 436 ++- drivers/media/video/saa7134/saa7134-input.c | 13 +- drivers/media/video/saa7134/saa7134.h | 14 +- drivers/media/video/sh_mobile_ceu_camera.c | 27 +- drivers/media/video/soc_camera.c | 106 +- drivers/media/video/tda7432.c | 14 - drivers/media/video/tuner-core.c | 27 - drivers/media/video/uvc/uvc_v4l2.c | 10 +- drivers/media/video/v4l2-common.c | 4 +- drivers/media/video/v4l2-device.c | 29 +- include/linux/mmc/sdio_ids.h | 8 + include/media/soc_camera.h | 10 +- include/media/v4l2-device.h | 23 +- include/media/v4l2-subdev.h | 5 + 123 files changed, 14100 insertions(+), 2804 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6423.c create mode 100644 drivers/media/dvb/frontends/isl6423.h create mode 100644 drivers/media/dvb/frontends/stv090x.c create mode 100644 drivers/media/dvb/frontends/stv090x.h create mode 100644 drivers/media/dvb/frontends/stv090x_priv.h create mode 100644 drivers/media/dvb/frontends/stv090x_reg.h create mode 100644 drivers/media/dvb/frontends/stv6110x.c create mode 100644 drivers/media/dvb/frontends/stv6110x.h create mode 100644 drivers/media/dvb/frontends/stv6110x_priv.h create mode 100644 drivers/media/dvb/frontends/stv6110x_reg.h create mode 100644 drivers/media/dvb/siano/smsendian.c create mode 100644 drivers/media/dvb/siano/smsendian.h create mode 100644 drivers/media/dvb/siano/smsir.c create mode 100644 drivers/media/dvb/siano/smsir.h create mode 100644 drivers/media/dvb/siano/smssdio.c create mode 100644 drivers/media/video/cx88/cx88-dsp.c create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.c create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.h Merging quota/for_next $ git merge quota/for_next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging scripts/kernel-doc Auto-merging scripts/mod/modpost.c Merge made by recursive. include/asm-generic/vmlinux.lds.h | 5 +- include/linux/init.h | 3 +- scripts/kconfig/lxdialog/checklist.c | 3 +- scripts/kconfig/mconf.c | 10 ++- scripts/mod/modpost.c | 48 +++++++++--- scripts/package/builddeb | 149 +++++++++++++++++++++++----------- 6 files changed, 156 insertions(+), 62 deletions(-) $ git revert efbe795f5f63b74ed642e196518907355aa94bd7 Finished one revert. [master cb78e57] Revert "initconst adjustments" 3 files changed, 13 insertions(+), 43 deletions(-) Merging ide/for-next $ git merge ide/for-next Auto-merging block/blk-core.c Merge made by recursive. block/blk-core.c | 10 +- drivers/ide/alim15x3.c | 10 +- drivers/ide/at91_ide.c | 7 +- drivers/ide/au1xxx-ide.c | 8 +- drivers/ide/buddha.c | 9 +- drivers/ide/cmd640.c | 7 +- drivers/ide/cs5520.c | 4 +- drivers/ide/delkin_cb.c | 6 +- drivers/ide/falconide.c | 9 +- drivers/ide/gayle.c | 9 +- drivers/ide/icside.c | 13 +- drivers/ide/ide-4drives.c | 6 +- drivers/ide/ide-atapi.c | 168 +++++++---- drivers/ide/ide-cd.c | 88 ++---- drivers/ide/ide-cd.h | 4 - drivers/ide/ide-cs.c | 6 +- drivers/ide/ide-disk.c | 5 +- drivers/ide/ide-dma.c | 20 +- drivers/ide/ide-eh.c | 9 +- drivers/ide/ide-floppy.c | 24 +- drivers/ide/ide-generic.c | 7 +- drivers/ide/ide-h8300.c | 10 +- drivers/ide/ide-io.c | 83 ++--- drivers/ide/ide-ioctls.c | 1 - drivers/ide/ide-legacy.c | 7 +- drivers/ide/ide-park.c | 7 +- drivers/ide/ide-pm.c | 38 +-- drivers/ide/ide-pnp.c | 6 +- drivers/ide/ide-probe.c | 34 ++- drivers/ide/ide-tape.c | 734 ++++++++++---------------------------------- drivers/ide/ide-taskfile.c | 20 +- drivers/ide/ide_platform.c | 9 +- drivers/ide/macide.c | 9 +- drivers/ide/palm_bk3710.c | 6 +- drivers/ide/pmac.c | 13 +- drivers/ide/q40ide.c | 11 +- drivers/ide/rapide.c | 8 +- drivers/ide/scc_pata.c | 6 +- drivers/ide/setup-pci.c | 21 +- drivers/ide/sgiioc4.c | 7 +- drivers/ide/siimage.c | 4 +- drivers/ide/tx4938ide.c | 5 +- drivers/ide/tx4939ide.c | 5 +- include/linux/ide.h | 64 ++--- 44 files changed, 543 insertions(+), 994 deletions(-) Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/ahci.c | 17 ++++++++--------- drivers/ata/libata-sff.c | 20 +++++++++++++------- drivers/ata/sata_sil.c | 2 +- drivers/ata/sata_sx4.c | 11 +++++++---- 4 files changed, 29 insertions(+), 21 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/hw/amso1100/c2_cq.c | 4 +- drivers/infiniband/hw/ehca/ehca_irq.c | 9 ++-- drivers/infiniband/hw/ehca/ehca_main.c | 2 +- drivers/infiniband/hw/ehca/ehca_qp.c | 94 ++++++++++++++++++-------------- drivers/infiniband/hw/ehca/hcp_if.c | 6 +- drivers/infiniband/hw/ehca/hcp_if.h | 2 +- drivers/infiniband/hw/ehca/hcp_phyp.c | 11 +++-- drivers/infiniband/hw/ehca/hcp_phyp.h | 2 +- drivers/infiniband/hw/ehca/ipz_pt_fn.c | 19 +++++-- drivers/infiniband/hw/nes/nes_hw.c | 14 +++--- 10 files changed, 93 insertions(+), 70 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 5 + arch/x86/kernel/reboot.c | 2 +- drivers/acpi/acpica/acglobal.h | 3 - drivers/acpi/acpica/dsobject.c | 5 +- drivers/acpi/acpica/dsopcode.c | 17 +- drivers/acpi/acpica/dswstate.c | 4 +- drivers/acpi/acpica/evxfevnt.c | 4 +- drivers/acpi/acpica/exmutex.c | 9 +- drivers/acpi/acpica/hwregs.c | 4 +- drivers/acpi/acpica/nsnames.c | 2 +- drivers/acpi/acpica/nspredef.c | 7 +- drivers/acpi/acpica/nssearch.c | 4 + drivers/acpi/acpica/rscalc.c | 3 - drivers/acpi/acpica/rsxface.c | 8 +- drivers/acpi/acpica/tbfadt.c | 16 +- drivers/acpi/acpica/tbinstal.c | 2 +- drivers/acpi/acpica/utcopy.c | 23 + drivers/acpi/acpica/utdebug.c | 8 +- drivers/acpi/acpica/utmisc.c | 20 +- drivers/acpi/acpica/utmutex.c | 26 +- drivers/platform/x86/Kconfig | 14 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/eeepc-laptop.c | 87 ++++ drivers/platform/x86/oqo-wmi.c | 941 +++++++++++++++++++++++++++++++++++ drivers/platform/x86/toshiba_acpi.c | 206 ++++++++- include/acpi/acpixf.h | 7 +- include/acpi/actypes.h | 20 +- include/acpi/platform/acgcc.h | 4 + include/acpi/platform/aclinux.h | 63 ++- 29 files changed, 1395 insertions(+), 120 deletions(-) create mode 100644 drivers/platform/x86/oqo-wmi.c Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/fw-cdev.c | 6 +----- drivers/firewire/fw-device.c | 3 ++- drivers/firewire/fw-device.h | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/master $ git merge kvm/master Auto-merging arch/x86/include/asm/cpufeature.h Auto-merging arch/x86/kernel/kvm.c Auto-merging arch/x86/kernel/smp.c Merge made by recursive. arch/ia64/include/asm/kvm_host.h | 5 +- arch/ia64/include/asm/pgtable.h | 2 + arch/ia64/kernel/irq_ia64.c | 3 + arch/ia64/kvm/Kconfig | 2 +- arch/ia64/kvm/kvm-ia64.c | 263 ++++++++----- arch/ia64/kvm/kvm_fw.c | 28 ++- arch/ia64/kvm/lapic.h | 6 +- arch/ia64/kvm/optvfault.S | 30 ++ arch/ia64/kvm/process.c | 5 + arch/ia64/kvm/vcpu.c | 20 +- arch/ia64/kvm/vmm.c | 12 +- arch/ia64/kvm/vmm_ivt.S | 18 +- arch/ia64/kvm/vtlb.c | 3 +- arch/powerpc/kvm/powerpc.c | 6 + arch/s390/include/asm/kvm_host.h | 5 +- arch/s390/kvm/intercept.c | 28 +- arch/s390/kvm/interrupt.c | 59 ++- arch/s390/kvm/kvm-s390.c | 63 +++- arch/s390/kvm/kvm-s390.h | 4 +- arch/s390/kvm/priv.c | 4 +- arch/s390/kvm/sigp.c | 16 +- arch/x86/include/asm/cpufeature.h | 2 + arch/x86/include/asm/kvm.h | 1 + arch/x86/include/asm/kvm_host.h | 44 ++- arch/x86/include/asm/kvm_x86_emulate.h | 6 + arch/x86/include/asm/svm.h | 1 + arch/x86/kernel/kvm.c | 4 + arch/x86/kernel/smp.c | 3 + arch/x86/kvm/Kconfig | 6 + arch/x86/kvm/Makefile | 2 +- arch/x86/kvm/i8254.c | 109 +++--- arch/x86/kvm/i8254.h | 12 +- arch/x86/kvm/irq.c | 7 + arch/x86/kvm/kvm_timer.h | 18 + arch/x86/kvm/lapic.c | 251 ++++-------- arch/x86/kvm/lapic.h | 12 +- arch/x86/kvm/mmu.c | 194 ++++++---- arch/x86/kvm/mmu.h | 5 + arch/x86/kvm/paging_tmpl.h | 16 +- arch/x86/kvm/svm.c | 415 +++++++++++--------- arch/x86/kvm/timer.c | 46 +++ arch/x86/kvm/vmx.c | 643 ++++++++++++++++--------------- arch/x86/kvm/x86.c | 409 +++++++++++++------- arch/x86/kvm/x86.h | 14 +- arch/x86/kvm/x86_emulate.c | 141 +++---- include/linux/kvm.h | 46 ++- include/linux/kvm_host.h | 23 +- include/linux/kvm_types.h | 27 ++ virt/kvm/ioapic.c | 153 +------- virt/kvm/ioapic.h | 27 +- virt/kvm/iommu.c | 27 ++- virt/kvm/irq_comm.c | 111 +++--- virt/kvm/kvm_main.c | 665 +++++++++++++++++++++++--------- 53 files changed, 2398 insertions(+), 1624 deletions(-) create mode 100644 arch/x86/kvm/kvm_timer.h create mode 100644 arch/x86/kvm/timer.c Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/dir.c | 7 ++++--- fs/dlm/lockspace.c | 17 ++++++++--------- fs/dlm/lowcomms.c | 22 ++++++++++++++++++---- fs/dlm/lowcomms.h | 3 ++- fs/dlm/member.c | 19 +++++++++++++------ fs/dlm/requestqueue.c | 2 +- include/linux/dlm.h | 4 ++-- 7 files changed, 48 insertions(+), 26 deletions(-) Merging scsi/master $ git merge scsi/master Resolved 'include/Kbuild' using previous resolution. Auto-merging drivers/scsi/Kconfig Auto-merging drivers/scsi/Makefile Removing drivers/scsi/mvsas.c Auto-merging drivers/scsi/scsi_scan.c Auto-merging include/Kbuild CONFLICT (content): Merge conflict in include/Kbuild Auto-merging include/scsi/scsi_transport_fc.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master dc15965] Merge commit 'scsi/master' $ git diff -M --stat --summary HEAD^.. Documentation/scsi/scsi_fc_transport.txt | 14 +- Documentation/scsi/scsi_mid_low_api.txt | 5 + drivers/s390/scsi/zfcp_aux.c | 10 +- drivers/s390/scsi/zfcp_def.h | 18 +- drivers/s390/scsi/zfcp_erp.c | 2 +- drivers/s390/scsi/zfcp_ext.h | 6 +- drivers/s390/scsi/zfcp_fc.c | 188 ++- drivers/s390/scsi/zfcp_scsi.c | 15 + drivers/scsi/Kconfig | 11 +- drivers/scsi/Makefile | 2 +- drivers/scsi/mvsas.c | 3222 ------------------------------ drivers/scsi/mvsas/Kconfig | 42 + drivers/scsi/mvsas/Makefile | 32 + drivers/scsi/mvsas/mv_64xx.c | 793 ++++++++ drivers/scsi/mvsas/mv_64xx.h | 151 ++ drivers/scsi/mvsas/mv_94xx.c | 672 +++++++ drivers/scsi/mvsas/mv_94xx.h | 222 ++ drivers/scsi/mvsas/mv_chips.h | 280 +++ drivers/scsi/mvsas/mv_defs.h | 502 +++++ drivers/scsi/mvsas/mv_init.c | 703 +++++++ drivers/scsi/mvsas/mv_sas.c | 2157 ++++++++++++++++++++ drivers/scsi/mvsas/mv_sas.h | 406 ++++ drivers/scsi/qla1280.c | 387 ++-- drivers/scsi/qla1280.h | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 81 +- drivers/scsi/qla2xxx/qla_dbg.c | 7 +- drivers/scsi/qla2xxx/qla_def.h | 34 +- drivers/scsi/qla2xxx/qla_fw.h | 2 +- drivers/scsi/qla2xxx/qla_gbl.h | 29 +- drivers/scsi/qla2xxx/qla_gs.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 90 +- drivers/scsi/qla2xxx/qla_iocb.c | 59 +- drivers/scsi/qla2xxx/qla_isr.c | 236 +-- drivers/scsi/qla2xxx/qla_mbx.c | 90 +- drivers/scsi/qla2xxx/qla_mid.c | 118 +- drivers/scsi/qla2xxx/qla_os.c | 233 ++- drivers/scsi/qla2xxx/qla_sup.c | 38 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/scsi_scan.c | 4 +- drivers/scsi/scsi_transport_fc.c | 616 ++++++- include/Kbuild | 1 + include/scsi/Kbuild | 4 + include/scsi/scsi_bsg_fc.h | 322 +++ include/scsi/scsi_host.h | 9 + include/scsi/scsi_transport_fc.h | 52 +- 45 files changed, 7980 insertions(+), 3892 deletions(-) delete mode 100644 drivers/scsi/mvsas.c create mode 100644 drivers/scsi/mvsas/Kconfig create mode 100644 drivers/scsi/mvsas/Makefile create mode 100644 drivers/scsi/mvsas/mv_64xx.c create mode 100644 drivers/scsi/mvsas/mv_64xx.h create mode 100644 drivers/scsi/mvsas/mv_94xx.c create mode 100644 drivers/scsi/mvsas/mv_94xx.h create mode 100644 drivers/scsi/mvsas/mv_chips.h create mode 100644 drivers/scsi/mvsas/mv_defs.h create mode 100644 drivers/scsi/mvsas/mv_init.c create mode 100644 drivers/scsi/mvsas/mv_sas.c create mode 100644 drivers/scsi/mvsas/mv_sas.h create mode 100644 include/scsi/Kbuild create mode 100644 include/scsi/scsi_bsg_fc.h Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging net/master $ git merge net/master Resolved 'include/linux/mmc/sdio_ids.h' using previous resolution. Renaming drivers/net/wireless/ath5k/base.c => drivers/net/wireless/ath/ath5k/base.c Auto-merging drivers/net/wireless/ath/ath5k/base.c Auto-merging MAINTAINERS Auto-merging drivers/net/atl1c/atl1c_main.c Auto-merging drivers/net/benet/be_main.c Removing drivers/net/bnx2x_init_values.h Auto-merging drivers/net/bonding/bond_main.c Auto-merging drivers/net/ucc_geth.c Auto-merging drivers/net/ucc_geth.h Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/rtl818x/rtl8187.h Auto-merging drivers/net/wireless/rtl818x/rtl8187_dev.c Auto-merging drivers/of/base.c Auto-merging drivers/pci/quirks.c Auto-merging drivers/platform/x86/sony-laptop.c Auto-merging drivers/platform/x86/toshiba_acpi.c Auto-merging include/linux/mmc/sdio_ids.h CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h Auto-merging include/linux/pci_ids.h Removing include/net/wireless.h Auto-merging net/core/drop_monitor.c Auto-merging net/mac80211/rc80211_minstrel.c Auto-merging net/mac80211/rc80211_pid_algo.c Auto-merging net/rds/rds.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e9bcba9] Merge commit 'net/master' $ git diff -M --stat --summary HEAD^.. Documentation/isdn/00-INDEX | 29 +- Documentation/networking/ip-sysctl.txt | 11 +- Documentation/networking/mac80211-injection.txt | 28 +- Documentation/rfkill.txt | 16 +- MAINTAINERS | 12 +- arch/arm/mach-pxa/tosa-bt.c | 4 +- arch/powerpc/platforms/82xx/ep8248e.c | 9 +- arch/powerpc/platforms/pasemi/gpio_mdio.c | 32 +- drivers/net/3c509.c | 12 +- drivers/net/8139too.c | 92 +- drivers/net/82596.c | 14 +- drivers/net/8390.c | 10 +- drivers/net/8390p.c | 19 +- drivers/net/Kconfig | 18 +- drivers/net/Makefile | 3 + drivers/net/atl1c/atl1c_main.c | 24 +- drivers/net/atl1e/atl1e_main.c | 3 +- drivers/net/atlx/atl1.c | 7 +- drivers/net/benet/be_main.c | 28 +- drivers/net/bmac.c | 16 +- drivers/net/bnx2x.h | 15 + drivers/net/bnx2x_fw_file_hdr.h | 37 + drivers/net/bnx2x_init.h | 605 +- drivers/net/bnx2x_init_ops.h | 442 + drivers/net/bnx2x_init_values.h |16322 --------------------- drivers/net/bnx2x_main.c | 358 +- drivers/net/bonding/bond_3ad.c | 5 +- drivers/net/bonding/bond_3ad.h | 4 +- drivers/net/bonding/bond_main.c | 64 +- drivers/net/chelsio/common.h | 2 +- drivers/net/chelsio/cphy.h | 45 +- drivers/net/chelsio/cxgb2.c | 36 +- drivers/net/chelsio/mv88x201x.c | 45 +- drivers/net/chelsio/my3126.c | 10 +- drivers/net/chelsio/sge.c | 4 +- drivers/net/chelsio/subr.c | 43 +- drivers/net/cpmac.c | 23 +- drivers/net/cxgb3/adapter.h | 2 +- drivers/net/cxgb3/ael1002.c | 146 +- drivers/net/cxgb3/common.h | 53 +- drivers/net/cxgb3/cxgb3_main.c | 71 +- drivers/net/cxgb3/sge.c | 53 +- drivers/net/cxgb3/t3_hw.c | 78 +- drivers/net/cxgb3/vsc8211.c | 70 +- drivers/net/depca.c | 4 +- drivers/net/dm9000.c | 30 +- drivers/net/e1000/e1000_main.c | 15 +- drivers/net/e1000e/netdev.c | 19 +- drivers/net/ehea/ehea_main.c | 8 +- drivers/net/fec.c | 897 +- drivers/net/fec.h | 127 +- drivers/net/fec_mpc52xx.c | 180 +- drivers/net/fec_mpc52xx_phy.c | 26 +- drivers/net/forcedeth.c | 23 + drivers/net/fs_enet/fs_enet-main.c | 108 +- drivers/net/fs_enet/fs_enet.h | 5 - drivers/net/fs_enet/mac-fec.c | 34 - drivers/net/fs_enet/mii-bitbang.c | 29 +- drivers/net/fs_enet/mii-fec.c | 32 +- drivers/net/fsl_pq_mdio.c | 53 +- drivers/net/gianfar.c | 112 +- drivers/net/gianfar.h | 4 +- drivers/net/hp100.c | 4 +- drivers/net/hplance.c | 21 +- drivers/net/ibmveth.c | 40 +- drivers/net/igb/e1000_82575.h | 1 + drivers/net/igb/e1000_defines.h | 3 +- drivers/net/igb/e1000_mbx.c | 8 +- drivers/net/igb/igb.h | 2 +- drivers/net/igb/igb_ethtool.c | 20 +- drivers/net/igb/igb_main.c | 101 +- drivers/net/igbvf/ethtool.c | 36 +- drivers/net/igbvf/igbvf.h | 6 +- drivers/net/igbvf/netdev.c | 17 +- drivers/net/irda/au1k_ir.c | 18 +- drivers/net/irda/pxaficp_ir.c | 16 +- drivers/net/irda/sa1100_ir.c | 18 +- drivers/net/iseries_veth.c | 17 +- drivers/net/ixgb/ixgb_hw.c | 20 +- drivers/net/ixgb/ixgb_hw.h | 14 +- drivers/net/ixgb/ixgb_main.c | 15 +- drivers/net/ixgb/ixgb_osdep.h | 2 +- drivers/net/ixgbe/Makefile | 2 + drivers/net/ixgbe/ixgbe.h | 34 +- drivers/net/ixgbe/ixgbe_82598.c | 209 +- drivers/net/ixgbe/ixgbe_82599.c | 255 +- drivers/net/ixgbe/ixgbe_common.c | 9 +- drivers/net/ixgbe/ixgbe_dcb_nl.c | 16 +- drivers/net/ixgbe/ixgbe_ethtool.c | 45 +- drivers/net/ixgbe/ixgbe_fcoe.c | 532 + drivers/net/ixgbe/ixgbe_fcoe.h | 66 + drivers/net/ixgbe/ixgbe_main.c | 831 +- drivers/net/ixgbe/ixgbe_phy.c | 136 +- drivers/net/ixgbe/ixgbe_phy.h | 1 + drivers/net/ixgbe/ixgbe_type.h | 157 +- drivers/net/ixp2000/ixpdev.c | 19 +- drivers/net/jazzsonic.c | 19 +- drivers/net/korina.c | 25 +- drivers/net/lasi_82596.c | 6 +- drivers/net/lib82596.c | 23 +- drivers/net/ll_temac.h | 374 + drivers/net/ll_temac_main.c | 969 ++ drivers/net/ll_temac_mdio.c | 120 + drivers/net/loopback.c | 21 +- drivers/net/macb.c | 18 + drivers/net/mace.c | 16 +- drivers/net/macmace.c | 18 +- drivers/net/macvlan.c | 22 +- drivers/net/mdio.c | 414 + drivers/net/meth.c | 28 +- drivers/net/mii.c | 91 +- drivers/net/mipsnet.c | 15 +- drivers/net/mv643xx_eth.c | 87 +- drivers/net/mvme147.c | 17 +- drivers/net/myri10ge/myri10ge.c | 38 +- drivers/net/ne2k-pci.c | 2 +- drivers/net/ne3210.c | 4 +- drivers/net/netx-eth.c | 17 +- drivers/net/netxen/netxen_nic.h | 624 +- drivers/net/netxen/netxen_nic_ctx.c | 241 +- drivers/net/netxen/netxen_nic_ethtool.c | 106 +- drivers/net/netxen/netxen_nic_hdr.h | 8 - drivers/net/netxen/netxen_nic_hw.c | 737 +- drivers/net/netxen/netxen_nic_hw.h | 76 +- drivers/net/netxen/netxen_nic_init.c | 536 +- drivers/net/netxen/netxen_nic_main.c | 411 +- drivers/net/netxen/netxen_nic_niu.c | 341 +- drivers/net/netxen/netxen_nic_phan_reg.h | 27 +- drivers/net/pasemi_mac.c | 58 +- drivers/net/pasemi_mac.h | 1 - drivers/net/pci-skeleton.c | 19 +- drivers/net/pcmcia/3c574_cs.c | 2 +- drivers/net/pcmcia/3c589_cs.c | 4 +- drivers/net/pcnet32.c | 5 +- drivers/net/phy/mdio_bus.c | 29 +- drivers/net/phy/phy_device.c | 163 +- drivers/net/pppol2tp.c | 3 +- drivers/net/r6040.c | 12 +- drivers/net/r8169.c | 61 +- drivers/net/rionet.c | 14 +- drivers/net/s2io-regs.h | 5 - drivers/net/s2io.c | 21 +- drivers/net/sb1250-mac.c | 35 +- drivers/net/sfc/Kconfig | 2 +- drivers/net/sfc/boards.c | 2 - drivers/net/sfc/efx.c | 14 +- drivers/net/sfc/ethtool.c | 19 +- drivers/net/sfc/falcon.c | 137 +- drivers/net/sfc/falcon_hwdefs.h | 3 - drivers/net/sfc/falcon_xmac.c | 2 +- drivers/net/sfc/mdio_10g.c | 385 +- drivers/net/sfc/mdio_10g.h | 282 +- drivers/net/sfc/net_driver.h | 34 +- drivers/net/sfc/rx.c | 26 +- drivers/net/sfc/selftest.c | 21 +- drivers/net/sfc/selftest.h | 2 +- drivers/net/sfc/sfe4001.c | 3 - drivers/net/sfc/tenxpress.c | 226 +- drivers/net/sfc/xenpack.h | 15 +- drivers/net/sfc/xfp_phy.c | 51 +- drivers/net/sgiseeq.c | 18 +- drivers/net/smc-mca.c | 4 +- drivers/net/smc911x.c | 23 +- drivers/net/smsc911x.c | 61 +- drivers/net/sun3lance.c | 17 +- drivers/net/tg3.c | 89 +- drivers/net/tg3.h | 6 + drivers/net/tulip/de4x5.c | 6 +- drivers/net/tulip/winbond-840.c | 3 +- drivers/net/tun.c | 93 +- drivers/net/ucc_geth.c | 75 +- drivers/net/ucc_geth.h | 3 +- drivers/net/usb/Kconfig | 8 + drivers/net/usb/Makefile | 1 + drivers/net/usb/cdc_ether.c | 33 +- drivers/net/usb/hso.c | 8 +- drivers/net/usb/int51x1.c | 253 + drivers/net/usb/kaweth.c | 33 +- drivers/net/usb/usbnet.c | 37 +- drivers/net/virtio_net.c | 12 +- drivers/net/vxge/vxge-traffic.c | 4 +- drivers/net/wan/pc300_drv.c | 20 +- drivers/net/wireless/Kconfig | 17 +- drivers/net/wireless/Makefile | 6 +- drivers/net/wireless/adm8211.c | 14 +- drivers/net/wireless/at76c50x-usb.c | 19 +- drivers/net/wireless/ath/Kconfig | 8 + drivers/net/wireless/ath/Makefile | 6 + drivers/net/wireless/{ => ath}/ar9170/Kconfig | 1 + drivers/net/wireless/{ => ath}/ar9170/Makefile | 0 drivers/net/wireless/{ => ath}/ar9170/ar9170.h | 32 +- drivers/net/wireless/{ => ath}/ar9170/cmd.c | 0 drivers/net/wireless/{ => ath}/ar9170/cmd.h | 0 drivers/net/wireless/{ => ath}/ar9170/eeprom.h | 0 drivers/net/wireless/{ => ath}/ar9170/hw.h | 17 +- drivers/net/wireless/{ => ath}/ar9170/led.c | 0 drivers/net/wireless/{ => ath}/ar9170/mac.c | 33 +- drivers/net/wireless/{ => ath}/ar9170/main.c | 657 +- drivers/net/wireless/{ => ath}/ar9170/phy.c | 0 drivers/net/wireless/{ => ath}/ar9170/usb.c | 6 +- drivers/net/wireless/{ => ath}/ar9170/usb.h | 2 +- drivers/net/wireless/{ => ath}/ath5k/Kconfig | 1 + drivers/net/wireless/{ => ath}/ath5k/Makefile | 0 drivers/net/wireless/{ => ath}/ath5k/ath5k.h | 42 +- drivers/net/wireless/{ => ath}/ath5k/attach.c | 1 - drivers/net/wireless/{ => ath}/ath5k/base.c | 284 +- drivers/net/wireless/{ => ath}/ath5k/base.h | 1 - drivers/net/wireless/{ => ath}/ath5k/caps.c | 0 drivers/net/wireless/{ => ath}/ath5k/debug.c | 0 drivers/net/wireless/{ => ath}/ath5k/debug.h | 0 drivers/net/wireless/{ => ath}/ath5k/desc.c | 0 drivers/net/wireless/{ => ath}/ath5k/desc.h | 0 drivers/net/wireless/{ => ath}/ath5k/dma.c | 2 - drivers/net/wireless/{ => ath}/ath5k/eeprom.c | 73 +- drivers/net/wireless/{ => ath}/ath5k/eeprom.h | 46 +- drivers/net/wireless/{ => ath}/ath5k/gpio.c | 0 drivers/net/wireless/{ => ath}/ath5k/initvals.c | 8 +- drivers/net/wireless/{ => ath}/ath5k/led.c | 10 +- drivers/net/wireless/{ => ath}/ath5k/pcu.c | 6 +- drivers/net/wireless/{ => ath}/ath5k/phy.c | 542 +- drivers/net/wireless/{ => ath}/ath5k/qcu.c | 7 +- drivers/net/wireless/{ => ath}/ath5k/reg.h | 9 +- drivers/net/wireless/{ => ath}/ath5k/reset.c | 77 +- drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h | 0 drivers/net/wireless/{ => ath}/ath5k/rfgain.h | 0 drivers/net/wireless/{ => ath}/ath9k/Kconfig | 1 + drivers/net/wireless/{ => ath}/ath9k/Makefile | 1 - drivers/net/wireless/{ => ath}/ath9k/ahb.c | 0 drivers/net/wireless/{ => ath}/ath9k/ani.c | 8 +- drivers/net/wireless/{ => ath}/ath9k/ani.h | 0 drivers/net/wireless/{ => ath}/ath9k/ath9k.h | 110 +- drivers/net/wireless/{ => ath}/ath9k/beacon.c | 28 +- drivers/net/wireless/{ => ath}/ath9k/calib.c | 129 +- drivers/net/wireless/{ => ath}/ath9k/calib.h | 33 +- drivers/net/wireless/{ => ath}/ath9k/debug.c | 3 + drivers/net/wireless/{ => ath}/ath9k/debug.h | 24 +- drivers/net/wireless/{ => ath}/ath9k/eeprom.c | 24 +- drivers/net/wireless/{ => ath}/ath9k/eeprom.h | 2 + drivers/net/wireless/{ => ath}/ath9k/hw.c | 216 +- drivers/net/wireless/{ => ath}/ath9k/hw.h | 93 +- drivers/net/wireless/{ => ath}/ath9k/initvals.h | 0 drivers/net/wireless/{ => ath}/ath9k/mac.c | 63 +- drivers/net/wireless/{ => ath}/ath9k/mac.h | 0 drivers/net/wireless/{ => ath}/ath9k/main.c | 580 +- drivers/net/wireless/{ => ath}/ath9k/pci.c | 0 drivers/net/wireless/{ => ath}/ath9k/phy.c | 4 +- drivers/net/wireless/{ => ath}/ath9k/phy.h | 3 - drivers/net/wireless/{ => ath}/ath9k/rc.c | 96 +- drivers/net/wireless/{ => ath}/ath9k/rc.h | 4 - drivers/net/wireless/{ => ath}/ath9k/recv.c | 85 +- drivers/net/wireless/{ => ath}/ath9k/reg.h | 0 drivers/net/wireless/{ => ath}/ath9k/virtual.c | 0 drivers/net/wireless/{ => ath}/ath9k/xmit.c | 74 +- drivers/net/wireless/ath/main.c | 22 + drivers/net/wireless/{ath9k => ath}/regd.c | 241 +- drivers/net/wireless/{ath9k => ath}/regd.h | 40 +- drivers/net/wireless/{ath9k => ath}/regd_common.h | 0 drivers/net/wireless/atmel_cs.c | 2 +- drivers/net/wireless/b43/Kconfig | 8 +- drivers/net/wireless/b43/b43.h | 8 +- drivers/net/wireless/b43/main.c | 145 +- drivers/net/wireless/b43/rfkill.c | 1 - drivers/net/wireless/b43legacy/Kconfig | 8 +- drivers/net/wireless/b43legacy/b43legacy.h | 8 +- drivers/net/wireless/b43legacy/main.c | 266 +- drivers/net/wireless/b43legacy/rfkill.c | 1 - drivers/net/wireless/b43legacy/xmit.c | 2 +- drivers/net/wireless/b43legacy/xmit.h | 4 +- drivers/net/wireless/hostap/hostap_hw.c | 2 +- drivers/net/wireless/hostap/hostap_plx.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 8 +- drivers/net/wireless/ipw2x00/ipw2200.c | 54 +- drivers/net/wireless/ipw2x00/libipw_module.c | 4 - drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 9 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 206 + drivers/net/wireless/iwlwifi/iwl-3945.h | 6 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 13 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 17 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 437 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 25 + drivers/net/wireless/iwlwifi/iwl-agn.c | 815 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 7 +- drivers/net/wireless/iwlwifi/iwl-core.c | 709 +- drivers/net/wireless/iwlwifi/iwl-core.h | 56 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 1 + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 96 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 23 +- drivers/net/wireless/iwlwifi/iwl-rfkill.c | 1 - drivers/net/wireless/iwlwifi/iwl-rx.c | 7 - drivers/net/wireless/iwlwifi/iwl-scan.c | 195 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 27 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 12 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 1084 +-- drivers/net/wireless/libertas/cmd.c | 26 +- drivers/net/wireless/libertas/defs.h | 21 + drivers/net/wireless/libertas/dev.h | 1 + drivers/net/wireless/libertas/host.h | 3 +- drivers/net/wireless/libertas/hostcmd.h | 28 +- drivers/net/wireless/libertas/if_cs.c | 34 +- drivers/net/wireless/libertas/if_sdio.c | 17 +- drivers/net/wireless/libertas/if_sdio.h | 2 + drivers/net/wireless/libertas/if_spi.c | 6 +- drivers/net/wireless/libertas/if_usb.c | 3 +- drivers/net/wireless/libertas/main.c | 44 +- drivers/net/wireless/libertas/rx.c | 48 +- drivers/net/wireless/libertas/tx.c | 8 +- drivers/net/wireless/libertas/types.h | 2 + drivers/net/wireless/libertas_tf/if_usb.c | 3 +- drivers/net/wireless/libertas_tf/main.c | 56 +- drivers/net/wireless/mac80211_hwsim.c | 45 +- drivers/net/wireless/mwl8k.c | 18 +- drivers/net/wireless/p54/p54.h | 74 +- drivers/net/wireless/p54/p54common.c | 302 +- drivers/net/wireless/p54/p54spi.c | 127 +- drivers/net/wireless/p54/p54usb.c | 314 +- drivers/net/wireless/p54/p54usb.h | 16 +- drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rndis_wlan.c | 652 +- drivers/net/wireless/rt2x00/Kconfig | 17 + drivers/net/wireless/rt2x00/Makefile | 2 + drivers/net/wireless/rt2x00/rt2400pci.c | 3 +- drivers/net/wireless/rt2x00/rt2500pci.c | 3 +- drivers/net/wireless/rt2x00/rt2500usb.c | 3 +- drivers/net/wireless/rt2x00/rt2800usb.c | 3071 ++++ drivers/net/wireless/rt2x00/rt2800usb.h | 1945 +++ drivers/net/wireless/rt2x00/rt2x00.h | 50 +- drivers/net/wireless/rt2x00/rt2x00config.c | 5 + drivers/net/wireless/rt2x00/rt2x00crypto.c | 87 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 125 +- drivers/net/wireless/rt2x00/rt2x00ht.c | 69 + drivers/net/wireless/rt2x00/rt2x00lib.h | 65 +- drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 88 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 16 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 48 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 53 +- drivers/net/wireless/rt2x00/rt61pci.c | 8 +- drivers/net/wireless/rt2x00/rt61pci.h | 6 - drivers/net/wireless/rt2x00/rt73usb.c | 4 +- drivers/net/wireless/rtl818x/Makefile | 2 +- drivers/net/wireless/rtl818x/rtl8180_dev.c | 33 +- drivers/net/wireless/rtl818x/rtl8187.h | 7 + drivers/net/wireless/rtl818x/rtl8187_dev.c | 69 +- drivers/net/wireless/rtl818x/rtl8187_leds.c | 218 + drivers/net/wireless/rtl818x/rtl8187_leds.h | 57 + drivers/net/wireless/wl12xx/Kconfig | 11 + drivers/net/wireless/wl12xx/Makefile | 4 + drivers/net/wireless/wl12xx/acx.c | 689 + drivers/net/wireless/wl12xx/acx.h | 1245 ++ drivers/net/wireless/wl12xx/boot.c | 295 + drivers/net/wireless/wl12xx/boot.h | 40 + drivers/net/wireless/wl12xx/cmd.c | 353 + drivers/net/wireless/wl12xx/cmd.h | 265 + drivers/net/wireless/wl12xx/debugfs.c | 508 + drivers/net/wireless/wl12xx/debugfs.h | 33 + drivers/net/wireless/wl12xx/event.c | 127 + drivers/net/wireless/wl12xx/event.h | 121 + drivers/net/wireless/wl12xx/init.c | 200 + drivers/net/wireless/wl12xx/init.h | 40 + drivers/net/wireless/wl12xx/main.c | 1358 ++ drivers/net/wireless/wl12xx/ps.c | 151 + drivers/net/wireless/wl12xx/ps.h | 36 + drivers/net/wireless/wl12xx/reg.h | 745 + drivers/net/wireless/wl12xx/rx.c | 208 + drivers/net/wireless/wl12xx/rx.h | 122 + drivers/net/wireless/wl12xx/spi.c | 358 + drivers/net/wireless/wl12xx/spi.h | 109 + drivers/net/wireless/wl12xx/tx.c | 557 + drivers/net/wireless/wl12xx/tx.h | 215 + drivers/net/wireless/wl12xx/wl1251.c | 709 + drivers/net/wireless/wl12xx/wl1251.h | 165 + drivers/net/wireless/wl12xx/wl12xx.h | 409 + drivers/net/wireless/wl12xx/wl12xx_80211.h | 156 + drivers/net/wireless/zd1211rw/zd_mac.c | 80 +- drivers/of/Kconfig | 6 + drivers/of/Makefile | 1 + drivers/of/base.c | 24 + drivers/of/of_mdio.c | 139 + drivers/pci/quirks.c | 2 + drivers/platform/x86/acer-wmi.c | 1 - drivers/platform/x86/hp-wmi.c | 3 - drivers/platform/x86/sony-laptop.c | 4 - drivers/platform/x86/toshiba_acpi.c | 1 - drivers/serial/serial_cs.c | 22 +- firmware/Makefile | 3 + firmware/WHENCE | 40 + firmware/bnx2x-e1-4.8.53.0.fw.ihex |10364 +++++++++++++ firmware/bnx2x-e1h-4.8.53.0.fw.ihex |12028 +++++++++++++++ firmware/cis/3CCFEM556.cis.ihex | 13 + firmware/cis/3CXEM556.cis.ihex | 13 + include/linux/etherdevice.h | 27 + include/linux/ethtool.h | 15 +- include/linux/fs_enet_pd.h | 6 +- include/linux/ieee80211.h | 43 +- include/linux/if_tun.h | 1 + include/linux/if_vlan.h | 6 +- include/linux/mdio.h | 312 + include/linux/mii.h | 34 +- include/linux/mmc/sdio_ids.h | 2 + include/linux/netdevice.h | 105 +- include/linux/nl80211.h | 127 +- include/linux/of.h | 3 + include/linux/of_mdio.h | 22 + include/linux/pci_ids.h | 2 + include/linux/phy.h | 6 + include/linux/rfkill.h | 14 - include/linux/skbuff.h | 8 +- include/linux/smsc911x.h | 10 + include/linux/snmp.h | 10 +- include/linux/socket.h | 7 +- include/linux/spi/wl12xx.h | 31 + include/linux/tcp.h | 4 +- include/linux/usb/usbnet.h | 1 + include/net/cfg80211.h | 897 +- include/net/fib_rules.h | 1 - include/net/ip.h | 3 + include/net/ip_fib.h | 3 - include/net/ipv6.h | 15 +- include/net/iucv/af_iucv.h | 9 + include/net/mac80211.h | 190 +- include/net/regulatory.h | 101 + include/net/snmp.h | 19 +- include/net/tcp.h | 59 +- include/net/wireless.h | 472 - net/8021q/vlan_core.c | 4 +- net/8021q/vlan_dev.c | 23 +- net/core/datagram.c | 116 +- net/core/dev.c | 363 +- net/core/drop_monitor.c | 13 +- net/core/fib_rules.c | 2 +- net/core/iovec.c | 33 +- net/core/net_namespace.c | 47 +- net/decnet/dn_nsp_in.c | 17 +- net/decnet/dn_rules.c | 2 +- net/ipv4/af_inet.c | 2 - net/ipv4/fib_rules.c | 2 +- net/ipv4/inet_diag.c | 2 - net/ipv4/inet_timewait_sock.c | 23 +- net/ipv4/ip_input.c | 13 +- net/ipv4/ip_output.c | 12 +- net/ipv4/proc.c | 10 +- net/ipv4/syncookies.c | 5 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/fib6_rules.c | 2 +- net/ipv6/ip6_input.c | 7 +- net/ipv6/ip6_output.c | 9 +- net/ipv6/ip6_tunnel.c | 4 +- net/ipv6/mcast.c | 19 +- net/ipv6/ndisc.c | 4 +- net/ipv6/proc.c | 10 +- net/ipv6/raw.c | 2 +- net/ipv6/syncookies.c | 4 +- net/ipv6/tcp_ipv6.c | 2 +- net/iucv/af_iucv.c | 408 +- net/iucv/iucv.c | 43 +- net/llc/af_llc.c | 2 +- net/mac80211/Kconfig | 16 + net/mac80211/agg-rx.c | 19 +- net/mac80211/agg-tx.c | 13 +- net/mac80211/cfg.c | 94 +- net/mac80211/debugfs.c | 28 +- net/mac80211/driver-ops.h | 184 + net/mac80211/event.c | 17 +- net/mac80211/ht.c | 84 - net/mac80211/ibss.c | 421 +- net/mac80211/ieee80211_i.h | 99 +- net/mac80211/iface.c | 112 +- net/mac80211/key.c | 8 +- net/mac80211/main.c | 285 +- net/mac80211/mesh.c | 6 +- net/mac80211/mlme.c | 517 +- net/mac80211/pm.c | 130 +- net/mac80211/rc80211_minstrel.c | 8 +- net/mac80211/rc80211_pid_algo.c | 8 +- net/mac80211/rx.c | 140 +- net/mac80211/scan.c | 396 +- net/mac80211/spectmgmt.c | 2 +- net/mac80211/sta_info.c | 97 +- net/mac80211/sta_info.h | 5 +- net/mac80211/tkip.c | 6 +- net/mac80211/tx.c | 44 +- net/mac80211/util.c | 231 +- net/mac80211/wext.c | 272 +- net/mac80211/wpa.c | 2 +- net/rds/af_rds.c | 1 - net/rds/connection.c | 4 +- net/rds/ib.c | 4 +- net/rds/ib.h | 2 +- net/rds/ib_recv.c | 2 +- net/rds/ib_ring.c | 2 +- net/rds/ib_send.c | 10 +- net/rds/info.c | 5 +- net/rds/iw.c | 4 +- net/rds/iw.h | 2 +- net/rds/iw_recv.c | 2 +- net/rds/iw_ring.c | 2 +- net/rds/iw_send.c | 10 +- net/rds/rdma.c | 7 +- net/rds/rdma_transport.c | 12 +- net/rds/rds.h | 2 +- net/rds/send.c | 10 +- net/rfkill/rfkill-input.c | 69 - net/rfkill/rfkill.c | 59 +- net/sched/cls_cgroup.c | 6 - net/sctp/output.c | 17 +- net/tipc/eth_media.c | 2 +- net/wimax/op-rfkill.c | 9 +- net/wireless/Makefile | 2 +- net/wireless/core.c | 27 +- net/wireless/core.h | 15 +- net/wireless/ibss.c | 369 + net/wireless/mlme.c | 50 +- net/wireless/nl80211.c | 639 +- net/wireless/nl80211.h | 32 +- net/wireless/reg.c | 43 +- net/wireless/scan.c | 63 +- net/wireless/util.c | 6 +- net/wireless/wext-compat.c | 236 +- 521 files changed, 57958 insertions(+), 29982 deletions(-) create mode 100644 drivers/net/bnx2x_fw_file_hdr.h create mode 100644 drivers/net/bnx2x_init_ops.h delete mode 100644 drivers/net/bnx2x_init_values.h create mode 100644 drivers/net/ixgbe/ixgbe_fcoe.c create mode 100644 drivers/net/ixgbe/ixgbe_fcoe.h create mode 100644 drivers/net/ll_temac.h create mode 100644 drivers/net/ll_temac_main.c create mode 100644 drivers/net/ll_temac_mdio.c create mode 100644 drivers/net/mdio.c create mode 100644 drivers/net/usb/int51x1.c create mode 100644 drivers/net/wireless/ath/Kconfig create mode 100644 drivers/net/wireless/ath/Makefile rename drivers/net/wireless/{ => ath}/ar9170/Kconfig (96%) rename drivers/net/wireless/{ => ath}/ar9170/Makefile (100%) rename drivers/net/wireless/{ => ath}/ar9170/ar9170.h (90%) rename drivers/net/wireless/{ => ath}/ar9170/cmd.c (100%) rename drivers/net/wireless/{ => ath}/ar9170/cmd.h (100%) rename drivers/net/wireless/{ => ath}/ar9170/eeprom.h (100%) rename drivers/net/wireless/{ => ath}/ar9170/hw.h (97%) rename drivers/net/wireless/{ => ath}/ar9170/led.c (100%) rename drivers/net/wireless/{ => ath}/ar9170/mac.c (94%) rename drivers/net/wireless/{ => ath}/ar9170/main.c (76%) rename drivers/net/wireless/{ => ath}/ar9170/phy.c (100%) rename drivers/net/wireless/{ => ath}/ar9170/usb.c (99%) rename drivers/net/wireless/{ => ath}/ar9170/usb.h (98%) rename drivers/net/wireless/{ => ath}/ath5k/Kconfig (98%) rename drivers/net/wireless/{ => ath}/ath5k/Makefile (100%) rename drivers/net/wireless/{ => ath}/ath5k/ath5k.h (97%) rename drivers/net/wireless/{ => ath}/ath5k/attach.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/base.c (95%) rename drivers/net/wireless/{ => ath}/ath5k/base.h (99%) rename drivers/net/wireless/{ => ath}/ath5k/caps.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/debug.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/debug.h (100%) rename drivers/net/wireless/{ => ath}/ath5k/desc.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/desc.h (100%) rename drivers/net/wireless/{ => ath}/ath5k/dma.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/eeprom.c (96%) rename drivers/net/wireless/{ => ath}/ath5k/eeprom.h (94%) rename drivers/net/wireless/{ => ath}/ath5k/gpio.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/initvals.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/led.c (94%) rename drivers/net/wireless/{ => ath}/ath5k/pcu.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/phy.c (83%) rename drivers/net/wireless/{ => ath}/ath5k/qcu.c (98%) rename drivers/net/wireless/{ => ath}/ath5k/reg.h (99%) rename drivers/net/wireless/{ => ath}/ath5k/reset.c (96%) rename drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h (100%) rename drivers/net/wireless/{ => ath}/ath5k/rfgain.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/Kconfig (97%) rename drivers/net/wireless/{ => ath}/ath9k/Makefile (96%) rename drivers/net/wireless/{ => ath}/ath9k/ahb.c (100%) rename drivers/net/wireless/{ => ath}/ath9k/ani.c (99%) rename drivers/net/wireless/{ => ath}/ath9k/ani.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/ath9k.h (88%) rename drivers/net/wireless/{ => ath}/ath9k/beacon.c (96%) rename drivers/net/wireless/{ => ath}/ath9k/calib.c (90%) rename drivers/net/wireless/{ => ath}/ath9k/calib.h (81%) rename drivers/net/wireless/{ => ath}/ath9k/debug.c (99%) rename drivers/net/wireless/{ => ath}/ath9k/debug.h (89%) rename drivers/net/wireless/{ => ath}/ath9k/eeprom.c (99%) rename drivers/net/wireless/{ => ath}/ath9k/eeprom.h (99%) rename drivers/net/wireless/{ => ath}/ath9k/hw.c (96%) rename drivers/net/wireless/{ => ath}/ath9k/hw.h (87%) rename drivers/net/wireless/{ => ath}/ath9k/initvals.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/mac.c (93%) rename drivers/net/wireless/{ => ath}/ath9k/mac.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/main.c (90%) rename drivers/net/wireless/{ => ath}/ath9k/pci.c (100%) rename drivers/net/wireless/{ => ath}/ath9k/phy.c (99%) rename drivers/net/wireless/{ => ath}/ath9k/phy.h (99%) rename drivers/net/wireless/{ => ath}/ath9k/rc.c (95%) rename drivers/net/wireless/{ => ath}/ath9k/rc.h (98%) rename drivers/net/wireless/{ => ath}/ath9k/recv.c (93%) rename drivers/net/wireless/{ => ath}/ath9k/reg.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/virtual.c (100%) rename drivers/net/wireless/{ => ath}/ath9k/xmit.c (97%) create mode 100644 drivers/net/wireless/ath/main.c rename drivers/net/wireless/{ath9k => ath}/regd.c (65%) rename drivers/net/wireless/{ath9k => ath}/regd.h (85%) rename drivers/net/wireless/{ath9k => ath}/regd_common.h (100%) create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.c create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.h create mode 100644 drivers/net/wireless/rt2x00/rt2x00ht.c create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.c create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.h create mode 100644 drivers/net/wireless/wl12xx/Kconfig create mode 100644 drivers/net/wireless/wl12xx/Makefile create mode 100644 drivers/net/wireless/wl12xx/acx.c create mode 100644 drivers/net/wireless/wl12xx/acx.h create mode 100644 drivers/net/wireless/wl12xx/boot.c create mode 100644 drivers/net/wireless/wl12xx/boot.h create mode 100644 drivers/net/wireless/wl12xx/cmd.c create mode 100644 drivers/net/wireless/wl12xx/cmd.h create mode 100644 drivers/net/wireless/wl12xx/debugfs.c create mode 100644 drivers/net/wireless/wl12xx/debugfs.h create mode 100644 drivers/net/wireless/wl12xx/event.c create mode 100644 drivers/net/wireless/wl12xx/event.h create mode 100644 drivers/net/wireless/wl12xx/init.c create mode 100644 drivers/net/wireless/wl12xx/init.h create mode 100644 drivers/net/wireless/wl12xx/main.c create mode 100644 drivers/net/wireless/wl12xx/ps.c create mode 100644 drivers/net/wireless/wl12xx/ps.h create mode 100644 drivers/net/wireless/wl12xx/reg.h create mode 100644 drivers/net/wireless/wl12xx/rx.c create mode 100644 drivers/net/wireless/wl12xx/rx.h create mode 100644 drivers/net/wireless/wl12xx/spi.c create mode 100644 drivers/net/wireless/wl12xx/spi.h create mode 100644 drivers/net/wireless/wl12xx/tx.c create mode 100644 drivers/net/wireless/wl12xx/tx.h create mode 100644 drivers/net/wireless/wl12xx/wl1251.c create mode 100644 drivers/net/wireless/wl12xx/wl1251.h create mode 100644 drivers/net/wireless/wl12xx/wl12xx.h create mode 100644 drivers/net/wireless/wl12xx/wl12xx_80211.h create mode 100644 drivers/of/of_mdio.c create mode 100644 firmware/bnx2x-e1-4.8.53.0.fw.ihex create mode 100644 firmware/bnx2x-e1h-4.8.53.0.fw.ihex create mode 100644 firmware/cis/3CCFEM556.cis.ihex create mode 100644 firmware/cis/3CXEM556.cis.ihex create mode 100644 include/linux/mdio.h create mode 100644 include/linux/of_mdio.h create mode 100644 include/linux/spi/wl12xx.h create mode 100644 include/net/regulatory.h delete mode 100644 include/net/wireless.h create mode 100644 net/mac80211/driver-ops.h create mode 100644 net/wireless/ibss.c Merging wireless/master $ git merge wireless/master Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Merge made by recursive. drivers/net/wireless/ath/ath9k/eeprom.c | 51 ++---- drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- drivers/net/wireless/ath/ath9k/hw.c | 59 ++---- drivers/net/wireless/ath/ath9k/hw.h | 2 +- drivers/net/wireless/ath/ath9k/phy.c | 7 +- drivers/net/wireless/ath/ath9k/phy.h | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 12 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 89 ++++++++- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 2 + drivers/net/wireless/iwlwifi/iwl-agn.c | 89 ++++----- drivers/net/wireless/iwlwifi/iwl-calib.c | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 62 +++---- drivers/net/wireless/iwlwifi/iwl-core.h | 2 - drivers/net/wireless/iwlwifi/iwl-dev.h | 2 - drivers/net/wireless/iwlwifi/iwl-eeprom.c | 2 +- drivers/net/wireless/iwlwifi/iwl-power.c | 233 +++------------------- drivers/net/wireless/iwlwifi/iwl-power.h | 39 +--- drivers/net/wireless/iwlwifi/iwl-scan.c | 14 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 56 ++---- drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/net/wireless/mwl8k.c | 2 +- drivers/net/wireless/rt2x00/rt73usb.c | 2 +- drivers/net/wireless/wl12xx/Kconfig | 2 +- include/linux/ieee80211.h | 8 +- include/linux/nl80211.h | 51 +++++- include/net/cfg80211.h | 57 +++--- include/net/mac80211.h | 28 +--- net/mac80211/cfg.c | 50 ++++-- net/mac80211/debugfs.c | 38 ++++ net/mac80211/ibss.c | 77 +++++--- net/mac80211/ieee80211_i.h | 9 +- net/mac80211/iface.c | 3 +- net/mac80211/key.c | 21 ++- net/mac80211/key.h | 3 +- net/mac80211/main.c | 14 +- net/mac80211/mlme.c | 41 +++- net/mac80211/rx.c | 58 ++++-- net/mac80211/scan.c | 32 +++- net/mac80211/tx.c | 5 +- net/mac80211/util.c | 60 +++++-- net/mac80211/wext.c | 282 +-------------------------- net/mac80211/wme.c | 2 +- net/wireless/core.c | 10 +- net/wireless/core.h | 6 +- net/wireless/ibss.c | 60 +++--- net/wireless/nl80211.c | 128 ++++++++----- net/wireless/util.c | 45 +++++ net/wireless/wext-compat.c | 286 ++++++++++++++++++++++++++- net/wireless/wext.c | 20 ++- 49 files changed, 1116 insertions(+), 1013 deletions(-) $ git revert 621cac85297de5ba655e3430b007dd2e0da91da6 Finished one revert. [master 4bb5d96] Revert "rfkill: remove user_claim stuff" 12 files changed, 72 insertions(+), 9 deletions(-) Merging mtd/master $ git merge mtd/master Already up-to-date. Merging crypto/master $ git merge crypto/master Auto-merging crypto/api.c Auto-merging drivers/char/hw_random/omap-rng.c Auto-merging drivers/crypto/padlock-aes.c Merge made by recursive. arch/x86/crypto/Makefile | 2 + arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++++- arch/x86/crypto/fpu.c | 166 +++++++++ crypto/Kconfig | 10 + crypto/algboss.c | 18 +- crypto/api.c | 5 +- crypto/cryptd.c | 14 +- crypto/internal.h | 3 - crypto/pcompress.c | 1 + crypto/tcrypt.c | 25 +- crypto/testmgr.c | 317 +++++++++++++--- crypto/testmgr.h | 645 ++++++++++++++++++++++++++++++++- drivers/char/hw_random/Kconfig | 2 +- drivers/char/hw_random/omap-rng.c | 2 +- drivers/char/hw_random/via-rng.c | 15 +- drivers/crypto/Kconfig | 2 +- drivers/crypto/padlock-aes.c | 13 + drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++---------- 18 files changed, 1926 insertions(+), 294 deletions(-) create mode 100644 arch/x86/crypto/fpu.c Merging vfs/for-next $ git merge vfs/for-next Resolved 'fs/ext4/super.c' using previous resolution. Resolved 'fs/fuse/inode.c' using previous resolution. Auto-merging fs/btrfs/inode.c Auto-merging fs/btrfs/super.c Auto-merging fs/buffer.c Auto-merging fs/ext4/super.c CONFLICT (content): Merge conflict in fs/ext4/super.c Auto-merging fs/fuse/inode.c CONFLICT (content): Merge conflict in fs/fuse/inode.c Auto-merging fs/gfs2/log.c Auto-merging fs/gfs2/ops_super.c Auto-merging fs/jfs/super.c Auto-merging fs/nfsd/export.c Auto-merging fs/reiserfs/super.c Auto-merging fs/reiserfs/xattr.c Auto-merging fs/squashfs/super.c Auto-merging fs/ubifs/super.c Auto-merging include/linux/fs.h Auto-merging include/linux/writeback.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 40e39ee] Merge commit 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/osf_sys.c | 3 - fs/adfs/super.c | 4 + fs/affs/super.c | 7 +- fs/afs/mntpt.c | 2 +- fs/afs/super.c | 4 + fs/autofs/dirhash.c | 5 +- fs/autofs4/autofs_i.h | 6 +- fs/autofs4/dev-ioctl.c | 195 ++++++++----------------- fs/autofs4/expire.c | 15 +- fs/autofs4/root.c | 7 +- fs/befs/linuxvfs.c | 5 +- fs/bfs/inode.c | 8 + fs/block_dev.c | 19 ++- fs/btrfs/inode.c | 7 - fs/btrfs/super.c | 15 +-- fs/buffer.c | 2 + fs/cachefiles/interface.c | 4 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/cifs/cifsfs.c | 6 +- fs/compat.c | 2 - fs/dcache.c | 7 +- fs/ecryptfs/super.c | 5 + fs/exofs/super.c | 9 + fs/ext2/super.c | 7 +- fs/ext3/balloc.c | 3 +- fs/ext3/ialloc.c | 3 +- fs/ext3/inode.c | 1 - fs/ext3/resize.c | 2 - fs/ext3/super.c | 30 +--- fs/ext3/xattr.c | 1 - fs/ext4/super.c | 21 ++- fs/fat/inode.c | 9 + fs/file_table.c | 40 +++++- fs/freevxfs/vxfs_super.c | 4 + fs/fs-writeback.c | 49 ------ fs/fuse/inode.c | 4 + fs/gfs2/log.c | 2 - fs/gfs2/ops_super.c | 15 +-- fs/hfs/super.c | 14 ++- fs/hfsplus/super.c | 13 ++- fs/hpfs/super.c | 8 + fs/inode.c | 2 +- fs/internal.h | 17 ++ fs/isofs/inode.c | 5 + fs/jffs2/fs.c | 15 -- fs/jffs2/os-linux.h | 1 - fs/jffs2/super.c | 24 +++ fs/jfs/super.c | 5 + fs/minix/inode.c | 4 +- fs/namei.c | 129 ++++++++++------- fs/namespace.c | 327 +++++++++++++++++----------------------- fs/ncpfs/inode.c | 4 + fs/nfs/namespace.c | 2 +- fs/nfsd/export.c | 78 ++++------ fs/nfsd/vfs.c | 54 ++++---- fs/nilfs2/super.c | 8 + fs/ntfs/super.c | 6 +- fs/ocfs2/super.c | 18 +-- fs/open.c | 4 +- fs/proc/internal.h | 25 +++ fs/proc/proc_devtree.c | 1 + fs/qnx4/inode.c | 9 - fs/quota/quota.c | 25 ++-- fs/reiserfs/dir.c | 10 +- fs/reiserfs/super.c | 29 ++-- fs/reiserfs/xattr.c | 3 +- fs/smbfs/inode.c | 4 + fs/squashfs/super.c | 4 + fs/super.c | 182 +++-------------------- fs/sync.c | 119 +++++++++++++-- fs/sysv/inode.c | 11 ++ fs/ubifs/super.c | 8 +- fs/udf/super.c | 5 + fs/ufs/super.c | 22 +++- fs/xattr.c | 4 +- fs/xfs/linux-2.6/xfs_super.c | 4 + include/linux/dcache.h | 7 +- include/linux/fs.h | 16 +-- include/linux/mount.h | 25 +++- include/linux/namei.h | 5 +- include/linux/nfsd/export.h | 6 +- include/linux/proc_fs.h | 24 --- include/linux/quotaops.h | 20 ++- include/linux/reiserfs_fs_sb.h | 2 + include/linux/writeback.h | 1 - kernel/audit_tree.c | 6 +- 86 files changed, 914 insertions(+), 931 deletions(-) Merging sound/for-next $ git merge sound/for-next Auto-merging MAINTAINERS Auto-merging include/linux/pci_ids.h Removing include/sound/driver.h Auto-merging sound/soc/pxa/Kconfig Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 30 +- Documentation/sound/alsa/HD-Audio-Models.txt | 12 +- Documentation/sound/alsa/soc/dapm.txt | 1 + MAINTAINERS | 6 +- include/linux/pci_ids.h | 12 + include/sound/core.h | 10 - include/sound/driver.h | 1 - include/sound/pcm.h | 1 + include/sound/soc-dai.h | 30 +- include/sound/soc-dapm.h | 19 +- include/sound/soc.h | 14 + sound/aoa/fabrics/layout.c | 8 +- sound/aoa/soundbus/i2sbus/core.c | 8 +- sound/core/pcm_native.c | 8 +- sound/isa/Kconfig | 7 +- sound/isa/sc6000.c | 134 ++- sound/parisc/harmony.c | 2 +- sound/pci/Kconfig | 23 + sound/pci/Makefile | 2 + sound/pci/ctxfi/Makefile | 5 + sound/pci/ctxfi/ct20k1reg.h | 634 +++++++ sound/pci/ctxfi/ct20k2reg.h | 85 + sound/pci/ctxfi/ctamixer.c | 488 +++++ sound/pci/ctxfi/ctamixer.h | 96 + sound/pci/ctxfi/ctatc.c | 1608 ++++++++++++++++ sound/pci/ctxfi/ctatc.h | 155 ++ sound/pci/ctxfi/ctdaio.c | 769 ++++++++ sound/pci/ctxfi/ctdaio.h | 122 ++ sound/pci/ctxfi/cthardware.c | 108 ++ sound/pci/ctxfi/cthardware.h | 160 ++ sound/pci/ctxfi/cthw20k1.c | 2231 +++++++++++++++++++++++ sound/pci/ctxfi/cthw20k1.h | 26 + sound/pci/ctxfi/cthw20k2.c | 2135 ++++++++++++++++++++++ sound/pci/ctxfi/cthw20k2.h | 26 + sound/pci/ctxfi/ctimap.c | 112 ++ sound/pci/ctxfi/ctimap.h | 40 + sound/pci/ctxfi/ctmixer.c | 1108 +++++++++++ sound/pci/ctxfi/ctmixer.h | 67 + sound/pci/ctxfi/ctpcm.c | 499 +++++ sound/pci/ctxfi/ctpcm.h | 27 + sound/pci/ctxfi/ctresource.c | 301 +++ sound/pci/ctxfi/ctresource.h | 72 + sound/pci/ctxfi/ctsrc.c | 886 +++++++++ sound/pci/ctxfi/ctsrc.h | 149 ++ sound/pci/ctxfi/ctvmem.c | 255 +++ sound/pci/ctxfi/ctvmem.h | 49 + sound/pci/ctxfi/xfi.c | 126 ++ sound/pci/hda/Kconfig | 13 + sound/pci/hda/Makefile | 4 + sound/pci/hda/hda_codec.c | 158 ++- sound/pci/hda/hda_codec.h | 4 +- sound/pci/hda/hda_hwdep.c | 9 +- sound/pci/hda/hda_intel.c | 34 +- sound/pci/hda/hda_proc.c | 8 +- sound/pci/hda/patch_ca0110.c | 573 ++++++ sound/pci/hda/patch_realtek.c | 1760 ++++++++---------- sound/pci/hda/patch_sigmatel.c | 155 ++- sound/pci/hda/patch_via.c | 111 +- sound/pci/lx6464es/Makefile | 2 + sound/pci/lx6464es/lx6464es.c | 1152 ++++++++++++ sound/pci/lx6464es/lx6464es.h | 114 ++ sound/pci/lx6464es/lx_core.c | 1444 +++++++++++++++ sound/pci/lx6464es/lx_core.h | 242 +++ sound/pci/lx6464es/lx_defs.h | 376 ++++ sound/pci/rme9652/hdsp.c | 4 +- sound/ppc/keywest.c | 6 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/Kconfig | 8 + sound/soc/atmel/Makefile | 1 + sound/soc/atmel/snd-soc-afeb9260.c | 203 ++ sound/soc/codecs/Kconfig | 12 + sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ac97.c | 4 +- sound/soc/codecs/ad1980.c | 4 +- sound/soc/codecs/cs4270.c | 105 +- sound/soc/codecs/tlv320aic23.c | 2 + sound/soc/codecs/twl4030.c | 727 ++++++-- sound/soc/codecs/twl4030.h | 29 +- sound/soc/codecs/wm8350.h | 1 + sound/soc/codecs/wm8400.c | 4 +- sound/soc/codecs/wm8731.c | 4 +- sound/soc/codecs/wm8753.c | 4 +- sound/soc/codecs/wm8903.c | 119 +- sound/soc/codecs/wm8940.c | 955 ++++++++++ sound/soc/codecs/wm8940.h | 104 ++ sound/soc/codecs/wm8960.c | 969 ++++++++++ sound/soc/codecs/wm8960.h | 127 ++ sound/soc/codecs/wm8988.c | 1097 +++++++++++ sound/soc/codecs/wm8988.h | 60 + sound/soc/codecs/wm9705.c | 4 +- sound/soc/codecs/wm9712.c | 8 +- sound/soc/codecs/wm9713.c | 46 +- sound/soc/fsl/fsl_ssi.c | 2 +- sound/soc/omap/Kconfig | 8 + sound/soc/omap/Makefile | 2 + sound/soc/omap/n810.c | 7 +- sound/soc/omap/omap-mcbsp.c | 43 +- sound/soc/omap/omap-pcm.c | 9 +- sound/soc/omap/omap2evm.c | 2 +- sound/soc/omap/omap3beagle.c | 28 +- sound/soc/omap/omap3evm.c | 147 ++ sound/soc/omap/omap3pandora.c | 4 +- sound/soc/omap/overo.c | 2 +- sound/soc/omap/sdp3430.c | 2 +- sound/soc/pxa/Kconfig | 13 +- sound/soc/pxa/Makefile | 2 + sound/soc/pxa/em-x270.c | 9 +- sound/soc/pxa/imote2.c | 114 ++ sound/soc/pxa/magician.c | 13 +- sound/soc/pxa/pxa-ssp.c | 214 +-- sound/soc/pxa/pxa2xx-i2s.c | 39 +- sound/soc/s3c24xx/s3c-i2s-v2.c | 87 +- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 157 ++- sound/soc/s3c24xx/s3c64xx-i2s.h | 6 +- sound/soc/s6000/Kconfig | 19 + sound/soc/s6000/Makefile | 11 + sound/soc/s6000/s6000-i2s.c | 629 +++++++ sound/soc/s6000/s6000-i2s.h | 25 + sound/soc/s6000/s6000-pcm.c | 497 +++++ sound/soc/s6000/s6000-pcm.h | 35 + sound/soc/s6000/s6105-ipcam.c | 244 +++ sound/soc/soc-core.c | 98 +- sound/soc/soc-dapm.c | 250 ++- sound/usb/usbaudio.c | 14 +- 126 files changed, 24301 insertions(+), 1874 deletions(-) delete mode 100644 include/sound/driver.h create mode 100644 sound/pci/ctxfi/Makefile create mode 100644 sound/pci/ctxfi/ct20k1reg.h create mode 100644 sound/pci/ctxfi/ct20k2reg.h create mode 100644 sound/pci/ctxfi/ctamixer.c create mode 100644 sound/pci/ctxfi/ctamixer.h create mode 100644 sound/pci/ctxfi/ctatc.c create mode 100644 sound/pci/ctxfi/ctatc.h create mode 100644 sound/pci/ctxfi/ctdaio.c create mode 100644 sound/pci/ctxfi/ctdaio.h create mode 100644 sound/pci/ctxfi/cthardware.c create mode 100644 sound/pci/ctxfi/cthardware.h create mode 100644 sound/pci/ctxfi/cthw20k1.c create mode 100644 sound/pci/ctxfi/cthw20k1.h create mode 100644 sound/pci/ctxfi/cthw20k2.c create mode 100644 sound/pci/ctxfi/cthw20k2.h create mode 100644 sound/pci/ctxfi/ctimap.c create mode 100644 sound/pci/ctxfi/ctimap.h create mode 100644 sound/pci/ctxfi/ctmixer.c create mode 100644 sound/pci/ctxfi/ctmixer.h create mode 100644 sound/pci/ctxfi/ctpcm.c create mode 100644 sound/pci/ctxfi/ctpcm.h create mode 100644 sound/pci/ctxfi/ctresource.c create mode 100644 sound/pci/ctxfi/ctresource.h create mode 100644 sound/pci/ctxfi/ctsrc.c create mode 100644 sound/pci/ctxfi/ctsrc.h create mode 100644 sound/pci/ctxfi/ctvmem.c create mode 100644 sound/pci/ctxfi/ctvmem.h create mode 100644 sound/pci/ctxfi/xfi.c create mode 100644 sound/pci/hda/patch_ca0110.c create mode 100644 sound/pci/lx6464es/Makefile create mode 100644 sound/pci/lx6464es/lx6464es.c create mode 100644 sound/pci/lx6464es/lx6464es.h create mode 100644 sound/pci/lx6464es/lx_core.c create mode 100644 sound/pci/lx6464es/lx_core.h create mode 100644 sound/pci/lx6464es/lx_defs.h create mode 100644 sound/soc/atmel/snd-soc-afeb9260.c create mode 100644 sound/soc/codecs/wm8940.c create mode 100644 sound/soc/codecs/wm8940.h create mode 100644 sound/soc/codecs/wm8960.c create mode 100644 sound/soc/codecs/wm8960.h create mode 100644 sound/soc/codecs/wm8988.c create mode 100644 sound/soc/codecs/wm8988.h create mode 100644 sound/soc/omap/omap3evm.c create mode 100644 sound/soc/pxa/imote2.c create mode 100644 sound/soc/s6000/Kconfig create mode 100644 sound/soc/s6000/Makefile create mode 100644 sound/soc/s6000/s6000-i2s.c create mode 100644 sound/soc/s6000/s6000-i2s.h create mode 100644 sound/soc/s6000/s6000-pcm.c create mode 100644 sound/soc/s6000/s6000-pcm.h create mode 100644 sound/soc/s6000/s6105-ipcam.c Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merging arch/x86/lguest/boot.c Auto-merging drivers/net/virtio_net.c Auto-merging init/main.c Auto-merging kernel/sched.c Merge made by recursive. Documentation/lguest/lguest.c | 144 +++++------ arch/frv/include/asm/gdb-stub.h | 1 - arch/mn10300/include/asm/gdb-stub.h | 1 - arch/x86/include/asm/lguest_hcall.h | 1 + arch/x86/kernel/acpi/cstate.c | 36 ++- arch/x86/kernel/asm-offsets_32.c | 1 + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 134 +++++----- arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 60 ++--- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 81 +++--- arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 1 + arch/x86/lguest/boot.c | 53 ++-- arch/x86/lguest/i386_head.S | 60 ++++- drivers/acpi/processor_throttling.c | 72 +++--- drivers/block/virtio_blk.c | 78 ++++-- drivers/char/hw_random/virtio-rng.c | 6 +- drivers/char/virtio_console.c | 26 +- drivers/firmware/dcdbas.c | 49 ++--- drivers/lguest/core.c | 15 +- drivers/lguest/hypercalls.c | 4 + drivers/lguest/interrupts_and_traps.c | 44 +++- drivers/lguest/lg.h | 3 +- drivers/lguest/lguest_device.c | 41 +++- drivers/lguest/lguest_user.c | 4 +- drivers/net/virtio_net.c | 45 ++-- drivers/s390/kvm/kvm_virtio.c | 43 +++- drivers/video/aty/aty128fb.c | 2 +- drivers/video/cyber2000fb.c | 9 +- drivers/video/uvesafb.c | 10 +- drivers/virtio/virtio.c | 25 ++- drivers/virtio/virtio_balloon.c | 27 +-- drivers/virtio/virtio_pci.c | 307 +++++++++++++++++++--- drivers/virtio/virtio_ring.c | 102 +++++++- include/linux/compiler.h | 5 + include/linux/cpu.h | 5 - include/linux/lguest.h | 4 + include/linux/moduleparam.h | 40 ++- include/linux/virtio.h | 15 +- include/linux/virtio_blk.h | 8 + include/linux/virtio_config.h | 49 +++- include/linux/virtio_pci.h | 10 +- include/linux/virtio_ring.h | 8 +- init/main.c | 1 - kernel/cpu.c | 11 +- kernel/params.c | 46 +++- kernel/sched.c | 1 + net/9p/trans_virtio.c | 6 +- 46 files changed, 1123 insertions(+), 571 deletions(-) Merging cifs/master $ git merge cifs/master Already up-to-date. Merging mmc/next $ git merge mmc/next Auto-merging drivers/mmc/host/omap.c Merge made by recursive. drivers/mmc/core/core.c | 107 ++++++++++++++++++++++++----------------- drivers/mmc/host/mmc_spi.c | 12 +++++ drivers/mmc/host/mxcmmc.c | 45 +++++++++++++----- drivers/mmc/host/omap.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 2 +- drivers/mmc/host/sdhci.c | 53 +++++++++++---------- drivers/mmc/host/sdhci.h | 2 +- 7 files changed, 138 insertions(+), 86 deletions(-) Merging input/next $ git merge input/next Auto-merging drivers/input/joydev.c Auto-merging drivers/input/touchscreen/tsc2007.c Merge made by recursive. Documentation/input/input.txt | 2 +- Documentation/input/rotary-encoder.txt | 9 +- arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 42 + drivers/char/keyboard.c | 2 - drivers/input/evdev.c | 9 +- drivers/input/gameport/fm801-gp.c | 1 + drivers/input/gameport/gameport.c | 25 +- drivers/input/joydev.c | 14 +- drivers/input/keyboard/Kconfig | 21 + drivers/input/keyboard/Makefile | 2 + drivers/input/keyboard/ep93xx_keypad.c | 470 +++++++++++ drivers/input/keyboard/gpio_keys.c | 3 +- drivers/input/keyboard/lm8323.c | 878 +++++++++++++++++++++ drivers/input/misc/Kconfig | 19 + drivers/input/misc/Makefile | 2 + drivers/input/misc/dm355evm_keys.c | 329 ++++++++ drivers/input/misc/rotary_encoder.c | 61 +- drivers/input/misc/twl4030-pwrbutton.c | 145 ++++ drivers/input/misc/uinput.c | 94 ++- drivers/input/mouse/alps.c | 18 +- drivers/input/mouse/lifebook.c | 25 +- drivers/input/mouse/psmouse-base.c | 4 +- drivers/input/mousedev.c | 9 +- drivers/input/serio/i8042.c | 17 +- drivers/input/serio/serio.c | 58 +- drivers/input/tablet/gtco.c | 1 + drivers/input/tablet/wacom.h | 5 +- drivers/input/tablet/wacom_sys.c | 13 + drivers/input/tablet/wacom_wac.c | 168 +++- drivers/input/tablet/wacom_wac.h | 3 + drivers/input/touchscreen/Kconfig | 15 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/atmel-wm97xx.c | 446 +++++++++++ drivers/input/touchscreen/tsc2007.c | 2 +- drivers/input/touchscreen/wm97xx-core.c | 2 +- include/linux/gameport.h | 3 +- include/linux/i2c/lm8323.h | 46 ++ include/linux/rotary_encoder.h | 2 + include/linux/serio.h | 9 +- 39 files changed, 2789 insertions(+), 186 deletions(-) create mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h create mode 100644 drivers/input/keyboard/ep93xx_keypad.c create mode 100644 drivers/input/keyboard/lm8323.c create mode 100644 drivers/input/misc/dm355evm_keys.c create mode 100644 drivers/input/misc/twl4030-pwrbutton.c create mode 100644 drivers/input/touchscreen/atmel-wm97xx.c create mode 100644 include/linux/i2c/lm8323.h Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Already up-to-date. Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Recorded preimage for 'drivers/block/virtio_blk.c' Recorded preimage for 'drivers/ide/ide-tape.c' Resolved 'drivers/block/hd.c' using previous resolution. Resolved 'drivers/block/mg_disk.c' using previous resolution. Resolved 'drivers/ide/ide-atapi.c' using previous resolution. Resolved 'drivers/ide/ide-floppy.c' using previous resolution. Auto-merging block/blk-core.c Auto-merging drivers/ata/libata-scsi.c Auto-merging drivers/block/hd.c CONFLICT (content): Merge conflict in drivers/block/hd.c Auto-merging drivers/block/mg_disk.c CONFLICT (content): Merge conflict in drivers/block/mg_disk.c Auto-merging drivers/block/virtio_blk.c CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c Auto-merging drivers/ide/ide-atapi.c CONFLICT (content): Merge conflict in drivers/ide/ide-atapi.c Auto-merging drivers/ide/ide-cd.c CONFLICT (content): Merge conflict in drivers/ide/ide-cd.c Auto-merging drivers/ide/ide-disk.c Auto-merging drivers/ide/ide-dma.c Auto-merging drivers/ide/ide-floppy.c CONFLICT (content): Merge conflict in drivers/ide/ide-floppy.c Auto-merging drivers/ide/ide-io.c Auto-merging drivers/ide/ide-tape.c CONFLICT (content): Merge conflict in drivers/ide/ide-tape.c Auto-merging drivers/ide/ide-taskfile.c Auto-merging drivers/ide/tx4939ide.c Auto-merging drivers/mmc/card/block.c Auto-merging drivers/scsi/lpfc/lpfc_scsi.c Auto-merging drivers/scsi/osd/osd_initiator.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/sd.c Auto-merging drivers/scsi/sg.c Auto-merging fs/block_dev.c Auto-merging include/linux/blkdev.h Auto-merging include/linux/fs.h Auto-merging include/linux/ide.h Removing include/linux/mg_disk.h Auto-merging kernel/trace/blktrace.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/block/virtio_blk.c'. Recorded resolution for 'drivers/ide/ide-cd.c'. Recorded resolution for 'drivers/ide/ide-tape.c'. [master 4d11d0a] Merge commit 'block/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/plat-omap/mailbox.c | 63 ++- arch/um/drivers/ubd_kern.c | 36 +-- block/Kconfig | 11 +- block/as-iosched.c | 24 +- block/blk-barrier.c | 17 +- block/blk-core.c | 687 +++++++++++++++++------------- block/blk-exec.c | 1 - block/blk-map.c | 8 +- block/blk-merge.c | 46 +-- block/blk-tag.c | 2 +- block/blk-timeout.c | 22 +- block/blk.h | 49 ++- block/bsg.c | 8 +- block/cfq-iosched.c | 36 +- block/deadline-iosched.c | 2 +- block/elevator.c | 159 +------- block/scsi_ioctl.c | 5 +- drivers/ata/libata-scsi.c | 2 +- drivers/block/DAC960.c | 10 +- drivers/block/Kconfig | 2 +- drivers/block/amiflop.c | 54 +-- drivers/block/ataflop.c | 66 ++-- drivers/block/cciss.c | 39 +- drivers/block/cpqarray.c | 16 +- drivers/block/floppy.c | 58 ++-- drivers/block/hd.c | 104 +++--- drivers/block/loop.c | 37 +-- drivers/block/mg_disk.c | 535 ++++++++++++++--------- drivers/block/nbd.c | 23 +- drivers/block/paride/pcd.c | 29 +- drivers/block/paride/pd.c | 22 +- drivers/block/paride/pf.c | 47 +- drivers/block/ps3disk.c | 22 +- drivers/block/sunvdc.c | 14 +- drivers/block/swim.c | 48 +-- drivers/block/swim3.c | 107 +++--- drivers/block/sx8.c | 17 +- drivers/block/ub.c | 24 +- drivers/block/viodasd.c | 12 +- drivers/block/virtio_blk.c | 16 +- drivers/block/xd.c | 41 +- drivers/block/xen-blkfront.c | 30 +- drivers/block/xsysace.c | 44 ++- drivers/block/z2ram.c | 19 +- drivers/cdrom/gdrom.c | 34 +- drivers/cdrom/viocd.c | 29 +- drivers/ide/ide-atapi.c | 27 +- drivers/ide/ide-cd.c | 52 +-- drivers/ide/ide-disk.c | 8 +- drivers/ide/ide-dma.c | 2 +- drivers/ide/ide-floppy.c | 10 +- drivers/ide/ide-io.c | 43 ++- drivers/ide/ide-lib.c | 2 +- drivers/ide/ide-tape.c | 11 +- drivers/ide/ide-taskfile.c | 2 +- drivers/ide/pdc202xx_old.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/tx4939ide.c | 2 +- drivers/memstick/core/mspro_block.c | 17 +- drivers/message/fusion/mptsas.c | 21 +- drivers/message/i2o/i2o_block.c | 38 +- drivers/mmc/card/block.c | 10 +- drivers/mmc/card/queue.c | 11 +- drivers/mtd/mtd_blkdevs.c | 41 +- drivers/s390/block/dasd.c | 35 +-- drivers/s390/block/dasd_diag.c | 5 +- drivers/s390/block/dasd_eckd.c | 6 +- drivers/s390/block/dasd_fba.c | 7 +- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/tape_3590.c | 2 +- drivers/s390/char/tape_block.c | 24 +- drivers/sbus/char/jsflash.c | 26 +- drivers/scsi/eata.c | 24 +- drivers/scsi/libsas/sas_expander.c | 14 +- drivers/scsi/libsas/sas_host_smp.c | 52 ++-- drivers/scsi/lpfc/lpfc_scsi.c | 22 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 23 +- drivers/scsi/osd/osd_initiator.c | 4 +- drivers/scsi/scsi_lib.c | 85 ++--- drivers/scsi/scsi_tgt_lib.c | 2 +- drivers/scsi/scsi_transport_sas.c | 4 +- drivers/scsi/sd.c | 24 +- drivers/scsi/sd_dif.c | 2 +- drivers/scsi/sg.c | 2 +- drivers/scsi/sr.c | 15 +- drivers/scsi/st.c | 2 +- drivers/scsi/u14-34f.c | 22 +- fs/block_dev.c | 7 + fs/coda/file.c | 9 +- fs/exofs/osd.c | 4 +- fs/pipe.c | 14 + fs/read_write.c | 7 +- fs/splice.c | 424 ++++++++++++++++++- include/linux/bio.h | 8 +- include/linux/blkdev.h | 104 +++-- include/linux/elevator.h | 4 +- include/linux/fs.h | 2 + include/linux/loop.h | 3 +- include/linux/mg_disk.h | 206 --------- include/linux/pipe_fs_i.h | 1 + include/linux/splice.h | 3 +- include/scsi/scsi_cmnd.h | 2 +- kernel/trace/blktrace.c | 16 +- 103 files changed, 2163 insertions(+), 2033 deletions(-) delete mode 100644 include/linux/mg_disk.h $ git revert b1f744937f1be3e6d3009382a755679133cf782d Finished one revert. [master 454bc44] Revert "block: move completion related functions back to blk-core.c" 2 files changed, 126 insertions(+), 130 deletions(-) $ git am -3 ../patches/0001-scsi-block-fixup-scsi_transport_fc-for-block-changes.patch Applying: scsi/block: fixup scsi_transport_fc for block changes Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Merge made by recursive. drivers/base/firmware_class.c | 129 ++++++++++++++++++++++++++++++++-------- 1 files changed, 103 insertions(+), 26 deletions(-) Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Already up-to-date. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging arch/x86/kernel/kgdb.c Merge made by recursive. arch/x86/kernel/kgdb.c | 9 +++++++-- include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ kernel/kgdb.c | 6 +++--- 3 files changed, 52 insertions(+), 11 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging init/Kconfig Auto-merging lib/Kconfig.debug Auto-merging mm/slob.c Merge made by recursive. Documentation/vm/slqbinfo.c | 1047 ++++++++++++ include/linux/page-flags.h | 2 - include/linux/rcu_types.h | 18 + include/linux/rcupdate.h | 11 +- include/linux/slab.h | 10 +- include/linux/slqb_def.h | 298 ++++ init/Kconfig | 28 +- lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/slob.c | 6 +- mm/slqb.c | 3748 +++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 5168 insertions(+), 21 deletions(-) create mode 100644 Documentation/vm/slqbinfo.c create mode 100644 include/linux/rcu_types.h create mode 100644 include/linux/slqb_def.h create mode 100644 mm/slqb.c Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Merge made by recursive. drivers/md/linear.c | 12 ++-- drivers/md/linear.h | 2 - drivers/md/md.c | 2 +- drivers/md/multipath.c | 20 ++-- drivers/md/multipath.h | 6 -- drivers/md/raid0.c | 231 +++++++++++++++--------------------------------- drivers/md/raid0.h | 10 +-- drivers/md/raid1.c | 38 ++++---- drivers/md/raid1.h | 6 -- drivers/md/raid10.c | 42 +++++----- drivers/md/raid10.h | 6 -- drivers/md/raid5.c | 36 ++++---- drivers/md/raid5.h | 2 - 13 files changed, 149 insertions(+), 264 deletions(-) Merging mfd/for-next $ git merge mfd/for-next Merge made by recursive. drivers/mfd/htc-pasic3.c | 4 ++-- drivers/mfd/pcf50633-core.c | 4 ++-- drivers/mfd/pcf50633-gpio.c | 3 +++ drivers/mfd/twl4030-core.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/wm8350-core.c | 8 -------- drivers/mfd/wm8350-regmap.c | 4 ++-- drivers/mfd/wm8400-core.c | 2 +- 8 files changed, 12 insertions(+), 17 deletions(-) Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/Kconfig | 19 ++ drivers/regulator/Makefile | 2 + drivers/regulator/da903x.c | 2 +- drivers/regulator/fixed.c | 18 ++- drivers/regulator/max1586.c | 249 ++++++++++++++++++++++++++ drivers/regulator/pcf50633-regulator.c | 2 +- drivers/regulator/userspace-consumer.c | 200 +++++++++++++++++++++ drivers/regulator/virtual.c | 1 + drivers/regulator/wm8350-regulator.c | 1 + drivers/regulator/wm8400-regulator.c | 8 +- include/linux/regulator/max1586.h | 52 ++++++ include/linux/regulator/userspace-consumer.h | 25 +++ 12 files changed, 571 insertions(+), 8 deletions(-) create mode 100644 drivers/regulator/max1586.c create mode 100644 drivers/regulator/userspace-consumer.c create mode 100644 include/linux/regulator/max1586.h create mode 100644 include/linux/regulator/userspace-consumer.h Merging security-testing/next $ git merge security-testing/next Auto-merging fs/compat.c Auto-merging fs/exec.c Auto-merging include/linux/init_task.h Auto-merging include/linux/sched.h Auto-merging kernel/exit.c Auto-merging kernel/module.c Auto-merging kernel/ptrace.c Auto-merging kernel/signal.c Auto-merging kernel/sysctl.c Auto-merging security/integrity/ima/ima_fs.c Auto-merging security/smack/smackfs.c Merge made by recursive. Documentation/Smack.txt | 20 ++- Documentation/sysctl/kernel.txt | 11 + drivers/char/tpm/tpm_bios.c | 3 +- fs/compat.c | 6 +- fs/exec.c | 10 +- fs/proc/base.c | 6 + include/linux/init_task.h | 4 +- include/linux/lsm_audit.h | 111 ++++++++++ include/linux/sched.h | 5 +- kernel/cred.c | 4 +- kernel/exit.c | 1 + kernel/module.c | 7 +- kernel/ptrace.c | 9 +- kernel/signal.c | 11 +- kernel/sysctl.c | 12 + security/Makefile | 3 + security/commoncap.c | 32 +++ security/inode.c | 2 +- security/integrity/ima/ima_audit.c | 32 +--- security/integrity/ima/ima_fs.c | 6 +- security/integrity/ima/ima_main.c | 29 +-- security/integrity/ima/ima_policy.c | 10 +- security/lsm_audit.c | 386 ++++++++++++++++++++++++++++++++++ security/selinux/avc.c | 2 +- security/selinux/hooks.c | 24 +-- security/selinux/include/security.h | 4 +- security/selinux/selinuxfs.c | 4 +- security/selinux/ss/services.c | 30 +--- security/smack/smack.h | 108 ++++++++++- security/smack/smack_access.c | 141 +++++++++++-- security/smack/smack_lsm.c | 390 ++++++++++++++++++++++++++-------- security/smack/smackfs.c | 66 ++++++ 32 files changed, 1258 insertions(+), 231 deletions(-) create mode 100644 include/linux/lsm_audit.h create mode 100644 security/lsm_audit.c Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Auto-merging drivers/usb/class/cdc-acm.c Auto-merging drivers/usb/serial/ftdi_sio.c Auto-merging include/linux/pci_ids.h Merge made by recursive. drivers/char/cyclades.c | 288 +++++++++------------ drivers/char/epca.c | 13 +- drivers/char/isicom.c | 19 +- drivers/char/istallion.c | 8 +- drivers/char/mxser.c | 12 +- drivers/char/pcmcia/synclink_cs.c | 11 +- drivers/char/rocket.c | 19 +- drivers/char/stallion.c | 6 +- drivers/char/synclink.c | 9 +- drivers/char/synclink_gt.c | 86 ++++++- drivers/char/synclinkmp.c | 9 +- drivers/char/tty_port.c | 38 +++- drivers/net/slip.c | 96 ++------ drivers/serial/8250_pci.c | 3 + drivers/usb/class/cdc-acm.c | 442 +++++++++++++++++++-------------- drivers/usb/class/cdc-acm.h | 5 +- drivers/usb/serial/belkin_sa.c | 6 +- drivers/usb/serial/ch341.c | 46 ++-- drivers/usb/serial/console.c | 6 +- drivers/usb/serial/cp210x.c | 6 +- drivers/usb/serial/cyberjack.c | 6 +- drivers/usb/serial/cypress_m8.c | 81 ++----- drivers/usb/serial/digi_acceleport.c | 75 ++---- drivers/usb/serial/empeg.c | 6 +- drivers/usb/serial/ftdi_sio.c | 50 ++-- drivers/usb/serial/garmin_gps.c | 3 +- drivers/usb/serial/generic.c | 3 +- drivers/usb/serial/io_edgeport.c | 10 +- drivers/usb/serial/io_ti.c | 3 +- drivers/usb/serial/ipaq.c | 6 +- drivers/usb/serial/ipw.c | 18 +- drivers/usb/serial/ir-usb.c | 6 +- drivers/usb/serial/iuu_phoenix.c | 25 +-- drivers/usb/serial/keyspan.c | 13 +- drivers/usb/serial/keyspan.h | 8 +- drivers/usb/serial/keyspan_pda.c | 48 +++-- drivers/usb/serial/kl5kusb105.c | 6 +- drivers/usb/serial/kobil_sct.c | 9 +- drivers/usb/serial/mct_u232.c | 37 ++-- drivers/usb/serial/mos7720.c | 3 +- drivers/usb/serial/mos7840.c | 48 +---- drivers/usb/serial/navman.c | 3 +- drivers/usb/serial/omninet.c | 6 +- drivers/usb/serial/opticon.c | 3 +- drivers/usb/serial/option.c | 68 +++--- drivers/usb/serial/oti6858.c | 57 +---- drivers/usb/serial/pl2303.c | 79 +++---- drivers/usb/serial/sierra.c | 97 ++++---- drivers/usb/serial/spcp8x5.c | 85 +++---- drivers/usb/serial/symbolserial.c | 3 +- drivers/usb/serial/ti_usb_3410_5052.c | 6 +- drivers/usb/serial/usb-serial.c | 144 ++++++++---- drivers/usb/serial/visor.c | 6 +- drivers/usb/serial/whiteheat.c | 33 +--- include/linux/cyclades.h | 37 +-- include/linux/pci_ids.h | 2 + include/linux/serial.h | 116 +++++---- include/linux/tty.h | 6 +- include/linux/usb/serial.h | 10 +- 59 files changed, 1137 insertions(+), 1216 deletions(-) Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging generic-ipi/auto-generic-ipi-next $ git merge generic-ipi/auto-generic-ipi-next Already up-to-date. Merging oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Auto-merging Documentation/kernel-parameters.txt Merge made by recursive. Documentation/kernel-parameters.txt | 9 ++++++++ arch/x86/oprofile/nmi_int.c | 38 +++++++++++++++++++++++++++++++--- drivers/oprofile/cpu_buffer.c | 8 +++++- 3 files changed, 49 insertions(+), 6 deletions(-) Merging fastboot/auto-fastboot-next $ git merge fastboot/auto-fastboot-next Already up-to-date. Merging sparseirq/auto-sparseirq-next $ git merge sparseirq/auto-sparseirq-next Already uptodate! Merge made by recursive. Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Auto-merging arch/x86/Kconfig.debug Merge made by recursive. arch/x86/Kconfig.debug | 3 +- arch/x86/kernel/pci-calgary_64.c | 54 +---------------- arch/x86/kernel/pci-gart_64.c | 45 +++------------ arch/x86/kernel/pci-swiotlb.c | 2 +- include/linux/dma-debug.h | 7 ++ include/linux/swiotlb.h | 3 +- lib/dma-debug.c | 72 +++++++++++++++++++++-- lib/swiotlb.c | 119 ++++++++++++++++++++------------------ 8 files changed, 149 insertions(+), 156 deletions(-) Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/alim7101_wdt.c | 15 +++++++++++---- drivers/watchdog/ar7_wdt.c | 3 ++- drivers/watchdog/at91rm9200_wdt.c | 3 ++- drivers/watchdog/at91sam9_wdt.c | 3 ++- drivers/watchdog/bfin_wdt.c | 14 ++++++++++---- drivers/watchdog/cpwd.c | 6 +++--- drivers/watchdog/davinci_wdt.c | 6 +++--- drivers/watchdog/iTCO_vendor_support.c | 6 +++--- drivers/watchdog/iTCO_wdt.c | 22 +++++++++++----------- drivers/watchdog/indydog.c | 4 +--- drivers/watchdog/it8712f_wdt.c | 3 ++- drivers/watchdog/ks8695_wdt.c | 4 ++-- drivers/watchdog/machzwd.c | 9 ++++++--- drivers/watchdog/mpcore_wdt.c | 7 +++++-- drivers/watchdog/mtx-1_wdt.c | 6 +++--- drivers/watchdog/pnx4008_wdt.c | 6 +++--- drivers/watchdog/rdc321x_wdt.c | 4 ++-- drivers/watchdog/rm9k_wdt.c | 6 +++--- drivers/watchdog/s3c2410_wdt.c | 32 ++++++++++++++------------------ drivers/watchdog/sb_wdog.c | 9 +++++---- drivers/watchdog/sbc60xxwdt.c | 5 +++-- drivers/watchdog/sbc8360.c | 4 ++-- drivers/watchdog/sbc_epx_c3.c | 12 +++++++----- drivers/watchdog/scx200_wdt.c | 7 +++++-- drivers/watchdog/shwdt.c | 4 +++- drivers/watchdog/softdog.c | 7 +++++-- drivers/watchdog/w83697hf_wdt.c | 3 ++- drivers/watchdog/wdrtas.c | 7 +------ 28 files changed, 121 insertions(+), 96 deletions(-) Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Resolved 'drivers/pci/intel-iommu.c' using previous resolution. Resolved 'drivers/pci/intr_remapping.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/kernel/pci-swiotlb.c Auto-merging drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merging drivers/pci/intr_remapping.c CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 74c4006] Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 1 + arch/ia64/include/asm/iommu.h | 1 + arch/ia64/kernel/pci-dma.c | 2 + arch/ia64/kernel/pci-swiotlb.c | 2 +- arch/x86/include/asm/iommu.h | 1 + arch/x86/kernel/pci-dma.c | 6 + arch/x86/kernel/pci-swiotlb.c | 3 +- drivers/pci/dmar.c | 46 ++--- drivers/pci/intel-iommu.c | 324 ++++++++++++++++++++--------------- drivers/pci/intr_remapping.c | 8 +- include/linux/dma_remapping.h | 8 + include/linux/intel-iommu.h | 19 +- 12 files changed, 244 insertions(+), 177 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Auto-merging drivers/scsi/osd/osd_initiator.c Auto-merging fs/exofs/osd.c Merge made by recursive. drivers/scsi/osd/osd_initiator.c | 79 +++++++++++++++++++++++++++----------- fs/exofs/common.h | 6 --- fs/exofs/inode.c | 5 +- fs/exofs/osd.c | 26 ------------ include/scsi/osd_attributes.h | 74 ++++++++++++++++++++++++++++++++++- include/scsi/osd_initiator.h | 8 +++- include/scsi/osd_protocol.h | 8 ++++ 7 files changed, 145 insertions(+), 61 deletions(-) Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/SubmittingPatches | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/sound/alsa/ALSA-Configuration.txt Auto-merging Documentation/sysctl/vm.txt Auto-merging arch/s390/kernel/head.S Auto-merging drivers/ata/libata-eh.c Auto-merging drivers/ide/ide-atapi.c Auto-merging drivers/net/igbvf/igbvf.h Auto-merging drivers/net/wireless/rndis_wlan.c Auto-merging drivers/net/wireless/rt2x00/rt2x00lib.h Auto-merging drivers/s390/scsi/zfcp_fc.c Auto-merging drivers/scsi/lpfc/lpfc_scsi.c Auto-merging drivers/usb/serial/io_ti.c Auto-merging fs/compat.c Auto-merging fs/inode.c Auto-merging kernel/trace/trace.c Merge made by recursive. Documentation/CodingStyle | 4 ++-- Documentation/DMA-API.txt | 4 ++-- Documentation/RCU/rculist_nulls.txt | 2 +- Documentation/SM501.txt | 2 +- Documentation/block/deadline-iosched.txt | 2 +- Documentation/braille-console.txt | 2 +- Documentation/driver-model/devres.txt | 2 +- Documentation/edac.txt | 8 ++++---- Documentation/fb/sh7760fb.txt | 2 +- .../filesystems/autofs4-mount-control.txt | 2 +- Documentation/filesystems/caching/netfs-api.txt | 2 +- Documentation/filesystems/ext4.txt | 6 +++--- Documentation/filesystems/fiemap.txt | 2 +- Documentation/filesystems/nfs-rdma.txt | 2 +- Documentation/filesystems/proc.txt | 4 ++-- Documentation/filesystems/sysfs-pci.txt | 2 +- Documentation/filesystems/vfat.txt | 8 ++++---- Documentation/gpio.txt | 2 +- Documentation/kdump/kdump.txt | 4 ++-- Documentation/kernel-parameters.txt | 4 ++-- Documentation/kobject.txt | 2 +- Documentation/laptops/acer-wmi.txt | 2 +- Documentation/laptops/sony-laptop.txt | 2 +- Documentation/laptops/thinkpad-acpi.txt | 2 +- Documentation/local_ops.txt | 2 +- Documentation/memory-hotplug.txt | 8 ++++---- Documentation/mn10300/ABI.txt | 2 +- Documentation/mtd/nand_ecc.txt | 12 ++++++------ Documentation/networking/bonding.txt | 6 +++--- Documentation/networking/can.txt | 2 +- Documentation/networking/dm9000.txt | 2 +- Documentation/networking/l2tp.txt | 2 +- Documentation/networking/netdevices.txt | 2 +- Documentation/networking/phonet.txt | 2 +- Documentation/networking/regulatory.txt | 2 +- Documentation/power/regulator/consumer.txt | 2 +- Documentation/power/regulator/overview.txt | 2 +- Documentation/power/s2ram.txt | 2 +- Documentation/power/userland-swsusp.txt | 2 +- Documentation/powerpc/booting-without-of.txt | 4 ++-- Documentation/powerpc/dts-bindings/fsl/board.txt | 2 +- .../powerpc/dts-bindings/fsl/cpm_qe/cpm.txt | 2 +- .../powerpc/dts-bindings/fsl/cpm_qe/gpio.txt | 2 +- Documentation/powerpc/dts-bindings/fsl/msi-pic.txt | 2 +- Documentation/powerpc/dts-bindings/fsl/pmc.txt | 4 ++-- Documentation/powerpc/qe_firmware.txt | 2 +- Documentation/rbtree.txt | 10 +++++----- Documentation/rfkill.txt | 4 ++-- Documentation/s390/Debugging390.txt | 4 ++-- Documentation/scheduler/sched-nice-design.txt | 2 +- Documentation/scsi/aic79xx.txt | 2 +- Documentation/scsi/ncr53c8xx.txt | 4 ++-- Documentation/scsi/sym53c8xx_2.txt | 2 +- Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- Documentation/sound/alsa/HD-Audio.txt | 2 +- Documentation/sound/alsa/hda_codec.txt | 2 +- Documentation/sysctl/vm.txt | 4 ++-- Documentation/timers/hpet.txt | 2 +- Documentation/timers/timer_stats.txt | 2 +- Documentation/trace/ftrace.txt | 2 +- Documentation/usb/WUSB-Design-overview.txt | 8 ++++---- Documentation/usb/anchors.txt | 4 ++-- Documentation/video4linux/cx18.txt | 2 +- arch/powerpc/mm/slb.c | 2 +- arch/s390/kernel/head.S | 2 +- drivers/ata/libata-acpi.c | 4 ++-- drivers/ata/libata-eh.c | 2 +- drivers/base/bus.c | 2 +- drivers/char/amiserial.c | 2 +- drivers/edac/e752x_edac.c | 2 +- drivers/ide/ide-atapi.c | 2 +- drivers/isdn/divert/isdn_divert.c | 2 +- drivers/isdn/mISDN/dsp_core.c | 2 +- drivers/media/video/hdpvr/hdpvr-video.c | 2 +- drivers/message/fusion/lsi/mpi_history.txt | 6 +++--- drivers/mtd/Kconfig | 3 ++- drivers/net/appletalk/ltpc.c | 2 +- drivers/net/b44.h | 2 +- drivers/net/e100.c | 2 +- drivers/net/e1000e/e1000.h | 2 +- drivers/net/ehea/ehea.h | 2 +- drivers/net/igbvf/igbvf.h | 2 +- drivers/net/ipg.h | 2 +- drivers/net/mlx4/en_netdev.c | 2 +- drivers/net/niu.h | 4 ++-- drivers/net/qlge/qlge_mpi.c | 6 +++--- drivers/net/skfp/h/smt.h | 2 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/ucc_geth_ethtool.c | 2 +- drivers/net/wireless/rndis_wlan.c | 2 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +- drivers/net/wireless/wavelan_cs.c | 2 +- drivers/s390/scsi/zfcp_fc.c | 2 +- drivers/scsi/dpt/osd_util.h | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- drivers/scsi/megaraid.h | 2 +- drivers/scsi/megaraid/mbox_defs.h | 2 +- drivers/staging/go7007/go7007.txt | 4 ++-- drivers/staging/panel/lcd-panel-cgram.txt | 2 +- drivers/staging/rt2860/common/mlme.c | 2 +- drivers/staging/rt2870/common/mlme.c | 2 +- drivers/staging/rt3070/common/mlme.c | 2 +- drivers/usb/serial/io_ti.c | 2 +- drivers/watchdog/iop_wdt.c | 2 +- fs/bio.c | 4 ++-- fs/compat.c | 2 +- fs/compat_ioctl.c | 2 +- fs/ext2/ext2.h | 2 +- fs/inode.c | 2 +- include/linux/ultrasound.h | 2 +- kernel/power/poweroff.c | 2 +- kernel/trace/trace.c | 2 +- net/netfilter/nf_conntrack_acct.c | 2 +- sound/pci/aw2/aw2-saa7146.c | 2 +- sound/pci/sis7019.h | 4 ++-- sound/pci/vx222/vx222_ops.c | 2 +- sound/usb/usbmixer.c | 2 +- 119 files changed, 167 insertions(+), 166 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Already up-to-date. Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Resolved 'lib/Kconfig.debug' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS CONFLICT (delete/modify): arch/x86/kernel/vmlinux_32.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_32.lds.S left in tree. CONFLICT (delete/modify): arch/x86/kernel/vmlinux_64.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_64.lds.S left in tree. Auto-merging fs/block_dev.c Auto-merging include/linux/slab.h Auto-merging init/main.c Auto-merging kernel/module.c Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging mm/Makefile Auto-merging mm/page_alloc.c Auto-merging mm/slab.c Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c Auto-merging mm/vmalloc.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S arch/x86/kernel/vmlinux_32.lds.S: needs merge arch/x86/kernel/vmlinux_64.lds.S: needs merge lib/Kconfig.debug: needs merge mm/slob.c: needs merge rm 'arch/x86/kernel/vmlinux_32.lds.S' rm 'arch/x86/kernel/vmlinux_64.lds.S' $ git commit -v -a [master 992ed70] Merge commit 'kmemleak/kmemleak' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 4 + Documentation/kmemleak.txt | 142 ++++ MAINTAINERS | 6 + arch/arm/kernel/vmlinux.lds.S | 2 + drivers/char/vt.c | 7 + fs/block_dev.c | 6 + include/linux/kmemleak.h | 96 +++ include/linux/percpu.h | 5 + include/linux/slab.h | 2 + init/main.c | 4 +- kernel/module.c | 56 ++ lib/Kconfig.debug | 32 + mm/Makefile | 2 + mm/kmemleak-test.c | 111 +++ mm/kmemleak.c | 1498 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 20 files changed, 2051 insertions(+), 7 deletions(-) create mode 100644 Documentation/kmemleak.txt create mode 100644 include/linux/kmemleak.h create mode 100644 mm/kmemleak-test.c create mode 100644 mm/kmemleak.c Merging suspend/linux-next $ git merge suspend/linux-next Removing arch/alpha/include/asm/suspend.h Removing arch/arm/include/asm/suspend.h Removing arch/ia64/include/asm/suspend.h Removing arch/m68k/include/asm/suspend.h Removing arch/mips/include/asm/suspend.h Removing arch/s390/include/asm/suspend.h Removing arch/um/include/asm/suspend.h Removing arch/x86/power/cpu_32.c Auto-merging drivers/xen/manage.c Merge made by recursive. arch/alpha/include/asm/suspend.h | 6 -- arch/arm/include/asm/suspend.h | 4 - arch/ia64/include/asm/suspend.h | 1 - arch/m68k/include/asm/suspend.h | 6 -- arch/mips/include/asm/suspend.h | 6 -- arch/s390/include/asm/suspend.h | 5 - arch/um/include/asm/suspend.h | 4 - arch/x86/kernel/acpi/sleep.c | 2 +- arch/x86/kernel/apm_32.c | 8 +- arch/x86/power/Makefile | 2 +- arch/x86/power/{cpu_64.c => cpu.c} | 165 +++++++++++++++++++++++++++--------- arch/x86/power/cpu_32.c | 148 -------------------------------- drivers/base/power/main.c | 26 +++--- drivers/base/sys.c | 16 ++++ drivers/xen/manage.c | 10 +- include/linux/pm.h | 4 +- kernel/kexec.c | 8 +- kernel/power/disk.c | 16 ++-- kernel/power/main.c | 4 +- 19 files changed, 181 insertions(+), 260 deletions(-) delete mode 100644 arch/alpha/include/asm/suspend.h delete mode 100644 arch/arm/include/asm/suspend.h delete mode 100644 arch/ia64/include/asm/suspend.h delete mode 100644 arch/m68k/include/asm/suspend.h delete mode 100644 arch/mips/include/asm/suspend.h delete mode 100644 arch/s390/include/asm/suspend.h delete mode 100644 arch/um/include/asm/suspend.h rename arch/x86/power/{cpu_64.c => cpu.c} (62%) delete mode 100644 arch/x86/power/cpu_32.c Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. include/net/bluetooth/bluetooth.h | 6 - include/net/bluetooth/l2cap.h | 77 +++++++++++----- net/bluetooth/l2cap.c | 189 +++++++++++++++++++++++++------------ net/bluetooth/rfcomm/core.c | 13 ++- 4 files changed, 191 insertions(+), 94 deletions(-) Merging quilt/driver-core $ git merge quilt/driver-core Resolved 'init/main.c' using previous resolution. Auto-merging arch/um/drivers/ubd_kern.c Auto-merging block/bsg.c Auto-merging drivers/base/firmware_class.c Auto-merging drivers/base/sys.c Auto-merging drivers/block/ps3disk.c Auto-merging drivers/block/xen-blkfront.c Auto-merging drivers/ide/ide-pm.c Auto-merging drivers/ide/ide-probe.c Auto-merging drivers/ide/ide_platform.c Auto-merging drivers/infiniband/hw/ehca/ehca_main.c Auto-merging drivers/mfd/pcf50633-core.c Auto-merging drivers/net/ibmveth.c Auto-merging drivers/net/sb1250-mac.c Auto-merging drivers/net/tun.c Auto-merging drivers/net/usb/hso.c Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c Auto-merging drivers/regulator/wm8400-regulator.c Auto-merging drivers/s390/char/tape_34xx.c Auto-merging drivers/s390/char/tape_3590.c Auto-merging drivers/thermal/thermal_sys.c Auto-merging include/linux/sched.h Auto-merging init/Kconfig Auto-merging init/main.c CONFLICT (content): Merge conflict in init/main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3831399] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. Documentation/driver-model/device.txt | 32 ++ arch/mips/sni/eisa.c | 2 +- arch/um/drivers/net_kern.c | 4 +- arch/um/drivers/ubd_kern.c | 4 +- arch/x86/kernel/cpuid.c | 6 + arch/x86/kernel/microcode_core.c | 1 + arch/x86/kernel/msr.c | 6 + block/bsg.c | 6 + block/genhd.c | 10 + drivers/base/Kconfig | 25 ++ drivers/base/Makefile | 1 + drivers/base/base.h | 6 + drivers/base/core.c | 54 ++++- drivers/base/dd.c | 6 +- drivers/base/devtmpfs.c | 405 +++++++++++++++++++++++++++ drivers/base/firmware_class.c | 8 +- drivers/base/init.c | 1 + drivers/base/platform.c | 5 +- drivers/base/sys.c | 8 +- drivers/block/aoe/aoechr.c | 7 + drivers/block/pktcdvd.c | 7 + drivers/block/ps3disk.c | 18 +- drivers/block/ps3vram.c | 46 ++-- drivers/block/xen-blkfront.c | 14 +- drivers/char/hvcs.c | 6 +- drivers/char/hw_random/core.c | 1 + drivers/char/ipmi/ipmi_si_intf.c | 4 +- drivers/char/misc.c | 15 +- drivers/char/raw.c | 6 + drivers/eisa/pci_eisa.c | 2 +- drivers/eisa/virtual_root.c | 2 +- drivers/firewire/fw-sbp2.c | 6 +- drivers/gpu/drm/drm_sysfs.c | 7 + drivers/hid/usbhid/hiddev.c | 7 +- drivers/ide/ide-pm.c | 6 +- drivers/ide/ide-probe.c | 4 +- drivers/ide/ide_platform.c | 2 +- drivers/ieee1394/eth1394.c | 16 +- drivers/ieee1394/sbp2.c | 8 +- drivers/infiniband/core/sysfs.c | 2 +- drivers/infiniband/hw/ehca/ehca_main.c | 8 +- drivers/input/input.c | 6 + drivers/input/xen-kbdfront.c | 8 +- drivers/md/dm-ioctl.c | 1 + drivers/media/dvb/dvb-core/dvbdev.c | 10 + drivers/media/dvb/firewire/firedtv-1394.c | 4 +- drivers/media/dvb/firewire/firedtv-dvb.c | 2 +- drivers/media/video/dabusb.c | 6 + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 22 +- drivers/net/tun.c | 1 + drivers/net/xen-netfront.c | 10 +- drivers/parisc/eisa.c | 2 +- drivers/parisc/sba_iommu.c | 6 +- drivers/parport/parport_gsc.c | 4 +- drivers/pcmcia/ds.c | 8 +- drivers/s390/char/con3215.c | 16 +- drivers/s390/char/raw3270.c | 16 +- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/tape_3590.c | 2 +- drivers/s390/char/tape_core.c | 22 +- drivers/s390/char/vmlogrdr.c | 12 +- drivers/s390/char/vmur.c | 16 +- drivers/s390/net/claw.c | 52 ++-- drivers/s390/net/lcs.c | 20 +- drivers/s390/net/lcs.h | 4 +- drivers/s390/net/netiucv.c | 47 ++-- drivers/scsi/aha1740.c | 2 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/libsrp.c | 2 +- drivers/serial/of_serial.c | 4 +- drivers/thermal/thermal_sys.c | 4 +- drivers/usb/class/usblp.c | 6 + drivers/usb/core/file.c | 13 +- drivers/usb/core/usb.c | 11 + drivers/usb/gadget/at91_udc.c | 6 +- drivers/usb/misc/iowarrior.c | 6 + drivers/usb/misc/legousbtower.c | 6 + drivers/video/xen-fbfront.c | 8 +- fs/debugfs/inode.c | 11 + fs/sysfs/symlink.c | 5 +- include/linux/device.h | 15 + include/linux/eisa.h | 4 +- include/linux/genhd.h | 2 +- include/linux/miscdevice.h | 1 + include/linux/platform_device.h | 4 +- include/linux/sched.h | 2 +- include/linux/shmem_fs.h | 2 + include/linux/usb.h | 3 + init/Kconfig | 6 +- init/do_mounts.c | 2 +- init/main.c | 2 + kernel/user.c | 67 +++-- lib/kobject.c | 7 +- mm/shmem.c | 6 +- sound/sound_core.c | 7 + 96 files changed, 1017 insertions(+), 288 deletions(-) create mode 100644 drivers/base/devtmpfs.c Merging quilt/usb $ git merge quilt/usb Resolved 'drivers/usb/serial/sierra.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/usb/serial/ftdi_sio.c Auto-merging drivers/usb/serial/garmin_gps.c Auto-merging drivers/usb/serial/generic.c Auto-merging drivers/usb/serial/mos7840.c Auto-merging drivers/usb/serial/option.c Auto-merging drivers/usb/serial/sierra.c CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c Auto-merging fs/befs/linuxvfs.c Auto-merging include/linux/pci.h Auto-merging include/linux/pci_ids.h Auto-merging include/linux/usb/serial.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3d51de0] Merge branch 'quilt/usb' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 6 + drivers/pci/pci.c | 5 + drivers/usb/Kconfig | 1 + drivers/usb/Makefile | 1 + drivers/usb/core/Kconfig | 16 +- drivers/usb/core/Makefile | 4 +- drivers/usb/core/config.c | 192 ++++- drivers/usb/core/driver.c | 21 +- drivers/usb/core/hcd-pci.c | 244 +++--- drivers/usb/core/hcd.c | 220 ++++- drivers/usb/core/hcd.h | 55 +- drivers/usb/core/hub.c | 134 +++- drivers/usb/core/hub.h | 3 + drivers/usb/core/message.c | 194 +++-- drivers/usb/core/sysfs.c | 12 +- drivers/usb/core/urb.c | 12 + drivers/usb/core/usb.c | 65 ++- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 2 +- drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/atmel_usba_udc.c | 4 +- drivers/usb/gadget/ci13xxx_udc.c | 6 +- drivers/usb/gadget/file_storage.c | 93 +-- drivers/usb/gadget/goku_udc.c | 6 +- drivers/usb/gadget/inode.c | 14 +- drivers/usb/gadget/pxa27x_udc.c | 71 ++- drivers/usb/gadget/pxa27x_udc.h | 2 + drivers/usb/host/Kconfig | 20 + drivers/usb/host/Makefile | 2 + drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/ehci-hub.c | 4 +- drivers/usb/host/ehci-orion.c | 2 +- drivers/usb/host/ehci-pci.c | 26 +- drivers/usb/host/fhci-dbg.c | 2 +- drivers/usb/host/hwa-hc.c | 21 - drivers/usb/host/ohci-dbg.c | 31 +- drivers/usb/host/ohci-hcd.c | 38 +- drivers/usb/host/ohci-pci.c | 24 +- drivers/usb/host/pci-quirks.c | 123 +++ drivers/usb/host/r8a66597-hcd.c | 2 +- drivers/usb/host/uhci-hcd.c | 23 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/host/xhci-dbg.c | 485 ++++++++++ drivers/usb/host/xhci-ext-caps.h | 145 +++ drivers/usb/host/xhci-hcd.c | 1256 ++++++++++++++++++++++++++ drivers/usb/host/xhci-hub.c | 308 +++++++ drivers/usb/host/xhci-mem.c | 768 ++++++++++++++++ drivers/usb/host/xhci-pci.c | 166 ++++ drivers/usb/host/xhci-ring.c | 1649 +++++++++++++++++++++++++++++++++++ drivers/usb/host/xhci.h | 1155 ++++++++++++++++++++++++ drivers/usb/mon/mon_text.c | 2 +- drivers/usb/musb/Kconfig | 2 + drivers/usb/musb/blackfin.c | 11 +- drivers/usb/musb/cppi_dma.c | 34 +- drivers/usb/musb/cppi_dma.h | 6 +- drivers/usb/musb/davinci.c | 54 +- drivers/usb/musb/musb_core.c | 228 +++--- drivers/usb/musb/musb_core.h | 22 +- drivers/usb/musb/musb_gadget.c | 45 +- drivers/usb/musb/musb_gadget_ep0.c | 45 +- drivers/usb/musb/musb_host.c | 273 +++---- drivers/usb/musb/musb_host.h | 1 + drivers/usb/musb/musb_virthub.c | 35 +- drivers/usb/musb/omap2430.c | 64 +- drivers/usb/musb/tusb6010.c | 70 +- drivers/usb/otg/nop-usb-xceiv.c | 25 +- drivers/usb/otg/twl4030-usb.c | 28 +- drivers/usb/serial/ftdi_sio.c | 164 +++- drivers/usb/serial/ftdi_sio.h | 10 +- drivers/usb/serial/garmin_gps.c | 198 ++--- drivers/usb/serial/generic.c | 177 ++++- drivers/usb/serial/mos7840.c | 318 ++++---- drivers/usb/serial/option.c | 19 +- drivers/usb/serial/sierra.c | 185 ++-- drivers/usb/serial/usb_debug.c | 41 + drivers/usb/storage/initializers.c | 14 +- drivers/usb/storage/option_ms.c | 3 +- drivers/usb/storage/unusual_devs.h | 2 +- fs/befs/linuxvfs.c | 20 +- fs/fat/dir.c | 29 +- fs/fat/namei_vfat.c | 4 +- fs/isofs/joliet.c | 36 +- fs/ncpfs/ncplib_kernel.c | 8 +- fs/nls/nls_base.c | 166 +++-- fs/nls/nls_utf8.c | 13 +- include/linux/nls.h | 35 +- include/linux/pci.h | 8 + include/linux/pci_ids.h | 1 + include/linux/usb.h | 34 +- include/linux/usb/ch9.h | 17 + include/linux/usb/composite.h | 3 + include/linux/usb/otg.h | 4 +- include/linux/usb/serial.h | 12 + 93 files changed, 8607 insertions(+), 1502 deletions(-) create mode 100644 drivers/usb/host/xhci-dbg.c create mode 100644 drivers/usb/host/xhci-ext-caps.h create mode 100644 drivers/usb/host/xhci-hcd.c create mode 100644 drivers/usb/host/xhci-hub.c create mode 100644 drivers/usb/host/xhci-mem.c create mode 100644 drivers/usb/host/xhci-pci.c create mode 100644 drivers/usb/host/xhci-ring.c create mode 100644 drivers/usb/host/xhci.h Merging quilt/staging $ git merge quilt/staging Resolved 'drivers/staging/rt2860/common/mlme.c' using previous resolution. Resolved 'drivers/staging/rt2870/common/mlme.c' using previous resolution. Resolved 'drivers/staging/rt3070/common/mlme.c' using previous resolution. Removing drivers/staging/comedi/comedi_rt.h Removing drivers/staging/comedi/drivers/comedi_rt_timer.c Removing drivers/staging/comedi/interrupt.h Removing drivers/staging/comedi/rt.c Removing drivers/staging/comedi/rt_pend_tq.c Removing drivers/staging/comedi/rt_pend_tq.h Auto-merging drivers/staging/rt2860/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt2860/common/mlme.c Removing drivers/staging/rt2860/common/netif_block.c Removing drivers/staging/rt2860/common/netif_block.h Removing drivers/staging/rt2860/leap.h Removing drivers/staging/rt2860/rt_ate.c Removing drivers/staging/rt2860/rt_ate.h Removing drivers/staging/rt2860/sta/dls.c Auto-merging drivers/staging/rt2870/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt2870/common/mlme.c Removing drivers/staging/rt2870/common/netif_block.c Removing drivers/staging/rt2870/leap.h Removing drivers/staging/rt2870/netif_block.h Removing drivers/staging/rt2870/rt_ate.c Removing drivers/staging/rt2870/rt_ate.h Removing drivers/staging/rt2870/sta/dls.c Removing drivers/staging/rt2870/sta_ioctl.c.patch Removing drivers/staging/rt2870/tmp60 Removing drivers/staging/rt2870/tmp61 Auto-merging drivers/staging/rt3070/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt3070/common/mlme.c Removing drivers/staging/rt3070/common/netif_block.c Removing drivers/staging/rt3070/leap.h Removing drivers/staging/rt3070/netif_block.h Removing drivers/staging/rt3070/rt_ate.c Removing drivers/staging/rt3070/rt_ate.h Removing drivers/staging/rt3070/sta/dls.c Removing drivers/staging/winbond/wbhal.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fe8b44a] Merge branch 'quilt/staging' $ git diff -M --stat --summary HEAD^.. drivers/staging/agnx/debug.h | 9 +- drivers/staging/agnx/pci.c | 47 +- drivers/staging/agnx/phy.c | 4 +- drivers/staging/agnx/phy.h | 2 +- drivers/staging/agnx/sta.c | 2 +- drivers/staging/agnx/sta.h | 2 +- drivers/staging/altpciechdma/altpciechdma.c | 18 +- drivers/staging/android/Kconfig | 6 +- drivers/staging/android/Makefile | 1 + drivers/staging/android/binder.c | 436 +- drivers/staging/android/logger.c | 12 +- drivers/staging/android/lowmemorykiller.c | 101 +- drivers/staging/android/ram_console.c | 9 +- drivers/staging/android/timed_gpio.c | 98 +- drivers/staging/android/timed_gpio.h | 4 +- drivers/staging/android/timed_output.c | 121 + drivers/staging/android/timed_output.h | 37 + drivers/staging/b3dfg/b3dfg.c | 1 - drivers/staging/comedi/Kconfig | 9 +- drivers/staging/comedi/Makefile | 5 - drivers/staging/comedi/comedi.h | 1 - drivers/staging/comedi/comedi_fops.c | 504 +- drivers/staging/comedi/comedi_ksyms.c | 7 - drivers/staging/comedi/comedi_rt.h | 149 - drivers/staging/comedi/comedidev.h | 15 +- drivers/staging/comedi/drivers.c | 19 +- drivers/staging/comedi/drivers/8253.h | 50 +- drivers/staging/comedi/drivers/8255.c | 23 +- drivers/staging/comedi/drivers/8255.h | 14 +- drivers/staging/comedi/drivers/Makefile | 4 +- drivers/staging/comedi/drivers/acl7225b.c | 22 +- .../comedi/drivers/addi-data/APCI1710_82x54.c | 372 +- .../comedi/drivers/addi-data/APCI1710_82x54.h | 32 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 402 +- .../comedi/drivers/addi-data/APCI1710_Chrono.h | 36 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 309 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 8 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 1012 ++-- .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 188 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 204 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 8 +- .../comedi/drivers/addi-data/APCI1710_Pwm.c | 1314 ++-- .../comedi/drivers/addi-data/APCI1710_Pwm.h | 70 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 230 +- .../comedi/drivers/addi-data/APCI1710_Ssi.h | 6 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 432 +- .../comedi/drivers/addi-data/APCI1710_Tor.h | 8 +- .../comedi/drivers/addi-data/APCI1710_Ttl.c | 198 +- .../comedi/drivers/addi-data/APCI1710_Ttl.h | 8 +- .../comedi/drivers/addi-data/addi_amcc_S5920.c | 119 +- .../comedi/drivers/addi-data/addi_amcc_S5920.h | 6 +- .../comedi/drivers/addi-data/addi_amcc_s5933.h | 12 +- .../staging/comedi/drivers/addi-data/addi_common.c | 191 +- .../staging/comedi/drivers/addi-data/addi_common.h | 356 +- .../staging/comedi/drivers/addi-data/addi_eeprom.c | 438 +- .../comedi/drivers/addi-data/amcc_s5933_58.h | 43 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 169 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 214 +- .../comedi/drivers/addi-data/hwdrv_apci035.h | 34 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 106 +- .../comedi/drivers/addi-data/hwdrv_apci1032.h | 29 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 532 +- .../comedi/drivers/addi-data/hwdrv_apci1500.h | 4 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 174 +- .../comedi/drivers/addi-data/hwdrv_apci1516.h | 29 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 507 +- .../comedi/drivers/addi-data/hwdrv_apci1564.h | 52 +- .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 134 +- .../comedi/drivers/addi-data/hwdrv_apci2016.c | 136 +- .../comedi/drivers/addi-data/hwdrv_apci2016.h | 26 +- .../comedi/drivers/addi-data/hwdrv_apci2032.c | 176 +- .../comedi/drivers/addi-data/hwdrv_apci2032.h | 32 +- .../comedi/drivers/addi-data/hwdrv_apci2200.c | 174 +- .../comedi/drivers/addi-data/hwdrv_apci2200.h | 26 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 1055 ++-- .../comedi/drivers/addi-data/hwdrv_apci3120.h | 142 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 1701 ++-- .../comedi/drivers/addi-data/hwdrv_apci3200.h | 176 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 225 +- .../comedi/drivers/addi-data/hwdrv_apci3501.h | 44 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 274 +- drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- drivers/staging/comedi/drivers/adl_pci6208.c | 177 +- drivers/staging/comedi/drivers/adl_pci7296.c | 22 +- drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- drivers/staging/comedi/drivers/adl_pci8164.c | 325 +- drivers/staging/comedi/drivers/adl_pci9111.c | 135 +- drivers/staging/comedi/drivers/adl_pci9118.c | 648 +- drivers/staging/comedi/drivers/adq12b.c | 82 +- drivers/staging/comedi/drivers/adv_pci1710.c | 348 +- drivers/staging/comedi/drivers/adv_pci1723.c | 122 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 112 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 46 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 44 +- drivers/staging/comedi/drivers/am9513.h | 16 +- drivers/staging/comedi/drivers/amcc_s5933.h | 10 +- drivers/staging/comedi/drivers/amplc_dio200.c | 226 +- drivers/staging/comedi/drivers/amplc_pc236.c | 138 +- drivers/staging/comedi/drivers/amplc_pc263.c | 82 +- drivers/staging/comedi/drivers/amplc_pci224.c | 131 +- drivers/staging/comedi/drivers/amplc_pci230.c | 306 +- drivers/staging/comedi/drivers/c6xdigio.c | 140 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 160 +- drivers/staging/comedi/drivers/cb_pcidas.c | 840 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 1755 ++-- drivers/staging/comedi/drivers/cb_pcidda.c | 323 +- drivers/staging/comedi/drivers/cb_pcidio.c | 75 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 187 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 71 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/comedi/drivers/comedi_fc.c | 2 +- drivers/staging/comedi/drivers/comedi_parport.c | 9 +- drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 -- drivers/staging/comedi/drivers/comedi_test.c | 2 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 46 +- drivers/staging/comedi/drivers/daqboard2000.c | 230 +- drivers/staging/comedi/drivers/das08.c | 542 +- drivers/staging/comedi/drivers/das08.h | 24 +- drivers/staging/comedi/drivers/das08_cs.c | 65 +- drivers/staging/comedi/drivers/das16.c | 816 +- drivers/staging/comedi/drivers/das16m1.c | 152 +- drivers/staging/comedi/drivers/das1800.c | 689 +- drivers/staging/comedi/drivers/das6402.c | 47 +- drivers/staging/comedi/drivers/das800.c | 213 +- drivers/staging/comedi/drivers/dmm32at.c | 128 +- drivers/staging/comedi/drivers/dt2801.c | 214 +- drivers/staging/comedi/drivers/dt2811.c | 92 +- drivers/staging/comedi/drivers/dt2814.c | 48 +- drivers/staging/comedi/drivers/dt2815.c | 36 +- drivers/staging/comedi/drivers/dt2817.c | 27 +- drivers/staging/comedi/drivers/dt282x.c | 391 +- drivers/staging/comedi/drivers/dt3000.c | 220 +- drivers/staging/comedi/drivers/fl512.c | 42 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 234 +- drivers/staging/comedi/drivers/icp_multi.c | 15 +- drivers/staging/comedi/drivers/icp_multi.h | 12 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 83 +- drivers/staging/comedi/drivers/jr3_pci.c | 211 +- drivers/staging/comedi/drivers/jr3_pci.h | 8 +- drivers/staging/comedi/drivers/ke_counter.c | 47 +- drivers/staging/comedi/drivers/me4000.c | 9 +- drivers/staging/comedi/drivers/me_daq.c | 1 + drivers/staging/comedi/drivers/mite.c | 28 +- drivers/staging/comedi/drivers/mite.h | 2 +- drivers/staging/comedi/drivers/mpc624.c | 218 +- drivers/staging/comedi/drivers/mpc8260cpm.c | 32 +- drivers/staging/comedi/drivers/multiq3.c | 43 +- drivers/staging/comedi/drivers/ni_6527.c | 73 +- drivers/staging/comedi/drivers/ni_65xx.c | 251 +- drivers/staging/comedi/drivers/ni_660x.c | 232 +- drivers/staging/comedi/drivers/ni_670x.c | 84 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 275 +- drivers/staging/comedi/drivers/ni_at_ao.c | 90 +- drivers/staging/comedi/drivers/ni_atmio.c | 327 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 117 +- drivers/staging/comedi/drivers/ni_daq_700.c | 113 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 110 +- drivers/staging/comedi/drivers/ni_labpc.c | 693 +- drivers/staging/comedi/drivers/ni_labpc.h | 50 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 105 +- drivers/staging/comedi/drivers/ni_mio_common.c | 970 ++-- drivers/staging/comedi/drivers/ni_mio_cs.c | 256 +- drivers/staging/comedi/drivers/ni_pcidio.c | 188 +- drivers/staging/comedi/drivers/ni_pcimio.c | 139 +- drivers/staging/comedi/drivers/ni_stc.h | 148 +- drivers/staging/comedi/drivers/ni_tio.c | 18 +- drivers/staging/comedi/drivers/ni_tio.h | 18 +- drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +- drivers/staging/comedi/drivers/ni_tiocmd.c | 40 +- drivers/staging/comedi/drivers/pcl711.c | 68 +- drivers/staging/comedi/drivers/pcl724.c | 54 +- drivers/staging/comedi/drivers/pcl725.c | 24 +- drivers/staging/comedi/drivers/pcl726.c | 72 +- drivers/staging/comedi/drivers/pcl730.c | 34 +- drivers/staging/comedi/drivers/pcl812.c | 320 +- drivers/staging/comedi/drivers/pcl816.c | 417 +- drivers/staging/comedi/drivers/pcl818.c | 574 +- drivers/staging/comedi/drivers/pcm3724.c | 67 +- drivers/staging/comedi/drivers/pcm3730.c | 28 +- drivers/staging/comedi/drivers/pcmad.c | 42 +- drivers/staging/comedi/drivers/pcmda12.c | 46 +- drivers/staging/comedi/drivers/pcmmio.c | 163 +- drivers/staging/comedi/drivers/pcmuio.c | 137 +- drivers/staging/comedi/drivers/plx9080.h | 8 +- drivers/staging/comedi/drivers/poc.c | 104 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 79 +- drivers/staging/comedi/drivers/rtd520.c | 78 +- drivers/staging/comedi/drivers/rti800.c | 77 +- drivers/staging/comedi/drivers/rti802.c | 24 +- drivers/staging/comedi/drivers/s526.c | 386 +- drivers/staging/comedi/drivers/s626.c | 282 +- drivers/staging/comedi/drivers/s626.h | 2 +- drivers/staging/comedi/drivers/serial2002.c | 100 +- drivers/staging/comedi/drivers/skel.c | 90 +- drivers/staging/comedi/drivers/ssv_dnp.c | 49 +- drivers/staging/comedi/drivers/unioxx5.c | 86 +- drivers/staging/comedi/drivers/usbdux.c | 166 +- drivers/staging/comedi/drivers/usbduxfast.c | 202 +- drivers/staging/comedi/drivers/vmk80xx.c | 1399 +++ drivers/staging/comedi/interrupt.h | 51 - drivers/staging/comedi/kcomedilib/data.c | 4 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 33 +- drivers/staging/comedi/kcomedilib/ksyms.c | 49 +- drivers/staging/comedi/range.c | 9 +- drivers/staging/comedi/rt.c | 411 - drivers/staging/comedi/rt_pend_tq.c | 113 - drivers/staging/comedi/rt_pend_tq.h | 10 - drivers/staging/epl/EplSdoUdpu.c | 3 +- drivers/staging/epl/ShbIpc-LinuxKernel.c | 8 +- drivers/staging/frontier/alphatrack.c | 1 - drivers/staging/frontier/tranzport.c | 1 - drivers/staging/heci/heci.h | 1 - drivers/staging/heci/heci_data_structures.h | 1 - drivers/staging/heci/heci_interface.h | 1 - drivers/staging/meilhaus/me0600_ext_irq.c | 5 - drivers/staging/meilhaus/me0900_di.c | 1 - drivers/staging/meilhaus/me1400_device.c | 1 - drivers/staging/meilhaus/me1400_ext_irq.c | 5 - drivers/staging/meilhaus/me4600_ai.c | 4 - drivers/staging/meilhaus/me4600_ai.h | 1 - drivers/staging/meilhaus/me4600_ao.c | 6 +- drivers/staging/meilhaus/me4600_ext_irq.c | 5 - drivers/staging/meilhaus/me6000_ao.c | 4 - drivers/staging/meilhaus/me6000_ao.h | 1 - drivers/staging/meilhaus/me8100_di.c | 5 - drivers/staging/meilhaus/me8200_di.c | 9 - drivers/staging/meilhaus/me8200_do.c | 5 - drivers/staging/meilhaus/memain.c | 182 +- drivers/staging/meilhaus/memain.h | 194 - drivers/staging/otus/80211core/ccmd.c | 2982 +++---- drivers/staging/pohmelfs/crypto.c | 3 +- drivers/staging/pohmelfs/dir.c | 9 +- drivers/staging/pohmelfs/inode.c | 15 +- drivers/staging/pohmelfs/net.c | 7 +- drivers/staging/pohmelfs/netfs.h | 65 +- drivers/staging/pohmelfs/trans.c | 7 +- drivers/staging/rspiusb/rspiusb.c | 14 +- drivers/staging/rt2860/2860_main_dev.c | 41 +- drivers/staging/rt2860/Makefile | 5 +- drivers/staging/rt2860/ap.h | 40 +- drivers/staging/rt2860/chlist.h | 56 +- drivers/staging/rt2860/common/2860_rtmp_init.c | 25 - drivers/staging/rt2860/common/action.c | 444 +- drivers/staging/rt2860/common/action.h | 7 - drivers/staging/rt2860/common/ba_action.c | 179 +- drivers/staging/rt2860/common/cmm_data.c | 647 +- drivers/staging/rt2860/common/cmm_data_2860.c | 105 +- drivers/staging/rt2860/common/cmm_info.c | 273 +- drivers/staging/rt2860/common/cmm_sanity.c | 401 +- drivers/staging/rt2860/common/cmm_sync.c | 113 +- drivers/staging/rt2860/common/cmm_wpa.c | 28 +- drivers/staging/rt2860/common/dfs.c | 21 - drivers/staging/rt2860/common/eeprom.c | 1268 +++- drivers/staging/rt2860/common/md5.c | 12 - drivers/staging/rt2860/common/mlme.c | 1888 +++-- drivers/staging/rt2860/common/netif_block.c | 144 - drivers/staging/rt2860/common/netif_block.h | 58 - drivers/staging/rt2860/common/rtmp_init.c | 1251 ++- drivers/staging/rt2860/common/rtmp_tkip.c | 21 - drivers/staging/rt2860/common/rtmp_wep.c | 2 - drivers/staging/rt2860/common/spectrum.c | 57 +- drivers/staging/rt2860/leap.h | 215 - drivers/staging/rt2860/mlme.h | 309 - drivers/staging/rt2860/oid.h | 173 +- drivers/staging/rt2860/rt28xx.h | 1218 +--- drivers/staging/rt2860/rt_ate.c | 6009 ------------- drivers/staging/rt2860/rt_ate.h | 347 - drivers/staging/rt2860/rt_config.h | 33 +- drivers/staging/rt2860/rt_linux.c | 45 +- drivers/staging/rt2860/rt_linux.h | 188 +- drivers/staging/rt2860/rt_main_dev.c | 717 +-- drivers/staging/rt2860/rt_profile.c | 161 +- drivers/staging/rt2860/rtmp.h | 1831 ++-- drivers/staging/rt2860/rtmp_def.h | 210 +- drivers/staging/rt2860/spectrum.h | 30 - drivers/staging/rt2860/sta/assoc.c | 586 +- drivers/staging/rt2860/sta/auth.c | 14 - drivers/staging/rt2860/sta/auth_rsp.c | 19 - drivers/staging/rt2860/sta/connect.c | 602 +- drivers/staging/rt2860/sta/dls.c | 2197 ----- drivers/staging/rt2860/sta/rtmp_data.c | 336 +- drivers/staging/rt2860/sta/sanity.c | 2 - drivers/staging/rt2860/sta/sync.c | 290 +- drivers/staging/rt2860/sta/wpa.c | 12 +- drivers/staging/rt2860/sta_ioctl.c | 1236 ++-- drivers/staging/rt2860/wpa.h | 31 +- drivers/staging/rt2870/2870_main_dev.c | 264 +- drivers/staging/rt2870/Makefile | 4 - drivers/staging/rt2870/aironet.h | 211 +- drivers/staging/rt2870/ap.h | 563 +-- drivers/staging/rt2870/chlist.h | 1297 +--- drivers/staging/rt2870/common/2870_rtmp_init.c | 117 +- drivers/staging/rt2870/common/action.c | 1047 +--- drivers/staging/rt2870/common/action.h | 69 +- drivers/staging/rt2870/common/ba_action.c | 1799 +---- drivers/staging/rt2870/common/cmm_data.c | 2732 +------ drivers/staging/rt2870/common/cmm_data_2870.c | 73 +- drivers/staging/rt2870/common/cmm_info.c | 3713 +-------- drivers/staging/rt2870/common/cmm_sanity.c | 1664 +---- drivers/staging/rt2870/common/cmm_sync.c | 712 +-- drivers/staging/rt2870/common/cmm_wpa.c | 1655 +---- drivers/staging/rt2870/common/dfs.c | 454 +- drivers/staging/rt2870/common/eeprom.c | 255 +- drivers/staging/rt2870/common/md5.c | 1428 +--- drivers/staging/rt2870/common/mlme.c | 8610 +------------------ drivers/staging/rt2870/common/netif_block.c | 144 - drivers/staging/rt2870/common/rtmp_init.c | 4133 +--------- drivers/staging/rt2870/common/rtmp_tkip.c | 1614 +---- drivers/staging/rt2870/common/rtmp_wep.c | 509 +-- drivers/staging/rt2870/common/rtusb_bulk.c | 775 +-- drivers/staging/rt2870/common/rtusb_data.c | 13 - drivers/staging/rt2870/common/rtusb_io.c | 211 +- drivers/staging/rt2870/common/spectrum.c | 1877 +---- drivers/staging/rt2870/dfs.h | 101 +- drivers/staging/rt2870/leap.h | 215 - drivers/staging/rt2870/link_list.h | 135 +- drivers/staging/rt2870/md5.h | 108 +- drivers/staging/rt2870/mlme.h | 1472 +---- drivers/staging/rt2870/netif_block.h | 58 - drivers/staging/rt2870/oid.h | 1092 +--- drivers/staging/rt2870/rt2870.h | 252 +- drivers/staging/rt2870/rt28xx.h | 2690 +------ drivers/staging/rt2870/rt_ate.c | 6452 -------------- drivers/staging/rt2870/rt_ate.h | 315 - drivers/staging/rt2870/rt_config.h | 105 +- drivers/staging/rt2870/rt_linux.c | 1096 +--- drivers/staging/rt2870/rt_linux.h | 907 +-- drivers/staging/rt2870/rt_main_dev.c | 1866 +---- drivers/staging/rt2870/rt_profile.c | 2021 +----- drivers/staging/rt2870/rtmp.h | 7587 +---------------- drivers/staging/rt2870/rtmp_ckipmic.h | 114 +- drivers/staging/rt2870/rtmp_def.h | 1623 +---- drivers/staging/rt2870/rtmp_type.h | 95 +- drivers/staging/rt2870/spectrum.h | 323 +- drivers/staging/rt2870/spectrum_def.h | 96 +- drivers/staging/rt2870/sta/aironet.c | 1313 +--- drivers/staging/rt2870/sta/assoc.c | 2040 +----- drivers/staging/rt2870/sta/auth.c | 475 +- drivers/staging/rt2870/sta/auth_rsp.c | 167 +- drivers/staging/rt2870/sta/connect.c | 2823 +------ drivers/staging/rt2870/sta/dls.c | 2210 ----- drivers/staging/rt2870/sta/rtmp_data.c | 2620 +------ drivers/staging/rt2870/sta/sanity.c | 421 +- drivers/staging/rt2870/sta/sync.c | 1754 +---- drivers/staging/rt2870/sta/wpa.c | 2108 +----- drivers/staging/rt2870/sta_ioctl.c | 7069 +--------------- drivers/staging/rt2870/sta_ioctl.c.patch | 18 - drivers/staging/rt2870/tmp60 | 7037 --------------- drivers/staging/rt2870/tmp61 | 7037 --------------- drivers/staging/rt2870/wpa.h | 358 +- drivers/staging/rt3070/2870_main_dev.c | 1628 +---- drivers/staging/rt3070/Makefile | 4 - drivers/staging/rt3070/action.h | 69 +- drivers/staging/rt3070/aironet.h | 211 +- drivers/staging/rt3070/ap.h | 558 +-- drivers/staging/rt3070/chlist.h | 1254 +--- drivers/staging/rt3070/common/2870_rtmp_init.c | 1763 +---- drivers/staging/rt3070/common/action.c | 1039 +--- drivers/staging/rt3070/common/ba_action.c | 1811 +---- drivers/staging/rt3070/common/cmm_data.c | 2828 +------ drivers/staging/rt3070/common/cmm_data_2870.c | 981 +--- drivers/staging/rt3070/common/cmm_info.c | 3396 +-------- drivers/staging/rt3070/common/cmm_sanity.c | 1670 +---- drivers/staging/rt3070/common/cmm_sync.c | 712 +-- drivers/staging/rt3070/common/cmm_wpa.c | 1607 +---- drivers/staging/rt3070/common/dfs.c | 442 +- drivers/staging/rt3070/common/eeprom.c | 1499 +---- drivers/staging/rt3070/common/md5.c | 1428 +--- drivers/staging/rt3070/common/mlme.c | 9137 +------------------- drivers/staging/rt3070/common/netif_block.c | 136 - drivers/staging/rt3070/common/rtmp_init.c | 4198 +--------- drivers/staging/rt3070/common/rtmp_tkip.c | 1614 +---- drivers/staging/rt3070/common/rtmp_wep.c | 509 +-- drivers/staging/rt3070/common/rtusb_bulk.c | 1383 +--- drivers/staging/rt3070/common/rtusb_data.c | 219 +- drivers/staging/rt3070/common/rtusb_io.c | 1909 +---- drivers/staging/rt3070/common/spectrum.c | 1877 +---- drivers/staging/rt3070/dfs.h | 101 +- drivers/staging/rt3070/leap.h | 215 - drivers/staging/rt3070/link_list.h | 135 +- drivers/staging/rt3070/md5.h | 108 +- drivers/staging/rt3070/mlme.h | 1469 +---- drivers/staging/rt3070/netif_block.h | 58 - drivers/staging/rt3070/oid.h | 1143 +--- drivers/staging/rt3070/rt2870.h | 757 +-- drivers/staging/rt3070/rt28xx.h | 2726 +------ drivers/staging/rt3070/rt_ate.c | 6506 -------------- drivers/staging/rt3070/rt_ate.h | 294 - drivers/staging/rt3070/rt_config.h | 122 +- drivers/staging/rt3070/rt_linux.c | 1064 +--- drivers/staging/rt3070/rt_linux.h | 888 +-- drivers/staging/rt3070/rt_main_dev.c | 1802 +---- drivers/staging/rt3070/rt_profile.c | 2042 +----- drivers/staging/rt3070/rtmp.h | 7729 +----------------- drivers/staging/rt3070/rtmp_ckipmic.h | 114 +- drivers/staging/rt3070/rtmp_def.h | 1560 +---- drivers/staging/rt3070/rtmp_type.h | 96 +- drivers/staging/rt3070/spectrum.h | 323 +- drivers/staging/rt3070/spectrum_def.h | 96 +- drivers/staging/rt3070/sta/aironet.c | 1313 +--- drivers/staging/rt3070/sta/assoc.c | 2061 +----- drivers/staging/rt3070/sta/auth.c | 476 +- drivers/staging/rt3070/sta/auth_rsp.c | 168 +- drivers/staging/rt3070/sta/connect.c | 2857 +------ drivers/staging/rt3070/sta/dls.c | 2170 ----- drivers/staging/rt3070/sta/rtmp_data.c | 2638 +------ drivers/staging/rt3070/sta/sanity.c | 421 +- drivers/staging/rt3070/sta/sync.c | 1756 +---- drivers/staging/rt3070/sta/wpa.c | 2100 +----- drivers/staging/rt3070/sta_ioctl.c | 7204 +--------------- drivers/staging/rt3070/wpa.h | 357 +- drivers/staging/rtl8187se/Kconfig | 2 +- .../staging/rtl8187se/ieee80211/ieee80211_module.c | 1 - drivers/staging/rtl8187se/r8180_core.c | 25 +- drivers/staging/rtl8187se/r8180_dm.c | 6 +- drivers/staging/rtl8187se/r8180_pm.c | 6 +- drivers/staging/serqt_usb/serqt_usb.c | 1 - drivers/staging/stlc45xx/stlc45xx.c | 11 +- drivers/staging/sxg/sxg.c | 38 +- drivers/staging/sxg/sxg_ethtool.c | 2 +- drivers/staging/vt6655/80211hdr.h | 357 + drivers/staging/vt6655/80211mgr.c | 1050 +++ drivers/staging/vt6655/80211mgr.h | 832 ++ drivers/staging/vt6655/IEEE11h.c | 324 + drivers/staging/vt6655/IEEE11h.h | 68 + drivers/staging/vt6655/Makefile | 218 + drivers/staging/vt6655/Makefile.arm | 181 + drivers/staging/vt6655/Makefile.x86 | 209 + drivers/staging/vt6655/aes_ccmp.c | 410 + drivers/staging/vt6655/aes_ccmp.h | 48 + drivers/staging/vt6655/baseband.c | 2990 +++++++ drivers/staging/vt6655/baseband.h | 198 + drivers/staging/vt6655/bssdb.c | 1791 ++++ drivers/staging/vt6655/bssdb.h | 380 + drivers/staging/vt6655/card.c | 3126 +++++++ drivers/staging/vt6655/card.h | 273 + drivers/staging/vt6655/country.h | 192 + drivers/staging/vt6655/datarate.c | 455 + drivers/staging/vt6655/datarate.h | 95 + drivers/staging/vt6655/desc.h | 697 ++ drivers/staging/vt6655/device.h | 1063 +++ drivers/staging/vt6655/device_cfg.h | 142 + drivers/staging/vt6655/device_main.c | 4159 +++++++++ drivers/staging/vt6655/dpc.c | 1688 ++++ drivers/staging/vt6655/dpc.h | 75 + drivers/staging/vt6655/hostap.c | 907 ++ drivers/staging/vt6655/hostap.h | 94 + drivers/staging/vt6655/iocmd.h | 481 + drivers/staging/vt6655/ioctl.c | 775 ++ drivers/staging/vt6655/ioctl.h | 74 + drivers/staging/vt6655/iowpa.h | 159 + drivers/staging/vt6655/iwctl.c | 2453 ++++++ drivers/staging/vt6655/iwctl.h | 332 + drivers/staging/vt6655/kcompat.h | 302 + drivers/staging/vt6655/key.c | 836 ++ drivers/staging/vt6655/key.h | 202 + drivers/staging/vt6655/mac.c | 1752 ++++ drivers/staging/vt6655/mac.h | 1166 +++ drivers/staging/vt6655/mib.c | 616 ++ drivers/staging/vt6655/mib.h | 399 + drivers/staging/vt6655/michael.c | 188 + drivers/staging/vt6655/michael.h | 62 + drivers/staging/vt6655/power.c | 441 + drivers/staging/vt6655/power.h | 85 + drivers/staging/vt6655/rc4.c | 86 + drivers/staging/vt6655/rc4.h | 51 + drivers/staging/vt6655/rf.c | 1283 +++ drivers/staging/vt6655/rf.h | 118 + drivers/staging/vt6655/rxtx.c | 3269 +++++++ drivers/staging/vt6655/rxtx.h | 132 + drivers/staging/vt6655/srom.c | 437 + drivers/staging/vt6655/srom.h | 179 + drivers/staging/vt6655/tbit.h | 78 + drivers/staging/vt6655/tcrc.c | 207 + drivers/staging/vt6655/tcrc.h | 71 + drivers/staging/vt6655/test | 9 + drivers/staging/vt6655/tether.c | 123 + drivers/staging/vt6655/tether.h | 256 + drivers/staging/vt6655/tkip.c | 284 + drivers/staging/vt6655/tkip.h | 76 + drivers/staging/vt6655/tmacro.h | 152 + drivers/staging/vt6655/tpci.h | 117 + drivers/staging/vt6655/ttype.h | 386 + drivers/staging/vt6655/umem.h | 75 + drivers/staging/vt6655/upc.h | 171 + drivers/staging/vt6655/vntconfiguration.dat | 1 + drivers/staging/vt6655/vntwifi.c | 832 ++ drivers/staging/vt6655/vntwifi.h | 330 + drivers/staging/vt6655/wcmd.c | 1178 +++ drivers/staging/vt6655/wcmd.h | 151 + drivers/staging/vt6655/wctl.c | 261 + drivers/staging/vt6655/wctl.h | 127 + drivers/staging/vt6655/wmgr.c | 5100 +++++++++++ drivers/staging/vt6655/wmgr.h | 521 ++ drivers/staging/vt6655/wpa.c | 339 + drivers/staging/vt6655/wpa.h | 98 + drivers/staging/vt6655/wpa2.c | 373 + drivers/staging/vt6655/wpa2.h | 100 + drivers/staging/vt6655/wpactl.c | 1014 +++ drivers/staging/vt6655/wpactl.h | 89 + drivers/staging/vt6655/wroute.c | 211 + drivers/staging/vt6655/wroute.h | 65 + drivers/staging/winbond/Makefile | 1 - drivers/staging/winbond/mds.c | 2 +- drivers/staging/winbond/mto.c | 2 +- drivers/staging/winbond/phy_calibration.c | 19 + drivers/staging/winbond/wbhal.c | 568 -- drivers/staging/winbond/wbhal_f.h | 21 - drivers/staging/winbond/wbhal_s.h | 1 - drivers/staging/winbond/wbusb.c | 785 ++- drivers/staging/wlan-ng/hfa384x.h | 244 + drivers/staging/wlan-ng/hfa384x_usb.c | 23 +- drivers/staging/wlan-ng/p80211conv.c | 2 +- drivers/staging/wlan-ng/p80211metadef.h | 48 + drivers/staging/wlan-ng/p80211netdev.c | 15 - drivers/staging/wlan-ng/p80211netdev.h | 3 - drivers/staging/wlan-ng/p80211wep.c | 1 - drivers/staging/wlan-ng/p80211wext.c | 6 +- drivers/staging/wlan-ng/prism2fw.c | 1410 +++ drivers/staging/wlan-ng/prism2mgmt.c | 28 +- drivers/staging/wlan-ng/prism2mib.c | 1 - drivers/staging/wlan-ng/prism2sta.c | 16 +- drivers/staging/wlan-ng/prism2usb.c | 9 +- 524 files changed, 80133 insertions(+), 236508 deletions(-) create mode 100644 drivers/staging/android/timed_output.c create mode 100644 drivers/staging/android/timed_output.h delete mode 100644 drivers/staging/comedi/comedi_rt.h delete mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c create mode 100644 drivers/staging/comedi/drivers/vmk80xx.c delete mode 100644 drivers/staging/comedi/interrupt.h delete mode 100644 drivers/staging/comedi/rt.c delete mode 100644 drivers/staging/comedi/rt_pend_tq.c delete mode 100644 drivers/staging/comedi/rt_pend_tq.h delete mode 100644 drivers/staging/rt2860/common/netif_block.c delete mode 100644 drivers/staging/rt2860/common/netif_block.h delete mode 100644 drivers/staging/rt2860/leap.h delete mode 100644 drivers/staging/rt2860/rt_ate.c delete mode 100644 drivers/staging/rt2860/rt_ate.h delete mode 100644 drivers/staging/rt2860/sta/dls.c delete mode 100644 drivers/staging/rt2870/common/netif_block.c delete mode 100644 drivers/staging/rt2870/leap.h delete mode 100644 drivers/staging/rt2870/netif_block.h delete mode 100644 drivers/staging/rt2870/rt_ate.c delete mode 100644 drivers/staging/rt2870/rt_ate.h delete mode 100644 drivers/staging/rt2870/sta/dls.c delete mode 100644 drivers/staging/rt2870/sta_ioctl.c.patch delete mode 100644 drivers/staging/rt2870/tmp60 delete mode 100644 drivers/staging/rt2870/tmp61 delete mode 100644 drivers/staging/rt3070/common/netif_block.c delete mode 100644 drivers/staging/rt3070/leap.h delete mode 100644 drivers/staging/rt3070/netif_block.h delete mode 100644 drivers/staging/rt3070/rt_ate.c delete mode 100644 drivers/staging/rt3070/rt_ate.h delete mode 100644 drivers/staging/rt3070/sta/dls.c create mode 100644 drivers/staging/vt6655/80211hdr.h create mode 100644 drivers/staging/vt6655/80211mgr.c create mode 100644 drivers/staging/vt6655/80211mgr.h create mode 100644 drivers/staging/vt6655/IEEE11h.c create mode 100644 drivers/staging/vt6655/IEEE11h.h create mode 100644 drivers/staging/vt6655/Makefile create mode 100644 drivers/staging/vt6655/Makefile.arm create mode 100644 drivers/staging/vt6655/Makefile.x86 create mode 100644 drivers/staging/vt6655/aes_ccmp.c create mode 100644 drivers/staging/vt6655/aes_ccmp.h create mode 100644 drivers/staging/vt6655/baseband.c create mode 100644 drivers/staging/vt6655/baseband.h create mode 100644 drivers/staging/vt6655/bssdb.c create mode 100644 drivers/staging/vt6655/bssdb.h create mode 100644 drivers/staging/vt6655/card.c create mode 100644 drivers/staging/vt6655/card.h create mode 100644 drivers/staging/vt6655/country.h create mode 100644 drivers/staging/vt6655/datarate.c create mode 100644 drivers/staging/vt6655/datarate.h create mode 100644 drivers/staging/vt6655/desc.h create mode 100644 drivers/staging/vt6655/device.h create mode 100644 drivers/staging/vt6655/device_cfg.h create mode 100644 drivers/staging/vt6655/device_main.c create mode 100644 drivers/staging/vt6655/dpc.c create mode 100644 drivers/staging/vt6655/dpc.h create mode 100644 drivers/staging/vt6655/hostap.c create mode 100644 drivers/staging/vt6655/hostap.h create mode 100644 drivers/staging/vt6655/iocmd.h create mode 100644 drivers/staging/vt6655/ioctl.c create mode 100644 drivers/staging/vt6655/ioctl.h create mode 100644 drivers/staging/vt6655/iowpa.h create mode 100644 drivers/staging/vt6655/iwctl.c create mode 100644 drivers/staging/vt6655/iwctl.h create mode 100644 drivers/staging/vt6655/kcompat.h create mode 100644 drivers/staging/vt6655/key.c create mode 100644 drivers/staging/vt6655/key.h create mode 100644 drivers/staging/vt6655/mac.c create mode 100644 drivers/staging/vt6655/mac.h create mode 100644 drivers/staging/vt6655/mib.c create mode 100644 drivers/staging/vt6655/mib.h create mode 100644 drivers/staging/vt6655/michael.c create mode 100644 drivers/staging/vt6655/michael.h create mode 100644 drivers/staging/vt6655/power.c create mode 100644 drivers/staging/vt6655/power.h create mode 100644 drivers/staging/vt6655/rc4.c create mode 100644 drivers/staging/vt6655/rc4.h create mode 100644 drivers/staging/vt6655/rf.c create mode 100644 drivers/staging/vt6655/rf.h create mode 100644 drivers/staging/vt6655/rxtx.c create mode 100644 drivers/staging/vt6655/rxtx.h create mode 100644 drivers/staging/vt6655/srom.c create mode 100644 drivers/staging/vt6655/srom.h create mode 100644 drivers/staging/vt6655/tbit.h create mode 100644 drivers/staging/vt6655/tcrc.c create mode 100644 drivers/staging/vt6655/tcrc.h create mode 100644 drivers/staging/vt6655/test create mode 100644 drivers/staging/vt6655/tether.c create mode 100644 drivers/staging/vt6655/tether.h create mode 100644 drivers/staging/vt6655/tkip.c create mode 100644 drivers/staging/vt6655/tkip.h create mode 100644 drivers/staging/vt6655/tmacro.h create mode 100644 drivers/staging/vt6655/tpci.h create mode 100644 drivers/staging/vt6655/ttype.h create mode 100644 drivers/staging/vt6655/umem.h create mode 100644 drivers/staging/vt6655/upc.h create mode 100644 drivers/staging/vt6655/vntconfiguration.dat create mode 100644 drivers/staging/vt6655/vntwifi.c create mode 100644 drivers/staging/vt6655/vntwifi.h create mode 100644 drivers/staging/vt6655/wcmd.c create mode 100644 drivers/staging/vt6655/wcmd.h create mode 100644 drivers/staging/vt6655/wctl.c create mode 100644 drivers/staging/vt6655/wctl.h create mode 100644 drivers/staging/vt6655/wmgr.c create mode 100644 drivers/staging/vt6655/wmgr.h create mode 100644 drivers/staging/vt6655/wpa.c create mode 100644 drivers/staging/vt6655/wpa.h create mode 100644 drivers/staging/vt6655/wpa2.c create mode 100644 drivers/staging/vt6655/wpa2.h create mode 100644 drivers/staging/vt6655/wpactl.c create mode 100644 drivers/staging/vt6655/wpactl.h create mode 100644 drivers/staging/vt6655/wroute.c create mode 100644 drivers/staging/vt6655/wroute.h delete mode 100644 drivers/staging/winbond/wbhal.c create mode 100644 drivers/staging/wlan-ng/prism2fw.c Merging asm-generic/next $ git merge asm-generic/next Auto-merging arch/mips/include/asm/page.h Merge made by recursive. arch/alpha/include/asm/atomic.h | 2 +- arch/alpha/include/asm/bitsperlong.h | 8 + arch/alpha/include/asm/page.h | 2 +- arch/alpha/include/asm/signal.h | 2 +- arch/alpha/include/asm/types.h | 3 - arch/arm/include/asm/atomic.h | 2 +- arch/arm/include/asm/bitsperlong.h | 1 + arch/arm/include/asm/mman.h | 2 +- arch/arm/include/asm/page.h | 2 +- arch/arm/include/asm/signal.h | 2 +- arch/avr32/include/asm/atomic.h | 2 +- arch/avr32/include/asm/bitsperlong.h | 1 + arch/avr32/include/asm/mman.h | 2 +- arch/avr32/include/asm/signal.h | 2 +- arch/avr32/include/asm/termios.h | 2 +- arch/blackfin/include/asm/atomic.h | 2 +- arch/blackfin/include/asm/bitsperlong.h | 1 + arch/blackfin/include/asm/page.h | 2 +- arch/blackfin/include/asm/signal.h | 2 +- arch/cris/include/asm/atomic.h | 2 +- arch/cris/include/asm/bitsperlong.h | 1 + arch/cris/include/asm/mman.h | 2 +- arch/cris/include/asm/page.h | 2 +- arch/cris/include/asm/signal.h | 2 +- arch/frv/include/asm/atomic.h | 2 +- arch/frv/include/asm/bitsperlong.h | 1 + arch/frv/include/asm/mman.h | 2 +- arch/frv/include/asm/page.h | 2 +- arch/frv/include/asm/pci.h | 13 +- arch/frv/include/asm/termios.h | 2 +- arch/h8300/include/asm/atomic.h | 2 +- arch/h8300/include/asm/bitsperlong.h | 1 + arch/h8300/include/asm/mman.h | 2 +- arch/h8300/include/asm/page.h | 2 +- arch/h8300/include/asm/signal.h | 2 +- arch/ia64/include/asm/atomic.h | 2 +- arch/ia64/include/asm/bitsperlong.h | 8 + arch/ia64/include/asm/mman.h | 2 +- arch/ia64/include/asm/signal.h | 2 +- arch/ia64/include/asm/types.h | 7 - arch/m32r/include/asm/atomic.h | 2 +- arch/m32r/include/asm/bitsperlong.h | 1 + arch/m32r/include/asm/mman.h | 2 +- arch/m32r/include/asm/page.h | 2 +- arch/m32r/include/asm/pci.h | 2 - arch/m32r/include/asm/signal.h | 2 +- arch/m68k/include/asm/atomic_mm.h | 2 +- arch/m68k/include/asm/atomic_no.h | 2 +- arch/m68k/include/asm/bitsperlong.h | 1 + arch/m68k/include/asm/mman.h | 2 +- arch/m68k/include/asm/page_mm.h | 2 +- arch/m68k/include/asm/page_no.h | 2 +- arch/m68k/include/asm/signal.h | 2 +- arch/microblaze/include/asm/atomic.h | 2 +- arch/microblaze/include/asm/bitsperlong.h | 1 + arch/microblaze/include/asm/page.h | 2 +- arch/microblaze/include/asm/signal.h | 2 +- arch/microblaze/include/asm/termios.h | 2 +- arch/mips/include/asm/atomic.h | 2 +- arch/mips/include/asm/bitsperlong.h | 8 + arch/mips/include/asm/page.h | 2 +- arch/mips/include/asm/signal.h | 2 +- arch/mips/include/asm/types.h | 3 - arch/mn10300/include/asm/atomic.h | 2 +- arch/mn10300/include/asm/bitsperlong.h | 1 + arch/mn10300/include/asm/mman.h | 2 +- arch/mn10300/include/asm/signal.h | 2 +- arch/parisc/include/asm/atomic.h | 2 +- arch/parisc/include/asm/bitsperlong.h | 20 + arch/parisc/include/asm/page.h | 2 +- arch/parisc/include/asm/types.h | 8 - arch/parisc/include/asm/uaccess.h | 2 +- arch/powerpc/include/asm/atomic.h | 2 +- arch/powerpc/include/asm/bitsperlong.h | 12 + arch/powerpc/include/asm/mman.h | 2 +- arch/powerpc/include/asm/page_32.h | 2 +- arch/powerpc/include/asm/page_64.h | 2 +- arch/powerpc/include/asm/signal.h | 2 +- arch/powerpc/include/asm/termios.h | 2 +- arch/powerpc/include/asm/types.h | 9 - arch/s390/include/asm/atomic.h | 2 +- arch/s390/include/asm/bitsperlong.h | 13 + arch/s390/include/asm/mman.h | 2 +- arch/s390/include/asm/page.h | 2 +- arch/s390/include/asm/signal.h | 2 +- arch/s390/include/asm/termios.h | 2 +- arch/s390/include/asm/types.h | 6 - arch/sh/include/asm/atomic.h | 2 +- arch/sh/include/asm/bitsperlong.h | 1 + arch/sh/include/asm/mman.h | 2 +- arch/sh/include/asm/page.h | 2 +- arch/sh/include/asm/signal.h | 2 +- arch/sparc/include/asm/atomic_32.h | 2 +- arch/sparc/include/asm/atomic_64.h | 2 +- arch/sparc/include/asm/bitsperlong.h | 13 + arch/sparc/include/asm/mman.h | 2 +- arch/sparc/include/asm/page_32.h | 2 +- arch/sparc/include/asm/page_64.h | 2 +- arch/sparc/include/asm/signal.h | 2 +- arch/sparc/include/asm/types.h | 4 - arch/sparc/include/asm/uaccess_64.h | 2 +- arch/um/include/asm/page.h | 2 +- arch/x86/include/asm/atomic_32.h | 2 +- arch/x86/include/asm/atomic_64.h | 2 +- arch/x86/include/asm/bitsperlong.h | 13 + arch/x86/include/asm/mman.h | 2 +- arch/x86/include/asm/page.h | 2 +- arch/x86/include/asm/signal.h | 2 +- arch/x86/include/asm/types.h | 6 - arch/xtensa/include/asm/atomic.h | 2 +- arch/xtensa/include/asm/bitsperlong.h | 1 + arch/xtensa/include/asm/page.h | 2 +- include/asm-generic/Kbuild | 22 + include/asm-generic/Kbuild.asm | 1 + include/asm-generic/atomic-long.h | 258 +++++++++ include/asm-generic/atomic.h | 321 ++++------- include/asm-generic/auxvec.h | 8 + include/asm-generic/bitops.h | 24 +- include/asm-generic/bitops/atomic.h | 1 + include/asm-generic/bitsperlong.h | 32 ++ include/asm-generic/bugs.h | 10 + include/asm-generic/cache.h | 12 + include/asm-generic/cacheflush.h | 30 + include/asm-generic/checksum.h | 79 +++ include/asm-generic/current.h | 9 + include/asm-generic/delay.h | 9 + include/asm-generic/dma.h | 15 + include/asm-generic/fb.h | 12 + include/asm-generic/getorder.h | 24 + include/asm-generic/hardirq.h | 34 ++ include/asm-generic/hw_irq.h | 9 + include/asm-generic/int-l64.h | 2 + include/asm-generic/int-ll64.h | 2 + include/asm-generic/io.h | 300 ++++++++++ include/asm-generic/ioctls.h | 110 ++++ include/asm-generic/ipcbuf.h | 33 ++ include/asm-generic/irq.h | 18 + include/asm-generic/irqflags.h | 72 +++ include/asm-generic/kmap_types.h | 29 + include/asm-generic/linkage.h | 8 + include/asm-generic/mman-common.h | 41 ++ include/asm-generic/mman.h | 51 +-- include/asm-generic/mmu.h | 15 + include/asm-generic/mmu_context.h | 45 ++ include/asm-generic/module.h | 22 + include/asm-generic/msgbuf.h | 47 ++ include/asm-generic/mutex.h | 9 + include/asm-generic/page.h | 109 +++- include/asm-generic/param.h | 24 + include/asm-generic/parport.h | 23 + include/asm-generic/pci.h | 8 + include/asm-generic/pgalloc.h | 12 + include/asm-generic/posix_types.h | 165 ++++++ include/asm-generic/scatterlist.h | 43 ++ include/asm-generic/segment.h | 9 + include/asm-generic/sembuf.h | 38 ++ include/asm-generic/serial.h | 13 + include/asm-generic/setup.h | 6 + include/asm-generic/shmbuf.h | 59 ++ include/asm-generic/shmparam.h | 6 + include/asm-generic/signal-defs.h | 28 + include/asm-generic/signal.h | 137 ++++- include/asm-generic/socket.h | 60 ++ include/asm-generic/sockios.h | 13 + include/asm-generic/spinlock.h | 11 + include/asm-generic/stat.h | 72 +++ include/asm-generic/string.h | 10 + include/asm-generic/swab.h | 18 + include/asm-generic/syscalls.h | 60 ++ include/asm-generic/system.h | 161 ++++++ include/asm-generic/termbits.h | 198 +++++++ include/asm-generic/termios-base.h | 77 +++ include/asm-generic/termios.h | 105 +++- include/asm-generic/timex.h | 22 + include/asm-generic/tlbflush.h | 18 + include/asm-generic/types.h | 42 ++ include/asm-generic/uaccess-unaligned.h | 26 + include/asm-generic/uaccess.h | 333 +++++++++++- include/asm-generic/ucontext.h | 12 + include/asm-generic/unaligned.h | 30 + include/asm-generic/unistd.h | 854 +++++++++++++++++++++++++++++ include/asm-generic/user.h | 8 + include/asm-generic/vga.h | 24 + lib/Makefile | 2 + lib/checksum.c | 193 +++++++ scripts/checksyscalls.sh | 92 +++- 186 files changed, 4709 insertions(+), 458 deletions(-) create mode 100644 arch/alpha/include/asm/bitsperlong.h create mode 100644 arch/arm/include/asm/bitsperlong.h create mode 100644 arch/avr32/include/asm/bitsperlong.h create mode 100644 arch/blackfin/include/asm/bitsperlong.h create mode 100644 arch/cris/include/asm/bitsperlong.h create mode 100644 arch/frv/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/ia64/include/asm/bitsperlong.h create mode 100644 arch/m32r/include/asm/bitsperlong.h create mode 100644 arch/m68k/include/asm/bitsperlong.h create mode 100644 arch/microblaze/include/asm/bitsperlong.h create mode 100644 arch/mips/include/asm/bitsperlong.h create mode 100644 arch/mn10300/include/asm/bitsperlong.h create mode 100644 arch/parisc/include/asm/bitsperlong.h create mode 100644 arch/powerpc/include/asm/bitsperlong.h create mode 100644 arch/s390/include/asm/bitsperlong.h create mode 100644 arch/sh/include/asm/bitsperlong.h create mode 100644 arch/sparc/include/asm/bitsperlong.h create mode 100644 arch/x86/include/asm/bitsperlong.h create mode 100644 arch/xtensa/include/asm/bitsperlong.h create mode 100644 include/asm-generic/atomic-long.h create mode 100644 include/asm-generic/auxvec.h create mode 100644 include/asm-generic/bitsperlong.h create mode 100644 include/asm-generic/bugs.h create mode 100644 include/asm-generic/cache.h create mode 100644 include/asm-generic/cacheflush.h create mode 100644 include/asm-generic/checksum.h create mode 100644 include/asm-generic/current.h create mode 100644 include/asm-generic/delay.h create mode 100644 include/asm-generic/dma.h create mode 100644 include/asm-generic/fb.h create mode 100644 include/asm-generic/getorder.h create mode 100644 include/asm-generic/hardirq.h create mode 100644 include/asm-generic/hw_irq.h create mode 100644 include/asm-generic/io.h create mode 100644 include/asm-generic/ioctls.h create mode 100644 include/asm-generic/ipcbuf.h create mode 100644 include/asm-generic/irq.h create mode 100644 include/asm-generic/irqflags.h create mode 100644 include/asm-generic/kmap_types.h create mode 100644 include/asm-generic/linkage.h create mode 100644 include/asm-generic/mman-common.h create mode 100644 include/asm-generic/mmu.h create mode 100644 include/asm-generic/mmu_context.h create mode 100644 include/asm-generic/module.h create mode 100644 include/asm-generic/msgbuf.h create mode 100644 include/asm-generic/mutex.h create mode 100644 include/asm-generic/param.h create mode 100644 include/asm-generic/parport.h create mode 100644 include/asm-generic/pgalloc.h create mode 100644 include/asm-generic/posix_types.h create mode 100644 include/asm-generic/scatterlist.h create mode 100644 include/asm-generic/segment.h create mode 100644 include/asm-generic/sembuf.h create mode 100644 include/asm-generic/serial.h create mode 100644 include/asm-generic/setup.h create mode 100644 include/asm-generic/shmbuf.h create mode 100644 include/asm-generic/shmparam.h create mode 100644 include/asm-generic/signal-defs.h create mode 100644 include/asm-generic/socket.h create mode 100644 include/asm-generic/sockios.h create mode 100644 include/asm-generic/spinlock.h create mode 100644 include/asm-generic/stat.h create mode 100644 include/asm-generic/string.h create mode 100644 include/asm-generic/swab.h create mode 100644 include/asm-generic/syscalls.h create mode 100644 include/asm-generic/system.h create mode 100644 include/asm-generic/termbits.h create mode 100644 include/asm-generic/termios-base.h create mode 100644 include/asm-generic/timex.h create mode 100644 include/asm-generic/tlbflush.h create mode 100644 include/asm-generic/types.h create mode 100644 include/asm-generic/uaccess-unaligned.h create mode 100644 include/asm-generic/ucontext.h create mode 100644 include/asm-generic/unaligned.h create mode 100644 include/asm-generic/unistd.h create mode 100644 include/asm-generic/user.h create mode 100644 include/asm-generic/vga.h create mode 100644 lib/checksum.c Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.