diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 4756 |
1 files changed, 4756 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..2feddf12455a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4756 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 2bfc96a Linux 2.6.36-rc3 +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Updating 2bfc96a..cbb288b +Fast-forward + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/perf_event.h | 2 +- + arch/arm/include/asm/unistd.h | 3 + + arch/arm/kernel/calls.S | 3 + + arch/arm/kernel/perf_event.c | 12 +- + arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx25/mach-cpuimx25.c | 4 +- + arch/arm/mach-mx3/clock-imx35.c | 77 +++++++--- + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 4 +- + arch/arm/mach-mx5/clock-mx51.c | 2 +- + arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 +- + arch/arm/mach-pxa/cpufreq-pxa3xx.c | 2 +- + arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 4 +- + arch/arm/mach-shmobile/Makefile | 2 +- + arch/arm/mach-shmobile/board-ap4evb.c | 56 +++++-- + arch/arm/mach-shmobile/clock-sh7372.c | 9 +- + arch/arm/mach-shmobile/clock.c | 4 +- + arch/arm/mach-shmobile/pm_runtime.c | 169 ++++++++++++++++++++ + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-mxc/Kconfig | 1 + + arch/arm/plat-mxc/include/mach/eukrea-baseboards.h | 4 +- + arch/arm/plat-mxc/tzic.c | 5 +- + arch/arm/plat-pxa/pwm.c | 2 +- + drivers/video/pxa168fb.c | 6 +- + 25 files changed, 311 insertions(+), 70 deletions(-) + create mode 100644 arch/arm/mach-shmobile/pm_runtime.c +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/unistd.h | 5 ++++- + arch/m68k/kernel/entry.S | 3 +++ + arch/m68knommu/kernel/syscalltable.S | 3 +++ + 3 files changed, 10 insertions(+), 1 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Merge made by recursive. + arch/powerpc/kernel/head_64.S | 12 ++++++-- + arch/powerpc/kernel/misc_32.S | 3 ++ + arch/powerpc/kernel/time.c | 23 +++++++-------- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 9 ++++-- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 + + arch/powerpc/platforms/85xx/p1022_ds.c | 4 +- + arch/powerpc/platforms/pseries/dlpar.c | 42 ++++++++++++++++++++--------- + arch/powerpc/sysdev/fsl_pci.c | 2 + + arch/powerpc/sysdev/fsl_rio.c | 6 +++- + arch/powerpc/sysdev/qe_lib/qe.c | 1 + + include/linux/pci_ids.h | 2 + + 11 files changed, 71 insertions(+), 34 deletions(-) +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. + drivers/scsi/be2iscsi/be_iscsi.c | 5 +- + drivers/scsi/be2iscsi/be_mgmt.c | 2 +- + drivers/scsi/constants.c | 6 +- + drivers/scsi/hpsa.c | 6 ++ + drivers/scsi/osd/osd_initiator.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 23 ++++++--- + drivers/scsi/qla2xxx/qla_dbg.h | 2 - + drivers/scsi/qla2xxx/qla_def.h | 20 +++++++ + drivers/scsi/qla2xxx/qla_init.c | 94 ++++++++++++++++++++++++++++++----- + drivers/scsi/qla2xxx/qla_isr.c | 7 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 7 ++- + drivers/scsi/qla2xxx/qla_mid.c | 68 ++++++++++++++++++++++--- + drivers/scsi/qla2xxx/qla_nx.c | 36 ++++++++++--- + drivers/scsi/qla2xxx/qla_os.c | 30 ++++++++++-- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/sd.c | 6 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 10 ++-- + 17 files changed, 260 insertions(+), 68 deletions(-) +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Auto-merging drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +Merge made by recursive. + MAINTAINERS | 8 +++++++- + drivers/net/3c59x.c | 5 +---- + drivers/net/pcmcia/pcnet_cs.c | 1 + + drivers/net/pxa168_eth.c | 2 ++ + drivers/net/wireless/ath/ath5k/base.c | 4 ++++ + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- + drivers/net/wireless/ath/regd.h | 1 - + drivers/net/wireless/libertas/if_sdio.c | 2 +- + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/vhost/vhost.c | 5 ++++- + net/bridge/br_netfilter.c | 6 ++++-- + net/core/gen_estimator.c | 12 ++++++------ + net/core/skbuff.c | 8 ++++++-- + net/ipv4/Kconfig | 2 +- + net/irda/af_irda.c | 4 ++-- + net/mac80211/main.c | 6 ++++++ + net/netfilter/ipvs/ip_vs_ftp.c | 3 ++- + net/netlink/af_netlink.c | 22 ++++++++++++++++++++++ + net/sched/act_police.c | 21 +++++++++------------ + net/sched/sch_hfsc.c | 2 +- + net/wireless/core.c | 21 ++++++++++++--------- + net/wireless/wext-compat.c | 3 +++ + net/wireless/wext-core.c | 16 ++++++++++++++++ + net/xfrm/xfrm_user.c | 2 +- + 25 files changed, 114 insertions(+), 48 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Auto-merging Documentation/kernel-parameters.txt +Removing drivers/pci/pcie/pme/Makefile +Removing drivers/pci/pcie/pme/pcie_pme.h +Removing drivers/pci/pcie/pme/pcie_pme_acpi.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 17 +++-- + arch/x86/include/asm/pci.h | 6 +- + drivers/acpi/pci_root.c | 97 ++++++++++++++++------------ + drivers/pci/hotplug/acpi_pcihp.c | 6 +- + drivers/pci/hotplug/pciehp.h | 16 +---- + drivers/pci/hotplug/pciehp_acpi.c | 4 +- + drivers/pci/hotplug/pciehp_core.c | 4 +- + drivers/pci/pci.h | 2 + + drivers/pci/pcie/Makefile | 3 +- + drivers/pci/pcie/aer/aerdrv.c | 9 ++- + drivers/pci/pcie/aer/aerdrv_acpi.c | 36 ---------- + drivers/pci/pcie/aer/aerdrv_core.c | 14 +---- + drivers/pci/pcie/{pme/pcie_pme.c => pme.c} | 66 ++----------------- + drivers/pci/pcie/pme/Makefile | 8 -- + drivers/pci/pcie/pme/pcie_pme.h | 28 -------- + drivers/pci/pcie/pme/pcie_pme_acpi.c | 54 --------------- + drivers/pci/pcie/portdrv.h | 22 ++++++ + drivers/pci/pcie/portdrv_acpi.c | 77 ++++++++++++++++++++++ + drivers/pci/pcie/portdrv_core.c | 53 ++++++++++++++- + drivers/pci/pcie/portdrv_pci.c | 38 +++++++++-- + drivers/pci/slot.c | 2 +- + include/acpi/acpi_bus.h | 3 - + include/linux/acpi.h | 4 +- + include/linux/pci.h | 3 + + 24 files changed, 281 insertions(+), 291 deletions(-) + rename drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (83%) + delete mode 100644 drivers/pci/pcie/pme/Makefile + delete mode 100644 drivers/pci/pcie/pme/pcie_pme.h + delete mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c + create mode 100644 drivers/pci/pcie/portdrv_acpi.c +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +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/tty.current +$ git merge quilt/tty.current +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 3 +-- + drivers/char/tty_io.c | 2 +- + drivers/char/vt.c | 15 ++++----------- + drivers/serial/amba-pl010.c | 9 ++------- + drivers/serial/bfin_sport_uart.c | 2 +- + include/linux/serial.h | 3 +-- + include/linux/serial_core.h | 3 ++- + 7 files changed, 12 insertions(+), 25 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/atm/cxacru.c | 24 +++++++- + drivers/usb/class/cdc-acm.c | 23 +++++++- + drivers/usb/core/message.c | 22 ++++---- + drivers/usb/gadget/rndis.c | 12 +++- + drivers/usb/gadget/rndis.h | 2 +- + drivers/usb/gadget/s3c-hsotg.c | 2 - + drivers/usb/host/ehci-ppc-of.c | 12 ++-- + drivers/usb/serial/cp210x.c | 11 ++- + drivers/usb/serial/ftdi_sio.c | 8 +++ + drivers/usb/serial/ftdi_sio_ids.h | 12 ++++ + drivers/usb/serial/mos7840.c | 32 +++++++--- + drivers/usb/serial/option.c | 119 +++++++++++++++++++++++-------------- + drivers/usb/serial/ssu100.c | 2 +- + 13 files changed, 196 insertions(+), 85 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Merge made by recursive. + drivers/staging/batman-adv/hard-interface.c | 13 -------- + drivers/staging/batman-adv/send.c | 8 +---- + drivers/staging/comedi/drivers/das08_cs.c | 1 - + drivers/staging/hv/netvsc_drv.c | 3 ++ + drivers/staging/hv/ring_buffer.c | 3 +- + drivers/staging/hv/storvsc_api.h | 4 +- + drivers/staging/hv/storvsc_drv.c | 11 ++++-- + drivers/staging/octeon/Kconfig | 2 +- + drivers/staging/rt2860/usb_main_dev.c | 41 +++++++++++++++++++++++++- + drivers/staging/spectra/Kconfig | 1 + + drivers/staging/spectra/ffsport.c | 1 + + drivers/staging/wlan-ng/cfg80211.c | 3 ++ + drivers/staging/zram/zram_drv.c | 1 + + 13 files changed, 61 insertions(+), 31 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/char/vt_ioctl.c | 16 ++++++++-------- + drivers/input/input.c | 11 +++++++++-- + drivers/input/mouse/bcm5974.c | 12 ++++++++---- + drivers/input/serio/i8042.c | 2 +- + drivers/input/tablet/wacom_wac.c | 4 ++-- + 5 files changed, 28 insertions(+), 17 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Removing drivers/md/.gitignore +Merge made by recursive. + drivers/md/.gitignore | 4 ---- + drivers/md/bitmap.c | 3 +-- + drivers/md/md.c | 25 ++++++++++--------------- + drivers/md/md.h | 2 +- + lib/raid6/.gitignore | 4 ++++ + 5 files changed, 16 insertions(+), 22 deletions(-) + delete mode 100644 drivers/md/.gitignore + create mode 100644 lib/raid6/.gitignore +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Auto-merging drivers/char/hw_random/n2-drv.c +Merge made by recursive. + crypto/Kconfig | 8 ++++---- + crypto/ahash.c | 7 +++++-- + crypto/algboss.c | 8 ++++---- + crypto/testmgr.c | 4 ++-- + drivers/char/hw_random/n2-drv.c | 2 +- + 5 files changed, 16 insertions(+), 13 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging arch/arm/Kconfig +Merge made by recursive. + Makefile | 7 + + arch/arm/Kconfig | 2 + + arch/arm/Kconfig.debug | 5 + + arch/arm/common/sa1111.c | 2 +- + arch/arm/include/asm/ftrace.h | 20 ++- + arch/arm/include/asm/hardware/coresight.h | 34 ++--- + arch/arm/include/asm/module.h | 31 ++-- + arch/arm/kernel/armksyms.c | 2 + + arch/arm/kernel/entry-common.S | 63 ++++++-- + arch/arm/kernel/etm.c | 15 ++ + arch/arm/kernel/ftrace.c | 188 ++++++++++++++----- + arch/arm/kernel/module.c | 68 ++++---- + arch/arm/kernel/unwind.c | 2 + + arch/arm/mach-realview/core.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +- + arch/arm/mach-ux500/Makefile | 4 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 91 ++++++++++ + arch/arm/mach-ux500/board-mop500.c | 3 + + arch/arm/mach-ux500/board-mop500.h | 12 ++ + arch/arm/mach-ux500/cpu-db8500.c | 82 +++++++++ + arch/arm/mach-ux500/devices-db8500.c | 76 ++++++++ + arch/arm/mach-ux500/include/mach/db8500-regs.h | 2 - + arch/arm/mach-ux500/include/mach/devices.h | 7 + + arch/arm/mach-ux500/include/mach/hardware.h | 23 +++- + arch/arm/mach-ux500/include/mach/irqs.h | 1 + + arch/arm/mach-ux500/include/mach/prcmu-regs.h | 91 ++++++++++ + arch/arm/mach-ux500/include/mach/prcmu.h | 15 ++ + arch/arm/mach-ux500/include/mach/setup.h | 7 + + arch/arm/mach-ux500/pins-db8500.h | 66 ++++---- + arch/arm/mach-ux500/prcmu.c | 231 ++++++++++++++++++++++++ + arch/arm/plat-nomadik/gpio.c | 74 ++++++-- + arch/arm/plat-nomadik/include/plat/gpio.h | 2 + + arch/arm/plat-nomadik/include/plat/pincfg.h | 36 ++++- + drivers/mmc/host/mmci.c | 27 +++- + drivers/mmc/host/mmci.h | 7 - + include/linux/amba/mmci.h | 2 + + kernel/trace/Kconfig | 2 +- + scripts/Makefile.build | 3 +- + scripts/recordmcount.pl | 2 + + 41 files changed, 1110 insertions(+), 203 deletions(-) + create mode 100644 arch/arm/mach-ux500/board-mop500-sdi.c + create mode 100644 arch/arm/mach-ux500/board-mop500.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-regs.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h + create mode 100644 arch/arm/mach-ux500/prcmu.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 4 +- + arch/arm/configs/da8xx_omapl_defconfig | 2 + + arch/arm/mach-davinci/Kconfig | 68 ++++--- + arch/arm/mach-davinci/Makefile | 3 +- + arch/arm/mach-davinci/aemif.c | 133 ++++++++++++++ + arch/arm/mach-davinci/board-da830-evm.c | 17 ++- + arch/arm/mach-davinci/board-da850-evm.c | 84 +++++++-- + arch/arm/mach-davinci/board-dm365-evm.c | 4 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 12 ++ + arch/arm/mach-davinci/board-dm646x-evm.c | 14 ++ + arch/arm/mach-davinci/board-mityomapl138.c | 221 +++++++++++++++++++++++ + arch/arm/mach-davinci/clock.c | 75 ++++++++- + arch/arm/mach-davinci/clock.h | 5 + + arch/arm/mach-davinci/cpufreq.c | 28 +++- + arch/arm/mach-davinci/da850.c | 76 ++++---- + arch/arm/mach-davinci/devices-da8xx.c | 39 ++++ + arch/arm/mach-davinci/devices.c | 2 +- + arch/arm/mach-davinci/dma.c | 8 +- + arch/arm/mach-davinci/include/mach/aemif.h | 36 ++++ + arch/arm/mach-davinci/include/mach/da8xx.h | 7 +- + arch/arm/mach-davinci/include/mach/nand.h | 6 +- + arch/arm/mach-davinci/include/mach/psc.h | 1 + + arch/arm/mach-davinci/include/mach/uncompress.h | 1 + + arch/arm/mach-davinci/tnetv107x.c | 2 +- + drivers/mtd/nand/davinci_nand.c | 61 +++---- + 25 files changed, 771 insertions(+), 138 deletions(-) + create mode 100644 arch/arm/mach-davinci/aemif.c + create mode 100644 arch/arm/mach-davinci/board-mityomapl138.c + create mode 100644 arch/arm/mach-davinci/include/mach/aemif.h +Merging i.MX/for-next +$ git merge i.MX/for-next +Auto-merging arch/arm/mach-mx3/clock-imx35.c +Auto-merging arch/arm/plat-mxc/Kconfig +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 9 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 263 +++++++++++++++++++++++++++ + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/clock-imx35.c | 13 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 49 +++++- + arch/arm/mach-mx5/board-mx51_babbage.c | 43 +++++- + arch/arm/plat-mxc/Kconfig | 12 ++ + arch/arm/plat-mxc/Makefile | 1 + + arch/arm/plat-mxc/epit.c | 242 ++++++++++++++++++++++++ + arch/arm/plat-mxc/include/mach/common.h | 1 + + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 24 +++ + 12 files changed, 653 insertions(+), 7 deletions(-) + create mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c + create mode 100644 arch/arm/plat-mxc/epit.c +Merging msm/for-next +$ git merge msm/for-next +Already uptodate! +Merge made by recursive. +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/mach-omap2/board-n8x0.c | 49 +++++++++++++++++++++---------- + arch/arm/mach-omap2/board-omap4panda.c | 2 - + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 2 - + arch/arm/plat-omap/gpio.c | 4 +- + 5 files changed, 36 insertions(+), 23 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Resolved 'arch/arm/mach-s3c64xx/Makefile' using previous resolution. +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Resolved 'arch/arm/plat-samsung/Kconfig' using previous resolution. +Resolved 'drivers/input/touchscreen/s3c2410_ts.c' using previous resolution. +Renaming arch/arm/mach-s3c2410/include/mach/ts.h->arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c64xx/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-samsung/Kconfig +CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig +Auto-merging drivers/input/touchscreen/s3c2410_ts.c +CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6a9b0a2] Merge remote branch 'samsung/next-samsung' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-s3c64xx/dev-ts.c | 61 +++++++++++++++++++++++++++++++++ + arch/arm/mach-s3c64xx/mach-smdk6410.c | 5 +++ + 2 files changed, 66 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-s3c64xx/dev-ts.c +Merging s5p/for-next +$ git merge s5p/for-next +Merge made by recursive. + arch/arm/mach-s5pv210/Kconfig | 9 +- + arch/arm/mach-s5pv210/Makefile | 1 - + arch/arm/mach-s5pv210/clock.c | 2 +- + arch/arm/mach-s5pv210/cpu.c | 2 +- + arch/arm/mach-s5pv210/include/mach/irqs.h | 2 +- + arch/arm/mach-s5pv210/include/mach/map.h | 3 + + arch/arm/mach-s5pv210/mach-aquila.c | 2 +- + arch/arm/mach-s5pv210/mach-goni.c | 2 +- + arch/arm/mach-s5pv310/Kconfig | 22 +++- + arch/arm/mach-s5pv310/Makefile | 1 + + arch/arm/mach-s5pv310/hotplug.c | 144 +++++++++++++++++++++ + arch/arm/mach-s5pv310/include/mach/irqs.h | 7 + + arch/arm/mach-s5pv310/include/mach/map.h | 6 + + arch/arm/mach-s5pv310/mach-smdkc210.c | 91 +++++++++++++ + arch/arm/mach-s5pv310/mach-universal_c210.c | 62 +++++++++ + arch/arm/plat-s5p/Kconfig | 5 + + arch/arm/plat-s5p/Makefile | 1 + + arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c | 28 ++-- + arch/arm/plat-samsung/dev-hsmmc3.c | 4 +- + arch/arm/plat-samsung/include/plat/devs.h | 2 +- + 20 files changed, 364 insertions(+), 32 deletions(-) + create mode 100644 arch/arm/mach-s5pv310/hotplug.c + create mode 100644 arch/arm/mach-s5pv310/mach-smdkc210.c + rename arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c (59%) +Merging tegra/for-next +$ git merge tegra/for-next +Auto-merging arch/arm/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/configs/tegra_defconfig | 1095 +++++++++++++++++++++++++ + arch/arm/mach-tegra/Kconfig | 7 + + arch/arm/mach-tegra/Makefile | 7 +- + arch/arm/mach-tegra/clock.c | 267 ++++++- + arch/arm/mach-tegra/clock.h | 58 +- + arch/arm/mach-tegra/common.c | 13 +- + arch/arm/mach-tegra/cpu-tegra.c | 185 +++++ + arch/arm/mach-tegra/dma.c | 752 +++++++++++++++++ + arch/arm/mach-tegra/fuse.c | 84 ++ + arch/arm/mach-tegra/fuse.h | 24 + + arch/arm/mach-tegra/gpio.c | 104 +++- + arch/arm/mach-tegra/include/mach/clk.h | 5 + + arch/arm/mach-tegra/include/mach/dma.h | 155 ++++ + arch/arm/mach-tegra/include/mach/gpio.h | 4 +- + arch/arm/mach-tegra/include/mach/io.h | 6 + + arch/arm/mach-tegra/include/mach/iomap.h | 33 +- + arch/arm/mach-tegra/include/mach/irqs.h | 2 + + arch/arm/mach-tegra/include/mach/legacy_irq.h | 31 + + arch/arm/mach-tegra/include/mach/pinmux-t2.h | 174 ++++ + arch/arm/mach-tegra/include/mach/pinmux.h | 210 ++---- + arch/arm/mach-tegra/io.c | 6 + + arch/arm/mach-tegra/irq.c | 137 +++ + arch/arm/mach-tegra/legacy_irq.c | 114 +++ + arch/arm/mach-tegra/pinmux-t2-tables.c | 260 ++++++ + arch/arm/mach-tegra/pinmux.c | 354 +++------ + arch/arm/mach-tegra/tegra2_clocks.c | 778 ++++++++++++++---- + arch/arm/mach-tegra/tegra2_dvfs.c | 86 ++ + arch/arm/mach-tegra/tegra2_dvfs.h | 20 + + 29 files changed, 4344 insertions(+), 628 deletions(-) + create mode 100644 arch/arm/configs/tegra_defconfig + create mode 100644 arch/arm/mach-tegra/cpu-tegra.c + create mode 100644 arch/arm/mach-tegra/dma.c + create mode 100644 arch/arm/mach-tegra/fuse.c + create mode 100644 arch/arm/mach-tegra/fuse.h + create mode 100644 arch/arm/mach-tegra/include/mach/dma.h + create mode 100644 arch/arm/mach-tegra/include/mach/legacy_irq.h + create mode 100644 arch/arm/mach-tegra/include/mach/pinmux-t2.h + create mode 100644 arch/arm/mach-tegra/legacy_irq.c + create mode 100644 arch/arm/mach-tegra/pinmux-t2-tables.c + create mode 100644 arch/arm/mach-tegra/tegra2_dvfs.c + create mode 100644 arch/arm/mach-tegra/tegra2_dvfs.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/system_mm.h | 2 - + arch/m68k/include/asm/system_no.h | 9 ------ + arch/m68k/kernel/asm-offsets.c | 12 -------- + arch/m68k/kernel/time.c | 2 - + arch/m68k/sun3/sun3ints.c | 8 ++--- + arch/m68knommu/kernel/asm-offsets.c | 11 +------ + arch/m68knommu/kernel/ptrace.c | 18 ----------- + arch/m68knommu/kernel/setup.c | 3 -- + arch/m68knommu/kernel/time.c | 16 ++++++---- + arch/m68knommu/kernel/traps.c | 13 -------- + arch/m68knommu/platform/68328/entry.S | 32 ++++++++++---------- + arch/m68knommu/platform/68328/head-de2.S | 6 ---- + arch/m68knommu/platform/68328/head-ram.S | 27 ----------------- + arch/m68knommu/platform/68360/entry.S | 9 ++++- + arch/m68knommu/platform/68VZ328/config.c | 5 --- + arch/m68knommu/platform/coldfire/intc-2.c | 40 ++++++++++++++++++++++---- + arch/m68knommu/platform/coldfire/intc-simr.c | 2 + + drivers/serial/68328serial.h | 5 --- + 18 files changed, 72 insertions(+), 148 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/page.h +Auto-merging drivers/serial/uartlite.c +Merge made by recursive. + arch/microblaze/Kconfig | 17 +++++++++++++++++ + arch/microblaze/include/asm/page.h | 3 --- + arch/microblaze/include/asm/prom.h | 1 + + arch/microblaze/include/asm/seccomp.h | 16 ++++++++++++++++ + arch/microblaze/include/asm/setup.h | 6 ++++++ + arch/microblaze/include/asm/thread_info.h | 20 ++++++++------------ + arch/microblaze/kernel/entry.S | 23 +++++++---------------- + arch/microblaze/kernel/exceptions.c | 8 +------- + arch/microblaze/kernel/kgdb.c | 3 +-- + arch/microblaze/kernel/setup.c | 6 ------ + arch/microblaze/kernel/timer.c | 2 +- + arch/microblaze/platform/generic/system.dts | 1 + + drivers/serial/uartlite.c | 26 +++++++++++++++++++++++++- + 13 files changed, 84 insertions(+), 48 deletions(-) + create mode 100644 arch/microblaze/include/asm/seccomp.h +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + arch/powerpc/include/asm/checksum.h | 10 + + arch/powerpc/include/asm/compat.h | 4 +- + arch/powerpc/include/asm/cputable.h | 14 +- + arch/powerpc/include/asm/dma-mapping.h | 14 +- + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/include/asm/exception-64s.h | 3 +- + arch/powerpc/include/asm/kvm_fpu.h | 4 +- + arch/powerpc/include/asm/lppaca.h | 29 ++ + arch/powerpc/include/asm/machdep.h | 3 + + arch/powerpc/include/asm/paca.h | 10 +- + arch/powerpc/include/asm/page_64.h | 4 +- + arch/powerpc/include/asm/ppc_asm.h | 50 ++- + arch/powerpc/include/asm/processor.h | 4 +- + arch/powerpc/include/asm/systbl.h | 19 + + arch/powerpc/include/asm/system.h | 4 +- + arch/powerpc/include/asm/time.h | 5 - + arch/powerpc/include/asm/unistd.h | 21 +- + arch/powerpc/kernel/align.c | 4 +- + arch/powerpc/kernel/asm-offsets.c | 8 +- + arch/powerpc/kernel/dma.c | 18 + + arch/powerpc/kernel/entry_64.S | 40 +++ + arch/powerpc/kernel/fpu.S | 10 - + arch/powerpc/kernel/lparcfg.c | 14 +- + arch/powerpc/kernel/paca.c | 70 ++++- + arch/powerpc/kernel/process.c | 12 - + arch/powerpc/kernel/ptrace.c | 2 +- + arch/powerpc/kernel/smp.c | 14 +- + arch/powerpc/kernel/time.c | 272 +++++++-------- + arch/powerpc/kernel/vdso.c | 6 +- + arch/powerpc/kvm/book3s_paired_singles.c | 44 +-- + arch/powerpc/kvm/fpu.S | 8 - + arch/powerpc/lib/Makefile | 3 +- + arch/powerpc/lib/checksum_64.S | 482 +++++++++++++++++++------- + arch/powerpc/lib/checksum_wrappers_64.c | 102 ++++++ + arch/powerpc/lib/copy_32.S | 2 +- + arch/powerpc/lib/ldstfp.S | 36 +- + arch/powerpc/lib/locks.c | 4 +- + arch/powerpc/lib/sstep.c | 8 + + arch/powerpc/mm/fault.c | 6 + + arch/powerpc/mm/mmu_context_nohash.c | 6 +- + arch/powerpc/oprofile/backtrace.c | 2 +- + arch/powerpc/platforms/cell/ras.c | 4 +- + arch/powerpc/platforms/cell/spider-pic.c | 4 +- + arch/powerpc/platforms/chrp/nvram.c | 4 +- + arch/powerpc/platforms/iseries/dt.c | 4 +- + arch/powerpc/platforms/iseries/smp.c | 2 +- + arch/powerpc/platforms/maple/setup.c | 1 + + arch/powerpc/platforms/powermac/pfunc_core.c | 9 +- + arch/powerpc/platforms/pseries/dtl.c | 224 +++++++++--- + arch/powerpc/platforms/pseries/lpar.c | 25 ++- + arch/powerpc/platforms/pseries/setup.c | 52 +++ + arch/powerpc/sysdev/dart_iommu.c | 74 ++++- + drivers/macintosh/via-pmu-led.c | 4 +- + 53 files changed, 1279 insertions(+), 501 deletions(-) + create mode 100644 arch/powerpc/lib/checksum_wrappers_64.c +$ git am -3 ../patches/0001-powerpc-define-a-compat_sys_recv-cond_syscall.patch +Applying: powerpc: define a compat_sys_recv cond_syscall +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/sys_ni.c +$ git add . +$ git commit -v -a --amend +[master a0b2ff5] Merge remote branch 'powerpc/next' +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Resolved 'arch/powerpc/platforms/85xx/mpc85xx_mds.c' using previous resolution. +Auto-merging arch/powerpc/platforms/85xx/mpc85xx_mds.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c +Auto-merging arch/powerpc/sysdev/fsl_msi.c +Auto-merging arch/powerpc/sysdev/fsl_pci.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97005e7] Merge remote branch 'galak/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/sysdev/fsl_msi.c | 9 +++---- + arch/powerpc/sysdev/fsl_pci.c | 43 ++++++++++++++++++++++++++++++++++++++++- + arch/powerpc/sysdev/fsl_pci.h | 1 + + 3 files changed, 47 insertions(+), 6 deletions(-) +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/pgtable.h | 22 ++++++++++++++-- + arch/s390/mm/init.c | 49 +++++++++++++++++++++++++++++++++--- + drivers/s390/block/dasd_3990_erp.c | 3 ++ + 3 files changed, 67 insertions(+), 7 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 5 +- + arch/sh/boards/Kconfig | 16 + + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-sh2007.c | 133 +++ + arch/sh/boards/board-sh7757lcr.c | 374 +++++++ + arch/sh/configs/sh2007_defconfig | 213 ++++ + arch/sh/configs/sh7757lcr_defconfig | 85 ++ + arch/sh/drivers/dma/dma-api.c | 4 +- + arch/sh/drivers/pci/ops-sh7786.c | 27 +- + arch/sh/drivers/pci/pci-sh7751.c | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 32 +- + arch/sh/include/asm/Kbuild | 2 + + arch/sh/include/asm/elf.h | 27 +- + arch/sh/include/asm/fixmap.h | 4 +- + arch/sh/include/asm/irq.h | 2 +- + arch/sh/include/asm/kprobes.h | 1 - + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/include/asm/processor_64.h | 3 - + arch/sh/include/asm/ptrace.h | 169 ++-- + arch/sh/include/asm/ptrace_32.h | 83 ++ + arch/sh/include/asm/ptrace_64.h | 20 + + arch/sh/include/asm/syscalls_32.h | 7 +- + arch/sh/include/asm/system_32.h | 13 +- + arch/sh/include/asm/tlbflush.h | 2 + + arch/sh/include/asm/unistd_32.h | 5 +- + arch/sh/include/asm/unistd_64.h | 5 +- + arch/sh/include/cpu-sh4/cpu/sh7757.h | 301 +++--- + arch/sh/include/mach-common/mach/sh2007.h | 117 +++ + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/cpu/sh4/probe.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 199 ++-- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 1582 +++++++++++++++++------------ + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 66 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 +++-- + arch/sh/kernel/kprobes.c | 100 +- + arch/sh/kernel/ptrace.c | 33 + + arch/sh/kernel/ptrace_32.c | 27 + + arch/sh/kernel/ptrace_64.c | 79 ++ + arch/sh/kernel/reboot.c | 4 + + arch/sh/kernel/syscalls_32.S | 3 + + arch/sh/kernel/syscalls_64.S | 3 + + arch/sh/mm/consistent.c | 3 +- + arch/sh/mm/init.c | 52 +- + arch/sh/mm/nommu.c | 4 + + arch/sh/mm/tlbflush_32.c | 16 + + arch/sh/mm/tlbflush_64.c | 5 + + arch/sh/tools/mach-types | 2 + + drivers/Makefile | 2 +- + drivers/clocksource/sh_cmt.c | 12 +- + drivers/i2c/busses/i2c-sh_mobile.c | 23 +- + drivers/serial/sh-sci.h | 17 +- + drivers/sh/clk.c | 9 +- + sound/soc/sh/siu_pcm.c | 2 + + 54 files changed, 2919 insertions(+), 1209 deletions(-) + create mode 100644 arch/sh/boards/board-sh2007.c + create mode 100644 arch/sh/boards/board-sh7757lcr.c + create mode 100644 arch/sh/configs/sh2007_defconfig + create mode 100644 arch/sh/configs/sh7757lcr_defconfig + create mode 100644 arch/sh/include/asm/ptrace_32.h + create mode 100644 arch/sh/include/asm/ptrace_64.h + create mode 100644 arch/sh/include/mach-common/mach/sh2007.h + create mode 100644 arch/sh/kernel/ptrace.c +Merging genesis/master +$ git merge genesis/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cb951fe] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/Kconfig | 1 + + fs/cifs/asn1.c | 6 +++--- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/quota/Kconfig | 4 ++-- + fs/xfs/Kconfig | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/Kconfig | 2 +- + fs/gfs2/aops.c | 20 ++--- + fs/gfs2/bmap.c | 255 +++++++++++++++++++++----------------------- + fs/gfs2/bmap.h | 20 ++-- + fs/gfs2/dir.c | 28 +++--- + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 15 ++- + fs/gfs2/glops.c | 5 +- + fs/gfs2/incore.h | 3 +- + fs/gfs2/inode.c | 9 +- + fs/gfs2/inode.h | 15 +++ + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/ops_inode.c | 290 ++++++++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/quota.c | 13 +-- + fs/gfs2/rgrp.c | 28 ++++- + fs/gfs2/super.c | 11 +- + fs/gfs2/trace_gfs2.h | 3 +- + fs/gfs2/trans.h | 1 + + 18 files changed, 489 insertions(+), 233 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 87a4db4] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/gcinode.c | 136 ++++++++------------------------------------ + fs/nilfs2/inode.c | 64 ++++++++++++++++++++- + fs/nilfs2/ioctl.c | 17 +++-- + fs/nilfs2/mdt.c | 46 +++++++++------ + fs/nilfs2/mdt.h | 4 +- + fs/nilfs2/nilfs.h | 9 +-- + fs/nilfs2/segment.c | 32 +++++------ + fs/nilfs2/segment.h | 3 +- + fs/nilfs2/super.c | 7 ++ + fs/nilfs2/the_nilfs.c | 13 +--- + fs/nilfs2/the_nilfs.h | 7 +-- + include/linux/nilfs2_fs.h | 9 +++ + 12 files changed, 168 insertions(+), 179 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/jbd2/journal.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging include/linux/fs.h +Merge made by recursive. + fs/ext3/super.c | 4 +- + fs/ext4/super.c | 8 +- + fs/jbd2/journal.c | 4 + + fs/libfs.c | 29 ++++ + fs/ocfs2/aops.c | 9 +- + fs/ocfs2/aops.h | 3 +- + fs/ocfs2/blockcheck.c | 4 +- + fs/ocfs2/file.c | 49 +++---- + fs/ocfs2/inode.c | 6 +- + fs/ocfs2/inode.h | 11 +- + fs/ocfs2/ioctl.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/journal.c | 9 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/mmap.c | 7 +- + fs/ocfs2/ocfs2.h | 23 ++- + fs/ocfs2/ocfs2_ioctl.h | 95 +++++++++++++ + fs/ocfs2/refcounttree.c | 43 ++++++- + fs/ocfs2/refcounttree.h | 7 +- + fs/ocfs2/super.c | 51 ++++++- + include/linux/fs.h | 2 + + 20 files changed, 645 insertions(+), 78 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + fs/9p/fid.c | 3 +- + fs/9p/vfs_addr.c | 30 +++++++++++++++++++++++++++ + fs/9p/vfs_dir.c | 9 +++++-- + fs/9p/vfs_file.c | 29 +++++++++++++++++--------- + fs/9p/vfs_inode.c | 24 ++++++++------------- + fs/9p/vfs_super.c | 20 ++++++++++++----- + include/net/9p/9p.h | 4 +++ + net/9p/client.c | 56 +++++++++++++++++++++++++++++++++++--------------- + 8 files changed, 123 insertions(+), 52 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + fs/ubifs/debug.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ubifs/debug.h | 4 ++ + fs/ubifs/gc.c | 79 ++++++++++++++++++++------- + fs/ubifs/io.c | 3 +- + fs/ubifs/key.h | 14 +++++ + fs/ubifs/scan.c | 6 ++- + fs/ubifs/tnc.c | 5 ++- + fs/ubifs/ubifs.h | 6 ++- + 8 files changed, 248 insertions(+), 25 deletions(-) +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_buf.c | 8 +------- + fs/xfs/linux-2.6/xfs_buf.h | 1 - + fs/xfs/linux-2.6/xfs_fs_subr.c | 31 +++++++++++++++---------------- + fs/xfs/linux-2.6/xfs_ioctl.c | 10 +++++++++- + fs/xfs/linux-2.6/xfs_ioctl32.c | 1 + + fs/xfs/linux-2.6/xfs_iops.c | 2 +- + fs/xfs/xfs_bmap.c | 26 ++++++++++++++++++++++---- + fs/xfs/xfs_bmap.h | 9 ++++++--- + fs/xfs/xfs_fs.h | 5 ++++- + fs/xfs/xfs_vnodeops.c | 23 ++++++++++++++++++----- + 10 files changed, 77 insertions(+), 39 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + drivers/pci/pci.c | 2 +- + drivers/pci/pcie/aer/aerdrv_core.c | 2 +- + drivers/pci/proc.c | 4 +--- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + .../ABI/testing/sysfs-driver-hid-roccat-pyra | 98 ++ + Documentation/input/ntrig.txt | 126 +++ + drivers/hid/Kconfig | 79 +- + drivers/hid/Makefile | 3 + + drivers/hid/hid-apple.c | 7 +- + drivers/hid/hid-cherry.c | 7 +- + drivers/hid/hid-core.c | 18 +- + drivers/hid/hid-cypress.c | 9 +- + drivers/hid/hid-elecom.c | 7 +- + drivers/hid/hid-ids.h | 13 + + drivers/hid/hid-input.c | 4 + + drivers/hid/hid-kye.c | 7 +- + drivers/hid/hid-lg.c | 9 +- + drivers/hid/hid-magicmouse.c | 250 ++++-- + drivers/hid/hid-microsoft.c | 7 +- + drivers/hid/hid-monterey.c | 7 +- + drivers/hid/hid-ntrig.c | 18 +- + drivers/hid/hid-ortek.c | 7 +- + drivers/hid/hid-petalynx.c | 7 +- + drivers/hid/hid-prodikeys.c | 7 +- + drivers/hid/hid-roccat-pyra.c | 968 ++++++++++++++++++++ + drivers/hid/hid-roccat-pyra.h | 186 ++++ + drivers/hid/hid-samsung.c | 20 +- + drivers/hid/hid-sony.c | 35 +- + drivers/hid/hid-sunplus.c | 7 +- + drivers/hid/hid-topseed.c | 1 + + drivers/hid/hid-uclogic.c | 623 +++++++++++++ + drivers/hid/hid-waltop.c | 891 ++++++++++++++++++ + drivers/hid/hid-zydacron.c | 7 +- + drivers/hid/usbhid/hid-core.c | 3 +- + drivers/hid/usbhid/hid-quirks.c | 8 + + include/linux/hid.h | 4 +- + 32 files changed, 3249 insertions(+), 194 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra + create mode 100644 Documentation/input/ntrig.txt + create mode 100644 drivers/hid/hid-roccat-pyra.c + create mode 100644 drivers/hid/hid-roccat-pyra.h + create mode 100644 drivers/hid/hid-uclogic.c + create mode 100644 drivers/hid/hid-waltop.c +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/i2c-core.c | 36 ++++++++++++++++---------------- + drivers/i2c/i2c-dev.c | 13 +++++------ + drivers/misc/bh1780gli.c | 1 - + drivers/regulator/ad5398.c | 1 - + drivers/regulator/isl6271a-regulator.c | 2 - + drivers/rtc/rtc-ds3232.c | 2 - + include/linux/i2c.h | 12 +++++++--- + 7 files changed, 32 insertions(+), 35 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwmon/sysfs-interface | 7 +++ + MAINTAINERS | 4 +- + drivers/hwmon/f75375s.c | 6 +- + drivers/hwmon/k8temp.c | 51 ++++++++++------------- + drivers/hwmon/lis3lv02d_i2c.c | 4 +- + drivers/hwmon/lis3lv02d_spi.c | 4 +- + drivers/hwmon/lm75.c | 51 +++++++++++++---------- + drivers/hwmon/lm90.c | 76 +++++++++++++++++++++++----------- + 8 files changed, 119 insertions(+), 84 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/kernel-doc-nano-HOWTO.txt | 5 + + scripts/basic/docproc.c | 129 ++++++++++++++++++++++++++++++- + scripts/kernel-doc | 54 ++++++++++++- + 3 files changed, 184 insertions(+), 4 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'drivers/media/IR/ir-raw-event.c' using previous resolution. +Resolved 'drivers/media/video/s5p-fimc/fimc-core.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/media/IR/ir-raw-event.c +CONFLICT (content): Merge conflict in drivers/media/IR/ir-raw-event.c +Auto-merging drivers/media/video/cx23885/cx23885-i2c.c +Auto-merging drivers/media/video/cx88/Kconfig +Auto-merging drivers/media/video/ivtv/ivtv-driver.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtv-i2c.c +Auto-merging drivers/media/video/s5p-fimc/fimc-core.c +CONFLICT (add/add): Merge conflict in drivers/media/video/s5p-fimc/fimc-core.c +Auto-merging drivers/media/video/v4l2-common.c +Auto-merging drivers/media/video/v4l2-dev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 92e4c1d] Merge remote branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/IR/ir-raw-event.c | 4 +++- + drivers/media/dvb/dvb-usb/opera1.c | 4 +--- + drivers/media/video/cx88/Kconfig | 2 +- + drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 6 +++--- + drivers/media/video/s5p-fimc/fimc-core.c | 3 ++- + drivers/media/video/saa7134/saa7134-cards.c | 10 +++++----- + drivers/media/video/saa7164/saa7164-buffer.c | 5 +++-- + drivers/staging/tm6000/Kconfig | 2 +- + 8 files changed, 19 insertions(+), 17 deletions(-) +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + .../{ => api}/alloc/drop_kmalloc_cast.cocci | 0 + .../{ => api}/alloc/kzalloc-simple.cocci | 6 +- + scripts/coccinelle/{ => api}/err_cast.cocci | 0 + scripts/coccinelle/api/kstrdup.cocci | 39 ++ + scripts/coccinelle/api/memdup.cocci | 40 +++ + scripts/coccinelle/api/memdup_user.cocci | 35 ++ + scripts/coccinelle/{ => api}/resource_size.cocci | 0 + scripts/coccinelle/free/kfree.cocci | 116 +++++++ + scripts/coccinelle/iterators/fen.cocci | 64 ++++ + scripts/coccinelle/iterators/itnull.cocci | 58 +++ + .../coccinelle/iterators/list_entry_update.cocci | 62 ++++ + scripts/coccinelle/locks/call_kern.cocci | 74 ++++ + scripts/coccinelle/locks/double_lock.cocci | 92 +++++ + scripts/coccinelle/locks/mini_lock.cocci | 95 +++++ + scripts/coccinelle/misc/doubleinit.cocci | 53 +++ + scripts/coccinelle/misc/ifcol.cocci | 48 +++ + scripts/coccinelle/{ => null}/deref_null.cocci | 0 + scripts/coccinelle/null/eno.cocci | 20 + + scripts/coccinelle/null/kmerr.cocci | 72 ++++ + scripts/kconfig/Makefile | 87 +++-- + scripts/kconfig/conf.c | 2 +- + scripts/kconfig/confdata.c | 1 + + scripts/kconfig/nconf.c | 365 +++++++++++--------- + scripts/kconfig/nconf.gui.c | 22 +- + scripts/kconfig/nconf.h | 3 +- + scripts/kconfig/qconf.cc | 162 +++++---- + scripts/kconfig/qconf.h | 76 ++--- + scripts/mod/modpost.c | 5 +- + 28 files changed, 1261 insertions(+), 336 deletions(-) + rename scripts/coccinelle/{ => api}/alloc/drop_kmalloc_cast.cocci (100%) + rename scripts/coccinelle/{ => api}/alloc/kzalloc-simple.cocci (87%) + rename scripts/coccinelle/{ => api}/err_cast.cocci (100%) + create mode 100644 scripts/coccinelle/api/kstrdup.cocci + create mode 100644 scripts/coccinelle/api/memdup.cocci + create mode 100644 scripts/coccinelle/api/memdup_user.cocci + rename scripts/coccinelle/{ => api}/resource_size.cocci (100%) + create mode 100644 scripts/coccinelle/free/kfree.cocci + create mode 100644 scripts/coccinelle/iterators/fen.cocci + create mode 100644 scripts/coccinelle/iterators/itnull.cocci + create mode 100644 scripts/coccinelle/iterators/list_entry_update.cocci + create mode 100644 scripts/coccinelle/locks/call_kern.cocci + create mode 100644 scripts/coccinelle/locks/double_lock.cocci + create mode 100644 scripts/coccinelle/locks/mini_lock.cocci + create mode 100644 scripts/coccinelle/misc/doubleinit.cocci + create mode 100644 scripts/coccinelle/misc/ifcol.cocci + rename scripts/coccinelle/{ => null}/deref_null.cocci (100%) + create mode 100644 scripts/coccinelle/null/eno.cocci + create mode 100644 scripts/coccinelle/null/kmerr.cocci +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + Documentation/ABI/testing/sysfs-ata | 99 +++++ + drivers/ata/Makefile | 2 +- + drivers/ata/libahci.c | 2 +- + drivers/ata/libata-core.c | 62 +++- + drivers/ata/libata-eh.c | 35 +- + drivers/ata/libata-pmp.c | 18 +- + drivers/ata/libata-scsi.c | 117 +++--- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/libata-transport.c | 774 +++++++++++++++++++++++++++++++++++ + drivers/ata/libata-transport.h | 18 + + drivers/ata/libata.h | 7 + + drivers/ata/pata_artop.c | 3 +- + drivers/ata/sata_fsl.c | 8 +- + drivers/ata/sata_mv.c | 25 +- + drivers/ata/sata_nv.c | 57 +-- + include/linux/ata.h | 46 ++- + include/linux/libata.h | 5 + + 17 files changed, 1135 insertions(+), 145 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-ata + create mode 100644 drivers/ata/libata-transport.c + create mode 100644 drivers/ata/libata-transport.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 4 ++-- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 6 +++--- + drivers/infiniband/hw/nes/nes_verbs.c | 12 ++++++------ + 7 files changed, 15 insertions(+), 15 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/battery.c | 1 - + drivers/acpi/sysfs.c | 20 ++++++++++++++------ + drivers/acpi/video_detect.c | 4 ++-- + 3 files changed, 16 insertions(+), 9 deletions(-) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/Kconfig.debug | 2 +- + drivers/mtd/ubi/cdev.c | 12 ++++++------ + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/wl.c | 3 ++- + 4 files changed, 10 insertions(+), 9 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/kernel/head_64.S +Auto-merging arch/powerpc/kvm/book3s_paired_singles.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 2 + + Documentation/kvm/api.txt | 56 +- + Documentation/kvm/ppc-pv.txt | 196 +++ + Documentation/kvm/timekeeping.txt | 612 ++++++++ + arch/ia64/kvm/lapic.h | 1 + + arch/powerpc/include/asm/kvm.h | 1 + + arch/powerpc/include/asm/kvm_asm.h | 4 +- + arch/powerpc/include/asm/kvm_book3s.h | 31 +- + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_para.h | 139 ++- + arch/powerpc/include/asm/kvm_ppc.h | 1 + + arch/powerpc/kernel/Makefile | 2 + + arch/powerpc/kernel/asm-offsets.c | 25 +- + arch/powerpc/kernel/exceptions-64s.S | 6 + + arch/powerpc/kernel/head_64.S | 6 - + arch/powerpc/kernel/kvm.c | 596 ++++++++ + arch/powerpc/kernel/kvm_emul.S | 302 ++++ + arch/powerpc/kvm/44x.c | 10 +- + arch/powerpc/kvm/44x_tlb.c | 9 +- + arch/powerpc/kvm/book3s.c | 272 +++-- + arch/powerpc/kvm/book3s_32_mmu.c | 111 +- + arch/powerpc/kvm/book3s_32_mmu_host.c | 75 +- + arch/powerpc/kvm/book3s_64_mmu.c | 42 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 74 +- + arch/powerpc/kvm/book3s_emulate.c | 73 +- + arch/powerpc/kvm/book3s_mmu_hpte.c | 140 ++- + arch/powerpc/kvm/book3s_paired_singles.c | 11 +- + arch/powerpc/kvm/book3s_rmhandlers.S | 32 +- + arch/powerpc/kvm/booke.c | 108 +- + arch/powerpc/kvm/booke.h | 10 +- + arch/powerpc/kvm/booke_emulate.c | 14 +- + arch/powerpc/kvm/booke_interrupts.S | 3 +- + arch/powerpc/kvm/e500.c | 7 + + arch/powerpc/kvm/e500_tlb.c | 18 +- + arch/powerpc/kvm/e500_tlb.h | 2 +- + arch/powerpc/kvm/emulate.c | 36 +- + arch/powerpc/kvm/powerpc.c | 88 ++- + arch/powerpc/kvm/trace.h | 239 ++++ + arch/powerpc/platforms/Kconfig | 10 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/kvm_virtio.h | 7 + + arch/x86/include/asm/kvm_emulate.h | 31 +- + arch/x86/include/asm/kvm_host.h | 18 +- + arch/x86/include/asm/kvm_para.h | 6 + + arch/x86/include/asm/pvclock.h | 38 + + arch/x86/kernel/pvclock.c | 3 +- + arch/x86/kvm/Kconfig | 7 + + arch/x86/kvm/emulate.c | 2238 ++++++++++++++++++------------ + arch/x86/kvm/i8254.c | 9 - + arch/x86/kvm/i8259.c | 19 +- + arch/x86/kvm/irq.c | 7 +- + arch/x86/kvm/irq.h | 2 +- + arch/x86/kvm/mmu.c | 561 +++----- + arch/x86/kvm/mmu.h | 8 +- + arch/x86/kvm/mmu_audit.c | 296 ++++ + arch/x86/kvm/mmutrace.h | 19 + + arch/x86/kvm/paging_tmpl.h | 85 ++- + arch/x86/kvm/svm.c | 96 +- + arch/x86/kvm/vmx.c | 59 +- + arch/x86/kvm/x86.c | 443 +++++-- + arch/x86/kvm/x86.h | 2 + + drivers/s390/kvm/kvm_virtio.c | 66 +- + include/linux/kvm.h | 12 + + include/linux/kvm_host.h | 11 + + include/linux/kvm_para.h | 7 +- + mm/util.c | 13 + + virt/kvm/kvm_main.c | 83 +- + 67 files changed, 5597 insertions(+), 1935 deletions(-) + create mode 100644 Documentation/kvm/ppc-pv.txt + create mode 100644 Documentation/kvm/timekeeping.txt + create mode 100644 arch/powerpc/kernel/kvm.c + create mode 100644 arch/powerpc/kernel/kvm_emul.S + create mode 100644 arch/x86/kvm/mmu_audit.c +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/lock.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Removing drivers/scsi/cxgb3i/Kbuild +Removing drivers/scsi/cxgb3i/cxgb3i.h +Removing drivers/scsi/cxgb3i/cxgb3i_ddp.c +Removing drivers/scsi/cxgb3i/cxgb3i_ddp.h +Removing drivers/scsi/cxgb3i/cxgb3i_init.c +Removing drivers/scsi/cxgb3i/cxgb3i_iscsi.c +Removing drivers/scsi/cxgb3i/cxgb3i_offload.c +Removing drivers/scsi/cxgb3i/cxgb3i_offload.h +Removing drivers/scsi/cxgb3i/cxgb3i_pdu.c +Removing drivers/scsi/cxgb3i/cxgb3i_pdu.h +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_mbx.c +Auto-merging drivers/scsi/qla2xxx/qla_nx.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/sd.c +Merge made by recursive. + drivers/message/fusion/mptbase.c | 4 +- + drivers/scsi/Kconfig | 2 +- + drivers/scsi/Makefile | 3 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 4 +- + drivers/scsi/bnx2i/bnx2i.h | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 63 +- + drivers/scsi/bnx2i/bnx2i_init.c | 62 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 15 +- + drivers/scsi/cxgb3i/Kbuild | 4 - + drivers/scsi/cxgb3i/cxgb3i.h | 161 -- + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 773 --------- + drivers/scsi/cxgb3i/cxgb3i_ddp.h | 312 ---- + drivers/scsi/cxgb3i/cxgb3i_init.c | 132 -- + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 1018 ------------ + drivers/scsi/cxgb3i/cxgb3i_offload.c | 1944 ----------------------- + drivers/scsi/cxgb3i/cxgb3i_offload.h | 243 --- + drivers/scsi/cxgb3i/cxgb3i_pdu.c | 495 ------ + drivers/scsi/cxgb3i/cxgb3i_pdu.h | 59 - + drivers/scsi/cxgbi/Kconfig | 2 + + drivers/scsi/cxgbi/Makefile | 2 + + drivers/scsi/cxgbi/cxgb3i/Kbuild | 3 + + drivers/scsi/{ => cxgbi}/cxgb3i/Kconfig | 4 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1432 +++++++++++++++++ + drivers/scsi/cxgbi/cxgb3i/cxgb3i.h | 51 + + drivers/scsi/cxgbi/cxgb4i/Kbuild | 3 + + drivers/scsi/cxgbi/cxgb4i/Kconfig | 7 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1600 +++++++++++++++++++ + drivers/scsi/cxgbi/cxgb4i/cxgb4i.h | 38 + + drivers/scsi/cxgbi/libcxgbi.c | 2610 +++++++++++++++++++++++++++++++ + drivers/scsi/cxgbi/libcxgbi.h | 753 +++++++++ + drivers/scsi/fnic/fnic_main.c | 14 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 10 +- + drivers/scsi/ipr.c | 43 +- + drivers/scsi/ipr.h | 8 +- + drivers/scsi/lpfc/lpfc_attr.c | 10 + + drivers/scsi/lpfc/lpfc_scsi.c | 10 - + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 39 +- + drivers/scsi/qla2xxx/qla_bsg.c | 7 +- + drivers/scsi/qla2xxx/qla_def.h | 8 + + drivers/scsi/qla2xxx/qla_gbl.h | 15 +- + drivers/scsi/qla2xxx/qla_init.c | 54 +- + drivers/scsi/qla2xxx/qla_isr.c | 8 +- + drivers/scsi/qla2xxx/qla_mbx.c | 66 +- + drivers/scsi/qla2xxx/qla_nx.c | 392 +++--- + drivers/scsi/qla2xxx/qla_nx.h | 5 + + drivers/scsi/qla2xxx/qla_os.c | 156 ++- + drivers/scsi/scsi_transport_fc.c | 6 +- + drivers/scsi/sd.c | 4 +- + drivers/scsi/sd.h | 1 + + include/scsi/scsi_transport_fc.h | 4 + + 52 files changed, 7192 insertions(+), 5481 deletions(-) + delete mode 100644 drivers/scsi/cxgb3i/Kbuild + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i.h + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.h + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_init.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_iscsi.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.h + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.h + create mode 100644 drivers/scsi/cxgbi/Kconfig + create mode 100644 drivers/scsi/cxgbi/Makefile + create mode 100644 drivers/scsi/cxgbi/cxgb3i/Kbuild + rename drivers/scsi/{ => cxgbi}/cxgb3i/Kconfig (50%) + create mode 100644 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c + create mode 100644 drivers/scsi/cxgbi/cxgb3i/cxgb3i.h + create mode 100644 drivers/scsi/cxgbi/cxgb4i/Kbuild + create mode 100644 drivers/scsi/cxgbi/cxgb4i/Kconfig + create mode 100644 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c + create mode 100644 drivers/scsi/cxgbi/cxgb4i/cxgb4i.h + create mode 100644 drivers/scsi/cxgbi/libcxgbi.c + create mode 100644 drivers/scsi/cxgbi/libcxgbi.h +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/shdma.c +Merge made by recursive. + drivers/dma/Kconfig | 8 + + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 2025 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/dma/shdma.c | 3 +- + include/linux/amba/pl08x.h | 184 ++++ + include/linux/dmaengine.h | 2 +- + 6 files changed, 2221 insertions(+), 2 deletions(-) + create mode 100644 drivers/dma/amba-pl08x.c + create mode 100644 include/linux/amba/pl08x.h +Merging net/master +$ git merge net/master +Removing Documentation/DocBook/mac80211.tmpl +Auto-merging MAINTAINERS +Auto-merging drivers/firewire/net.c +Auto-merging drivers/net/3c59x.c +Auto-merging drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/pxa168_eth.c +Auto-merging drivers/net/qlcnic/qlcnic_main.c +Auto-merging drivers/net/qlge/qlge_main.c +Auto-merging drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +Auto-merging drivers/net/wireless/p54/txrx.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/net/tcp.h +Auto-merging net/core/skbuff.c +Auto-merging net/ipv4/Kconfig +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/tcp_timer.c +Auto-merging net/mac80211/main.c +Auto-merging net/wireless/core.c +Merge made by recursive. + Documentation/DocBook/80211.tmpl | 496 +++ + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/mac80211.tmpl | 337 -- + Documentation/networking/dccp.txt | 29 +- + Documentation/networking/timestamping.txt | 22 +- + MAINTAINERS | 21 + + drivers/atm/iphase.c | 2 +- + drivers/firewire/net.c | 13 - + drivers/ieee1394/eth1394.c | 16 - + drivers/isdn/hisax/hfc_sx.c | 13 +- + drivers/isdn/mISDN/dsp_cmx.c | 1 + + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/net/3c503.c | 8 +- + drivers/net/3c515.c | 2 +- + drivers/net/3c59x.c | 2 +- + drivers/net/Kconfig | 25 + + drivers/net/Makefile | 2 + + drivers/net/amd8111e.c | 18 +- + drivers/net/amd8111e.h | 1 - + drivers/net/arm/am79c961a.c | 35 +- + drivers/net/arm/am79c961a.h | 1 - + drivers/net/arm/ep93xx_eth.c | 39 +- + drivers/net/arm/ether1.c | 34 +- + drivers/net/arm/ether1.h | 1 - + drivers/net/arm/ether3.c | 33 +- + drivers/net/arm/ether3.h | 1 - + drivers/net/atl1c/atl1c.h | 1 - + drivers/net/atl1c/atl1c_hw.c | 2 +- + drivers/net/atl1c/atl1c_main.c | 6 +- + drivers/net/atl1e/atl1e_main.c | 2 +- + drivers/net/atlx/atl1.c | 2 +- + drivers/net/atlx/atl2.c | 4 +- + drivers/net/atp.c | 2 +- + drivers/net/bcm63xx_enet.c | 62 +- + drivers/net/bcm63xx_enet.h | 1 - + drivers/net/benet/be.h | 14 + + drivers/net/benet/be_ethtool.c | 3 + + drivers/net/benet/be_main.c | 60 +- + drivers/net/bfin_mac.c | 10 +- + drivers/net/bmac.c | 7 - + drivers/net/bna/Makefile | 11 + + drivers/net/bna/bfa_cee.c | 291 ++ + drivers/net/bna/bfa_cee.h | 64 + + drivers/net/bna/bfa_defs.h | 243 ++ + drivers/net/bna/bfa_defs_cna.h | 223 ++ + drivers/net/bna/bfa_defs_mfg_comm.h | 244 ++ + drivers/net/bna/bfa_defs_status.h | 216 ++ + drivers/net/bna/bfa_ioc.c | 1738 ++++++++++ + drivers/net/bna/bfa_ioc.h | 301 ++ + drivers/net/bna/bfa_ioc_ct.c | 392 +++ + drivers/net/bna/bfa_sm.h | 88 + + drivers/net/bna/bfa_wc.h | 69 + + drivers/net/bna/bfi.h | 392 +++ + drivers/net/bna/bfi_cna.h | 199 ++ + drivers/net/bna/bfi_ctreg.h | 637 ++++ + drivers/net/bna/bfi_ll.h | 438 +++ + drivers/net/bna/bna.h | 654 ++++ + drivers/net/bna/bna_ctrl.c | 3624 +++++++++++++++++++++ + drivers/net/bna/bna_hw.h | 1491 +++++++++ + drivers/net/bna/bna_txrx.c | 4209 +++++++++++++++++++++++++ + drivers/net/bna/bna_types.h | 1128 +++++++ + drivers/net/bna/bnad.c | 3269 +++++++++++++++++++ + drivers/net/bna/bnad.h | 334 ++ + drivers/net/bna/bnad_ethtool.c | 1280 ++++++++ + drivers/net/bna/cna.h | 81 + + drivers/net/bna/cna_fwimg.c | 64 + + drivers/net/bnx2.c | 44 +- + drivers/net/bnx2x/bnx2x.h | 4 +- + drivers/net/bnx2x/bnx2x_cmn.c | 20 + + drivers/net/bnx2x/bnx2x_cmn.h | 9 + + drivers/net/bnx2x/bnx2x_link.c | 495 ++-- + drivers/net/bnx2x/bnx2x_main.c | 32 +- + drivers/net/bnx2x/bnx2x_reg.h | 3 + + drivers/net/bnx2x/bnx2x_stats.c | 7 +- + drivers/net/can/mscan/mpc5xxx_can.c | 8 +- + drivers/net/cnic.c | 2 +- + drivers/net/cpmac.c | 37 +- + drivers/net/cxgb4/cxgb4.h | 2 + + drivers/net/cxgb4/cxgb4_main.c | 94 +- + drivers/net/cxgb4/sge.c | 17 +- + drivers/net/cxgb4/t4_hw.h | 1 + + drivers/net/cxgb4/t4fw_api.h | 5 + + drivers/net/declance.c | 2 +- + drivers/net/dl2k.c | 2 +- + drivers/net/e1000/e1000_main.c | 6 +- + drivers/net/e1000e/netdev.c | 4 +- + drivers/net/eepro.c | 8 +- + drivers/net/ehea/ehea_main.c | 10 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 19 +- + drivers/net/enic/vnic_dev.c | 25 +- + drivers/net/enic/vnic_devcmd.h | 12 + + drivers/net/enic/vnic_enet.h | 2 +- + drivers/net/enic/vnic_resource.h | 13 + + drivers/net/enic/vnic_rq.c | 6 +- + drivers/net/enic/vnic_vic.c | 7 +- + drivers/net/enic/vnic_wq.c | 6 +- + drivers/net/epic100.c | 2 +- + drivers/net/ethoc.c | 6 - + drivers/net/fealnx.c | 4 +- + drivers/net/fec_mpc52xx.c | 6 - + drivers/net/forcedeth.c | 6 +- + drivers/net/gianfar.c | 17 +- + drivers/net/greth.c | 4 +- + drivers/net/hamachi.c | 2 +- + drivers/net/hamradio/scc.c | 3 +- + drivers/net/hp.c | 8 +- + drivers/net/hydra.c | 13 +- + drivers/net/igb/igb.h | 2 +- + drivers/net/igb/igb_main.c | 15 +- + drivers/net/ioc3-eth.c | 2 +- + drivers/net/irda/mcs7780.c | 2 +- + drivers/net/irda/via-ircc.c | 3 +- + drivers/net/ixgb/ixgb_main.c | 2 +- + drivers/net/ixgbe/ixgbe.h | 30 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 385 +-- + drivers/net/ixgbe/ixgbe_fcoe.c | 2 +- + drivers/net/ixgbe/ixgbe_main.c | 929 +++--- + drivers/net/ixgbe/ixgbe_type.h | 2 + + drivers/net/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/mac8390.c | 48 +- + drivers/net/macvtap.c | 99 +- + drivers/net/mlx4/Makefile | 2 +- + drivers/net/mlx4/alloc.c | 17 +- + drivers/net/mlx4/en_ethtool.c | 175 +- + drivers/net/mlx4/en_main.c | 24 +- + drivers/net/mlx4/en_netdev.c | 28 +- + drivers/net/mlx4/en_port.c | 32 + + drivers/net/mlx4/en_port.h | 14 + + drivers/net/mlx4/en_rx.c | 102 +- + drivers/net/mlx4/en_selftest.c | 179 ++ + drivers/net/mlx4/en_tx.c | 20 + + drivers/net/mlx4/eq.c | 44 + + drivers/net/mlx4/fw.c | 15 + + drivers/net/mlx4/fw.h | 6 + + drivers/net/mlx4/main.c | 6 + + drivers/net/mlx4/mlx4_en.h | 37 +- + drivers/net/mlx4/profile.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/natsemi.c | 2 +- + drivers/net/niu.c | 4 +- + drivers/net/ns83820.c | 25 +- + drivers/net/pasemi_mac_ethtool.c | 16 - + drivers/net/pci-skeleton.c | 2 +- + drivers/net/pcmcia/3c574_cs.c | 88 +- + drivers/net/pcmcia/3c589_cs.c | 15 +- + drivers/net/pcmcia/axnet_cs.c | 187 +- + drivers/net/pcmcia/com20020_cs.c | 32 +- + drivers/net/pcmcia/fmvj18x_cs.c | 60 +- + drivers/net/pcmcia/ibmtr_cs.c | 26 +- + drivers/net/pcmcia/nmclan_cs.c | 54 +- + drivers/net/pcmcia/pcnet_cs.c | 116 +- + drivers/net/pcmcia/smc91c92_cs.c | 103 +- + drivers/net/pcmcia/xirc2ps_cs.c | 104 +- + drivers/net/plip.c | 1 - + drivers/net/pptp.c | 726 +++++ + drivers/net/pxa168_eth.c | 2 - + drivers/net/qlcnic/qlcnic.h | 107 +- + drivers/net/qlcnic/qlcnic_ctx.c | 267 ++- + drivers/net/qlcnic/qlcnic_ethtool.c | 75 +- + drivers/net/qlcnic/qlcnic_hdr.h | 23 +- + drivers/net/qlcnic/qlcnic_hw.c | 77 +- + drivers/net/qlcnic/qlcnic_init.c | 269 +- + drivers/net/qlcnic/qlcnic_main.c | 1112 +++++-- + drivers/net/qlge/qlge_main.c | 28 +- + drivers/net/r6040.c | 67 +- + drivers/net/rrunner.c | 2 +- + drivers/net/s2io.c | 33 +- + drivers/net/s2io.h | 9 - + drivers/net/sc92031.c | 11 - + drivers/net/sh_eth.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/skge.c | 5 +- + drivers/net/slip.c | 91 +- + drivers/net/slip.h | 9 - + drivers/net/starfire.c | 10 +- + drivers/net/stmmac/Kconfig | 5 +- + drivers/net/stmmac/common.h | 50 +- + drivers/net/stmmac/dwmac1000_core.c | 20 +- + drivers/net/stmmac/dwmac1000_dma.c | 8 +- + drivers/net/stmmac/dwmac100_core.c | 22 +- + drivers/net/stmmac/dwmac100_dma.c | 8 +- + drivers/net/stmmac/dwmac_dma.h | 16 +- + drivers/net/stmmac/dwmac_lib.c | 22 +- + drivers/net/stmmac/enh_desc.c | 2 +- + drivers/net/stmmac/norm_desc.c | 2 +- + drivers/net/stmmac/stmmac.h | 4 +- + drivers/net/stmmac/stmmac_ethtool.c | 21 +- + drivers/net/stmmac/stmmac_main.c | 131 +- + drivers/net/stmmac/stmmac_mdio.c | 21 +- + drivers/net/sunbmac.c | 2 +- + drivers/net/sundance.c | 2 +- + drivers/net/sungem.c | 211 +- + drivers/net/sungem_phy.c | 3 +- + drivers/net/sunhme.c | 8 +- + drivers/net/sunlance.c | 2 +- + drivers/net/sunvnet.c | 50 +- + drivers/net/tehuti.c | 29 +- + drivers/net/tehuti.h | 1 - + drivers/net/tlan.c | 8 +- + drivers/net/tokenring/tms380tr.c | 6 +- + drivers/net/tulip/dmfe.c | 2 +- + drivers/net/tulip/uli526x.c | 2 +- + drivers/net/tulip/winbond-840.c | 2 +- + drivers/net/tulip/xircom_cb.c | 15 - + drivers/net/typhoon.c | 46 +- + drivers/net/usb/hso.c | 9 - + drivers/net/usb/kaweth.c | 9 - + drivers/net/virtio_net.c | 14 - + drivers/net/vxge/vxge-main.c | 32 +- + drivers/net/vxge/vxge-main.h | 1 - + drivers/net/wan/c101.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/n2.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wd.c | 8 +- + drivers/net/wireless/airo.c | 5 +- + drivers/net/wireless/at76c50x-usb.c | 7 +- + drivers/net/wireless/ath/ar9170/main.c | 31 +- + drivers/net/wireless/ath/ath5k/ani.c | 6 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 7 +- + drivers/net/wireless/ath/ath5k/attach.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 90 +- + drivers/net/wireless/ath/ath5k/dma.c | 4 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 32 +- + drivers/net/wireless/ath/ath5k/phy.c | 15 +- + drivers/net/wireless/ath/ath5k/reg.h | 2 +- + drivers/net/wireless/ath/ath5k/reset.c | 24 +- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 4 +- + drivers/net/wireless/ath/ath9k/Makefile | 3 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 9 +- + drivers/net/wireless/ath/ath9k/beacon.c | 7 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 7 + + drivers/net/wireless/ath/ath9k/calib.c | 109 +- + drivers/net/wireless/ath/ath9k/calib.h | 1 + + drivers/net/wireless/ath/ath9k/common.c | 67 +- + drivers/net/wireless/ath/ath9k/common.h | 10 + + drivers/net/wireless/ath/ath9k/gpio.c | 40 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 3 +- + drivers/net/wireless/ath/ath9k/htc.h | 42 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 134 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 42 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 17 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 4 +- + drivers/net/wireless/ath/ath9k/htc_hst.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 19 +- + drivers/net/wireless/ath/ath9k/wmi.c | 2 + + drivers/net/wireless/ath/ath9k/wmi.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 18 +- + drivers/net/wireless/ath/debug.h | 2 + + drivers/net/wireless/b43/main.c | 30 +- + drivers/net/wireless/b43/phy_n.c | 62 +- + drivers/net/wireless/b43legacy/main.c | 5 + + drivers/net/wireless/hostap/hostap_ioctl.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 10 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 12 +- + drivers/net/wireless/iwlwifi/Kconfig | 10 + + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 5 + + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 21 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 42 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 696 ++++ + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 129 + + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 141 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 50 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 154 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 29 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 638 +---- + drivers/net/wireless/iwlwifi/iwl-power.h | 93 - + drivers/net/wireless/iwlwifi/iwl-scan.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 24 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 9 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 69 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 7 +- + drivers/net/wireless/libertas/cfg.c | 62 +- + drivers/net/wireless/libertas/decl.h | 13 + + drivers/net/wireless/libertas/if_cs.c | 130 +- + drivers/net/wireless/libertas/if_sdio.c | 161 +- + drivers/net/wireless/libertas/if_sdio.h | 4 - + drivers/net/wireless/libertas/if_spi.c | 150 +- + drivers/net/wireless/libertas/if_spi.h | 5 - + drivers/net/wireless/libertas/if_usb.c | 60 +- + drivers/net/wireless/libertas/if_usb.h | 1 + + drivers/net/wireless/libertas/main.c | 105 + + drivers/net/wireless/libertas_tf/if_usb.c | 57 +- + drivers/net/wireless/mac80211_hwsim.c | 7 +- + drivers/net/wireless/p54/Kconfig | 1 + + drivers/net/wireless/p54/eeprom.c | 21 +- + drivers/net/wireless/p54/fwio.c | 6 +- + drivers/net/wireless/p54/main.c | 9 +- + drivers/net/wireless/p54/p54spi_eeprom.h | 2 +- + drivers/net/wireless/p54/txrx.c | 17 +- + drivers/net/wireless/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/ray_cs.c | 28 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 6 +- + drivers/net/wireless/rt2x00/rt2800.h | 27 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 132 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 15 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 119 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 54 +- + drivers/net/wireless/rt2x00/rt2x00.h | 16 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 17 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 63 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 3 + + drivers/net/wireless/rt2x00/rt2x00ht.c | 10 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 8 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 135 +- + drivers/net/wireless/rt2x00/rt61pci.c | 12 +- + drivers/net/wireless/rt2x00/rt73usb.c | 6 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 143 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 9 +- + drivers/net/wireless/wl12xx/wl1251_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_acx.h | 8 +- + drivers/net/wireless/wl12xx/wl1251_boot.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_cmd.h | 6 +- + drivers/net/wireless/wl12xx/wl1251_event.c | 29 + + drivers/net/wireless/wl12xx/wl1251_event.h | 1 + + drivers/net/wireless/wl12xx/wl1251_main.c | 37 +- + drivers/net/wireless/wl12xx/wl1251_tx.c | 4 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 13 +- + drivers/net/wireless/wl12xx/wl1271_scan.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 4 +- + drivers/net/wireless/wl3501_cs.c | 11 - + drivers/net/wireless/zd1211rw/zd_chip.c | 5 + + drivers/net/xen-netfront.c | 8 +- + drivers/net/xilinx_emaclite.c | 13 + + drivers/net/yellowfin.c | 2 +- + include/linux/etherdevice.h | 18 +- + include/linux/if.h | 2 + + include/linux/if_ether.h | 2 - + include/linux/if_macvlan.h | 9 +- + include/linux/if_pppox.h | 50 +- + include/linux/if_vlan.h | 5 +- + include/linux/in.h | 19 + + include/linux/mlx4/cmd.h | 1 + + include/linux/mlx4/device.h | 7 + + include/linux/netdevice.h | 16 +- + include/linux/nl80211.h | 150 +- + include/linux/pci_ids.h | 3 + + include/linux/pkt_cls.h | 1 + + include/linux/rds.h | 9 - + include/linux/skbuff.h | 57 +- + include/linux/ssb/ssb_regs.h | 1 + + include/linux/stmmac.h | 2 +- + include/linux/tc_act/Kbuild | 1 + + include/linux/tc_act/tc_csum.h | 32 + + include/linux/tc_ematch/tc_em_meta.h | 1 + + include/linux/tcp.h | 1 + + include/net/cfg80211.h | 179 +- + include/net/gre.h | 18 + + include/net/inet_connection_sock.h | 1 + + include/net/ip.h | 2 +- + include/net/irda/irlan_common.h | 1 - + include/net/mac80211.h | 60 +- + include/net/sctp/sctp.h | 48 +- + include/net/sock.h | 8 +- + include/net/tc_act/tc_csum.h | 15 + + include/net/tcp.h | 9 + + net/8021q/vlan_core.c | 14 +- + net/atm/common.c | 2 +- + net/atm/lec.c | 1 - + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 4 +- + net/bridge/br_if.c | 29 +- + net/bridge/br_input.c | 2 +- + net/can/raw.c | 4 +- + net/core/dev.c | 154 +- + net/core/ethtool.c | 34 +- + net/core/net-sysfs.c | 5 +- + net/core/pktgen.c | 2 - + net/core/rtnetlink.c | 31 +- + net/core/skbuff.c | 67 +- + net/dccp/ccids/Kconfig | 31 - + net/dccp/ccids/ccid2.c | 287 +-- + net/dccp/ccids/ccid2.h | 35 +- + net/dccp/ccids/ccid3.c | 81 +- + net/dccp/ccids/ccid3.h | 21 +- + net/decnet/dn_nsp_out.c | 8 +- + net/econet/af_econet.c | 2 - + net/ethernet/eth.c | 6 +- + net/ipv4/Kconfig | 7 + + net/ipv4/Makefile | 1 + + net/ipv4/af_inet.c | 8 +- + net/ipv4/gre.c | 151 + + net/ipv4/icmp.c | 4 +- + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/ip_gre.c | 14 +- + net/ipv4/ip_output.c | 15 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 31 +- + net/ipv4/raw.c | 2 +- + net/ipv4/route.c | 9 +- + net/ipv4/tcp.c | 11 +- + net/ipv4/tcp_input.c | 17 +- + net/ipv4/tcp_ipv4.c | 2 - + net/ipv4/tcp_output.c | 23 +- + net/ipv4/tcp_timer.c | 40 +- + net/ipv4/tunnel4.c | 17 +- + net/ipv4/udp.c | 4 +- + net/ipv4/xfrm4_tunnel.c | 4 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_tunnel.c | 4 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/reassembly.c | 2 +- + net/ipv6/sit.c | 2 +- + net/ipv6/tunnel6.c | 15 +- + net/ipv6/xfrm6_tunnel.c | 4 +- + net/irda/irlan/irlan_eth.c | 32 +- + net/mac80211/aes_ccm.c | 6 +- + net/mac80211/aes_cmac.c | 6 +- + net/mac80211/agg-rx.c | 22 + + net/mac80211/cfg.c | 62 +- + net/mac80211/debugfs_key.c | 55 +- + net/mac80211/driver-trace.h | 4 +- + net/mac80211/ht.c | 28 + + net/mac80211/ibss.c | 8 +- + net/mac80211/ieee80211_i.h | 20 +- + net/mac80211/iface.c | 63 +- + net/mac80211/key.c | 59 +- + net/mac80211/key.h | 4 +- + net/mac80211/main.c | 81 +- + net/mac80211/mlme.c | 28 +- + net/mac80211/rc80211_pid_debugfs.c | 2 +- + net/mac80211/rx.c | 503 ++- + net/mac80211/scan.c | 32 +- + net/mac80211/sta_info.h | 16 +- + net/mac80211/status.c | 2 +- + net/mac80211/tx.c | 22 +- + net/mac80211/util.c | 6 +- + net/mac80211/wep.c | 2 +- + net/mac80211/work.c | 39 +- + net/mac80211/wpa.c | 32 +- + net/netfilter/ipvs/ip_vs_core.c | 11 +- + net/netfilter/ipvs/ip_vs_ctl.c | 13 +- + net/netfilter/ipvs/ip_vs_sched.c | 22 +- + net/netfilter/xt_hashlimit.c | 15 +- + net/packet/af_packet.c | 4 +- + net/phonet/pep.c | 8 +- + net/phonet/pn_dev.c | 3 +- + net/phonet/socket.c | 4 +- + net/sched/Kconfig | 10 + + net/sched/Makefile | 1 + + net/sched/act_csum.c | 595 ++++ + net/sched/cls_flow.c | 74 +- + net/sched/em_meta.c | 6 + + net/sched/sch_api.c | 2 +- + net/sched/sch_sfq.c | 33 +- + net/sctp/associola.c | 2 + + net/sctp/chunk.c | 2 + + net/sctp/inqueue.c | 2 + + net/sctp/ipv6.c | 4 +- + net/sctp/objcnt.c | 5 +- + net/sctp/output.c | 2 + + net/sctp/outqueue.c | 34 +- + net/sctp/probe.c | 4 +- + net/sctp/protocol.c | 17 +- + net/sctp/sm_make_chunk.c | 2 + + net/sctp/sm_sideeffect.c | 21 +- + net/sctp/sm_statefuns.c | 20 +- + net/sctp/sm_statetable.c | 42 +- + net/sctp/socket.c | 39 +- + net/sctp/transport.c | 9 +- + net/socket.c | 9 +- + net/tipc/bcast.c | 39 +- + net/tipc/core.c | 6 +- + net/tipc/discover.c | 8 + + net/tipc/link.c | 25 +- + net/tipc/name_table.c | 44 +- + net/tipc/node.c | 22 +- + net/tipc/node.h | 2 + + net/tipc/port.c | 15 +- + net/tipc/socket.c | 81 +- + net/wireless/core.c | 15 +- + net/wireless/core.h | 21 +- + net/wireless/mlme.c | 149 +- + net/wireless/nl80211.c | 123 +- + net/wireless/nl80211.h | 14 +- + net/wireless/reg.c | 16 +- + net/wireless/sysfs.c | 9 + + net/wireless/util.c | 4 +- + 497 files changed, 33282 insertions(+), 7085 deletions(-) + create mode 100644 Documentation/DocBook/80211.tmpl + delete mode 100644 Documentation/DocBook/mac80211.tmpl + create mode 100644 drivers/net/bna/Makefile + create mode 100644 drivers/net/bna/bfa_cee.c + create mode 100644 drivers/net/bna/bfa_cee.h + create mode 100644 drivers/net/bna/bfa_defs.h + create mode 100644 drivers/net/bna/bfa_defs_cna.h + create mode 100644 drivers/net/bna/bfa_defs_mfg_comm.h + create mode 100644 drivers/net/bna/bfa_defs_status.h + create mode 100644 drivers/net/bna/bfa_ioc.c + create mode 100644 drivers/net/bna/bfa_ioc.h + create mode 100644 drivers/net/bna/bfa_ioc_ct.c + create mode 100644 drivers/net/bna/bfa_sm.h + create mode 100644 drivers/net/bna/bfa_wc.h + create mode 100644 drivers/net/bna/bfi.h + create mode 100644 drivers/net/bna/bfi_cna.h + create mode 100644 drivers/net/bna/bfi_ctreg.h + create mode 100644 drivers/net/bna/bfi_ll.h + create mode 100644 drivers/net/bna/bna.h + create mode 100644 drivers/net/bna/bna_ctrl.c + create mode 100644 drivers/net/bna/bna_hw.h + create mode 100644 drivers/net/bna/bna_txrx.c + create mode 100644 drivers/net/bna/bna_types.h + create mode 100644 drivers/net/bna/bnad.c + create mode 100644 drivers/net/bna/bnad.h + create mode 100644 drivers/net/bna/bnad_ethtool.c + create mode 100644 drivers/net/bna/cna.h + create mode 100644 drivers/net/bna/cna_fwimg.c + create mode 100644 drivers/net/mlx4/en_selftest.c + create mode 100644 drivers/net/pptp.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.h + create mode 100644 include/linux/tc_act/tc_csum.h + create mode 100644 include/net/gre.h + create mode 100644 include/net/tc_act/tc_csum.h + create mode 100644 net/ipv4/gre.c + create mode 100644 net/sched/act_csum.c +Merging wireless/master +$ git merge wireless/master +Resolved 'net/mac80211/main.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/b43/phy_n.c +Auto-merging drivers/net/wireless/p54/txrx.c +Auto-merging drivers/net/wireless/rt2x00/rt2400pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2500pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00debug.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/rt2x00/rt73usb.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_scan.c +Auto-merging net/mac80211/main.c +CONFLICT (content): Merge conflict in net/mac80211/main.c +Auto-merging net/mac80211/rate.c +Auto-merging net/wireless/wext-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 18d5148] Merge remote branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 1 - + MAINTAINERS | 8 +- + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath5k/base.c | 4 +- + drivers/net/wireless/ath/ath5k/debug.c | 5 +- + drivers/net/wireless/ath/ath5k/debug.h | 2 + + drivers/net/wireless/ath/ath5k/pcu.c | 4 +- + drivers/net/wireless/ath/ath5k/phy.c | 4 +- + drivers/net/wireless/ath/ath5k/reset.c | 6 +- + drivers/net/wireless/ath/ath9k/common.c | 11 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 9 +- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/recv.c | 19 +- + drivers/net/wireless/b43/phy_n.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 86 ++-- + drivers/net/wireless/iwlwifi/iwl-4965.c | 57 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 156 +++++- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 112 ++++- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 422 ++++++++++++++- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 294 +++++++++-- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 2 + + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 26 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 137 +++-- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 95 +++- + drivers/net/wireless/iwlwifi/iwl-agn.c | 546 ++++++++++++++----- + drivers/net/wireless/iwlwifi/iwl-agn.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 470 +++++++++++++++- + drivers/net/wireless/iwlwifi/iwl-core.c | 747 +++++++++++++++---------- + drivers/net/wireless/iwlwifi/iwl-core.h | 65 ++- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 106 +++- + drivers/net/wireless/iwlwifi/iwl-dev.h | 165 +++++- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 57 ++- + drivers/net/wireless/iwlwifi/iwl-sta.c | 183 ++++--- + drivers/net/wireless/iwlwifi/iwl-sta.h | 64 ++- + drivers/net/wireless/iwlwifi/iwl-tx.c | 34 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 175 ++++--- + drivers/net/wireless/mac80211_hwsim.c | 13 + + drivers/net/wireless/orinoco/hw.c | 9 +- + drivers/net/wireless/orinoco/wext.c | 11 +- + drivers/net/wireless/p54/Kconfig | 17 + + drivers/net/wireless/p54/p54spi.c | 7 +- + drivers/net/wireless/p54/p54usb.c | 2 +- + drivers/net/wireless/p54/txrx.c | 8 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 31 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 37 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 31 +- + drivers/net/wireless/rt2x00/rt2800.h | 13 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 305 ++++++++--- + drivers/net/wireless/rt2x00/rt2800lib.h | 9 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 114 +--- + drivers/net/wireless/rt2x00/rt2800usb.c | 105 +--- + drivers/net/wireless/rt2x00/rt2x00.h | 15 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 9 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 71 ++- + drivers/net/wireless/rt2x00/rt2x00queue.h | 48 ++- + drivers/net/wireless/rt2x00/rt2x00usb.c | 199 ++++---- + drivers/net/wireless/rt2x00/rt2x00usb.h | 12 +- + drivers/net/wireless/rt2x00/rt61pci.c | 57 +- + drivers/net/wireless/rt2x00/rt73usb.c | 35 +- + drivers/net/wireless/wl12xx/wl1251.h | 7 +- + drivers/net/wireless/wl12xx/wl1251_acx.h | 2 - + drivers/net/wireless/wl12xx/wl1251_boot.c | 2 - + drivers/net/wireless/wl12xx/wl1251_boot.h | 2 - + drivers/net/wireless/wl12xx/wl1251_cmd.h | 2 - + drivers/net/wireless/wl12xx/wl1251_debugfs.c | 2 - + drivers/net/wireless/wl12xx/wl1251_debugfs.h | 2 - + drivers/net/wireless/wl12xx/wl1251_event.c | 4 - + drivers/net/wireless/wl12xx/wl1251_event.h | 2 - + drivers/net/wireless/wl12xx/wl1251_init.c | 2 - + drivers/net/wireless/wl12xx/wl1251_init.h | 2 - + drivers/net/wireless/wl12xx/wl1251_io.c | 2 - + drivers/net/wireless/wl12xx/wl1251_main.c | 18 +- + drivers/net/wireless/wl12xx/wl1251_ps.c | 2 - + drivers/net/wireless/wl12xx/wl1251_ps.h | 8 +- + drivers/net/wireless/wl12xx/wl1251_reg.h | 2 - + drivers/net/wireless/wl12xx/wl1251_rx.c | 2 - + drivers/net/wireless/wl12xx/wl1251_rx.h | 2 - + drivers/net/wireless/wl12xx/wl1251_sdio.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_spi.c | 4 +- + drivers/net/wireless/wl12xx/wl1251_spi.h | 2 - + drivers/net/wireless/wl12xx/wl1251_tx.c | 22 +- + drivers/net/wireless/wl12xx/wl1251_tx.h | 2 - + drivers/net/wireless/wl12xx/wl1271_main.c | 2 - + drivers/net/wireless/wl12xx/wl1271_scan.c | 2 - + include/linux/nl80211.h | 16 +- + include/linux/spi/wl12xx.h | 2 +- + include/net/cfg80211.h | 24 +- + include/net/mac80211.h | 22 +- + net/mac80211/cfg.c | 53 +-- + net/mac80211/debugfs.c | 6 +- + net/mac80211/driver-ops.h | 14 + + net/mac80211/driver-trace.h | 25 + + net/mac80211/ibss.c | 4 +- + net/mac80211/ieee80211_i.h | 46 ++- + net/mac80211/iface.c | 314 ++++++----- + net/mac80211/key.c | 52 ++- + net/mac80211/key.h | 6 +- + net/mac80211/main.c | 82 +++- + net/mac80211/mlme.c | 36 +- + net/mac80211/offchannel.c | 19 +- + net/mac80211/pm.c | 3 +- + net/mac80211/rate.c | 9 +- + net/mac80211/rx.c | 33 +- + net/mac80211/scan.c | 34 +- + net/mac80211/sta_info.c | 21 +- + net/mac80211/status.c | 9 +- + net/mac80211/tx.c | 45 ++- + net/mac80211/util.c | 11 +- + net/wireless/nl80211.c | 27 +- + net/wireless/util.c | 9 +- + net/wireless/wext-core.c | 2 +- + net/wireless/wext-sme.c | 2 + + 124 files changed, 4513 insertions(+), 1866 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/clock3xxx_data.c +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging drivers/crypto/Kconfig +Merge made by recursive. + MAINTAINERS | 16 + + arch/arm/mach-omap2/clock2420_data.c | 2 +- + arch/arm/mach-omap2/clock2430_data.c | 2 +- + arch/arm/mach-omap2/clock3xxx_data.c | 2 +- + arch/arm/mach-omap2/devices.c | 71 +++ + crypto/Kconfig | 5 +- + drivers/crypto/Kconfig | 8 + + drivers/crypto/Makefile | 1 + + drivers/crypto/omap-aes.c | 948 ++++++++++++++++++++++++++++++++++ + drivers/crypto/omap-sham.c | 6 +- + include/linux/padata.h | 4 +- + 11 files changed, 1056 insertions(+), 9 deletions(-) + create mode 100644 drivers/crypto/omap-aes.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Auto-merging arch/arm/mach-davinci/devices.c +Auto-merging arch/arm/mach-mx3/clock-imx35.c +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/plat-samsung/include/plat/devs.h +Removing include/sound/soc-of-simple.h +Removing sound/soc/blackfin/bf5xx-i2s.h +Removing sound/soc/codecs/ac97.h +Removing sound/soc/codecs/ak4104.h +Removing sound/soc/codecs/ak4642.h +Removing sound/soc/codecs/cq93vc.h +Removing sound/soc/codecs/cs4270.h +Removing sound/soc/codecs/da7210.h +Removing sound/soc/codecs/jz4740.h +Removing sound/soc/codecs/spdif_transciever.h +Removing sound/soc/codecs/twl4030.h +Removing sound/soc/codecs/wm8727.h +Removing sound/soc/davinci/davinci-vcif.h +Removing sound/soc/ep93xx/ep93xx-i2s.h +Removing sound/soc/fsl/soc-of-simple.c +Removing sound/soc/kirkwood/kirkwood-dma.h +Removing sound/soc/kirkwood/kirkwood-i2s.h +Removing sound/soc/omap/omap-mcpdm.h +Removing sound/soc/pxa/pxa2xx-pcm.h +Auto-merging sound/soc/sh/siu_pcm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 432e2fb] Merge remote branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/devices.c | 13 + + arch/arm/mach-ep93xx/core.c | 6 + + arch/arm/mach-kirkwood/common.c | 6 + + arch/arm/mach-mx3/clock-imx31.c | 4 +- + arch/arm/mach-mx3/clock-imx35.c | 4 +- + arch/arm/mach-mx3/devices.c | 4 +- + arch/arm/mach-omap1/devices.c | 26 + + arch/arm/mach-omap2/board-rx51-peripherals.c | 13 +- + arch/arm/mach-omap2/board-zoom2.c | 28 +- + arch/arm/mach-omap2/devices.c | 39 + + arch/arm/mach-omap2/include/mach/board-zoom.h | 2 + + arch/arm/mach-pxa/devices.c | 25 + + arch/arm/mach-pxa/devices.h | 6 + + arch/arm/mach-pxa/pxa27x.c | 4 + + arch/arm/mach-pxa/pxa3xx.c | 5 + + arch/arm/mach-pxa/zylonite.c | 11 + + arch/arm/mach-s3c64xx/dev-audio.c | 20 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + + arch/arm/plat-mxc/audmux-v2.c | 4 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 7 + + arch/arm/plat-s3c24xx/devs.c | 34 +- + arch/arm/plat-samsung/include/plat/devs.h | 2 + + arch/mips/alchemy/devboards/db1200/platform.c | 6 + + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 1 + + .../include/asm/{immap_86xx.h => fsl_guts.h} | 111 +- + drivers/input/misc/twl4030-vibra.c | 4 +- + drivers/mfd/twl-core.c | 6 +- + drivers/mfd/twl4030-codec.c | 8 +- + drivers/video/sh_mobile_hdmi.c | 86 +- + include/linux/i2c/twl.h | 6 +- + include/sound/sh_fsi.h | 3 - + include/sound/soc-dai.h | 98 +- + include/sound/soc-dapm.h | 8 +- + include/sound/soc-of-simple.h | 25 - + include/sound/soc.h | 242 +- + include/sound/tlv320aic3x.h | 43 +- + include/sound/wm8962.h | 23 + + include/video/sh_mobile_hdmi.h | 16 + + sound/soc/atmel/atmel-pcm.c | 59 +- + sound/soc/atmel/atmel-pcm.h | 3 - + sound/soc/atmel/atmel_ssc_dai.c | 148 +- + sound/soc/atmel/atmel_ssc_dai.h | 3 +- + sound/soc/atmel/playpaq_wm8510.c | 65 +- + sound/soc/atmel/sam9g20_wm8731.c | 59 +- + sound/soc/atmel/snd-soc-afeb9260.c | 35 +- + sound/soc/au1x/db1200.c | 39 +- + sound/soc/au1x/dbdma2.c | 95 +- + sound/soc/au1x/psc-ac97.c | 71 +- + sound/soc/au1x/psc-i2s.c | 53 +- + sound/soc/au1x/psc.h | 10 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-ac97-pcm.h | 3 - + sound/soc/blackfin/bf5xx-ac97.c | 41 +- + sound/soc/blackfin/bf5xx-ac97.h | 2 - + sound/soc/blackfin/bf5xx-ad1836.c | 23 +- + sound/soc/blackfin/bf5xx-ad193x.c | 23 +- + sound/soc/blackfin/bf5xx-ad1980.c | 19 +- + sound/soc/blackfin/bf5xx-ad73311.c | 22 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 44 +- + sound/soc/blackfin/bf5xx-i2s-pcm.h | 3 - + sound/soc/blackfin/bf5xx-i2s.c | 45 +- + sound/soc/blackfin/bf5xx-i2s.h | 14 - + sound/soc/blackfin/bf5xx-ssm2602.c | 38 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-tdm-pcm.h | 3 - + sound/soc/blackfin/bf5xx-tdm.c | 15 +- + sound/soc/blackfin/bf5xx-tdm.h | 2 - + sound/soc/codecs/88pm860x-codec.c | 1486 + + sound/soc/codecs/88pm860x-codec.h | 97 + + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ac97.c | 124 +- + sound/soc/codecs/ac97.h | 19 - + sound/soc/codecs/ad1836.c | 191 +- + sound/soc/codecs/ad1836.h | 2 - + sound/soc/codecs/ad193x.c | 217 +- + sound/soc/codecs/ad193x.h | 3 - + sound/soc/codecs/ad1980.c | 112 +- + sound/soc/codecs/ad1980.h | 3 - + sound/soc/codecs/ad73311.c | 66 +- + sound/soc/codecs/ad73311.h | 2 - + sound/soc/codecs/ads117x.c | 72 +- + sound/soc/codecs/ads117x.h | 4 +- + sound/soc/codecs/ak4104.c | 149 +- + sound/soc/codecs/ak4104.h | 7 - + sound/soc/codecs/ak4535.c | 236 +- + sound/soc/codecs/ak4535.h | 8 - + sound/soc/codecs/ak4642.c | 177 +- + sound/soc/codecs/ak4642.h | 20 - + sound/soc/codecs/ak4671.c | 141 +- + sound/soc/codecs/ak4671.h | 3 - + sound/soc/codecs/cq93vc.c | 132 +- + sound/soc/codecs/cq93vc.h | 29 - + sound/soc/codecs/cs4270.c | 393 +- + sound/soc/codecs/cs4270.h | 28 - + sound/soc/codecs/cs42l51.c | 293 +- + sound/soc/codecs/cs42l51.h | 2 - + sound/soc/codecs/cx20442.c | 173 +- + sound/soc/codecs/cx20442.h | 2 - + sound/soc/codecs/da7210.c | 157 +- + sound/soc/codecs/da7210.h | 24 - + sound/soc/codecs/jz4740.c | 116 +- + sound/soc/codecs/jz4740.h | 20 - + sound/soc/codecs/pcm3008.c | 92 +- + sound/soc/codecs/pcm3008.h | 3 - + sound/soc/codecs/spdif_transciever.c | 102 +- + sound/soc/codecs/spdif_transciever.h | 18 - + sound/soc/codecs/ssm2602.c | 219 +- + sound/soc/codecs/ssm2602.h | 3 - + sound/soc/codecs/stac9766.c | 118 +- + sound/soc/codecs/stac9766.h | 4 - + sound/soc/codecs/tlv320aic23.c | 182 +- + sound/soc/codecs/tlv320aic23.h | 3 - + sound/soc/codecs/tlv320aic26.c | 180 +- + sound/soc/codecs/tlv320aic26.h | 3 - + sound/soc/codecs/tlv320aic3x.c | 303 +- + sound/soc/codecs/tlv320aic3x.h | 45 +- + sound/soc/codecs/tlv320dac33.c | 249 +- + sound/soc/codecs/tlv320dac33.h | 3 - + sound/soc/codecs/twl4030.c | 229 +- + sound/soc/codecs/twl4030.h | 55 - + sound/soc/codecs/twl6040.c | 170 +- + sound/soc/codecs/twl6040.h | 3 - + sound/soc/codecs/uda134x.c | 154 +- + sound/soc/codecs/uda134x.h | 3 - + sound/soc/codecs/uda1380.c | 330 +- + sound/soc/codecs/uda1380.h | 3 - + sound/soc/codecs/wl1273.c | 525 + + sound/soc/codecs/wl1273.h | 101 + + sound/soc/codecs/wm2000.h | 3 - + sound/soc/codecs/wm8350.c | 231 +- + sound/soc/codecs/wm8350.h | 3 - + sound/soc/codecs/wm8400.c | 181 +- + sound/soc/codecs/wm8400.h | 3 - + sound/soc/codecs/wm8510.c | 288 +- + sound/soc/codecs/wm8510.h | 3 - + sound/soc/codecs/wm8523.c | 177 +- + sound/soc/codecs/wm8523.h | 3 - + sound/soc/codecs/wm8580.c | 325 +- + sound/soc/codecs/wm8580.h | 17 +- + sound/soc/codecs/wm8711.c | 202 +- + sound/soc/codecs/wm8711.h | 3 - + sound/soc/codecs/wm8727.c | 106 +- + sound/soc/codecs/wm8727.h | 21 - + sound/soc/codecs/wm8728.c | 290 +- + sound/soc/codecs/wm8728.h | 9 - + sound/soc/codecs/wm8731.c | 244 +- + sound/soc/codecs/wm8731.h | 7 +- + sound/soc/codecs/wm8741.c | 378 +- + sound/soc/codecs/wm8741.h | 3 - + sound/soc/codecs/wm8750.c | 265 +- + sound/soc/codecs/wm8750.h | 9 - + sound/soc/codecs/wm8753.c | 403 +- + sound/soc/codecs/wm8753.h | 3 - + sound/soc/codecs/wm8776.c | 247 +- + sound/soc/codecs/wm8776.h | 3 - + sound/soc/codecs/wm8900.c | 247 +- + sound/soc/codecs/wm8900.h | 3 - + sound/soc/codecs/wm8903.c | 265 +- + sound/soc/codecs/wm8903.h | 3 - + sound/soc/codecs/wm8904.c | 208 +- + sound/soc/codecs/wm8904.h | 3 - + sound/soc/codecs/wm8940.c | 199 +- + sound/soc/codecs/wm8940.h | 2 - + sound/soc/codecs/wm8955.c | 181 +- + sound/soc/codecs/wm8955.h | 3 - + sound/soc/codecs/wm8960.c | 209 +- + sound/soc/codecs/wm8960.h | 3 - + sound/soc/codecs/wm8961.c | 237 +- + sound/soc/codecs/wm8961.h | 3 - + sound/soc/codecs/wm8962-tables.c |42299 ++++++++++++++++++++ + sound/soc/codecs/wm8962.c | 1859 + + sound/soc/codecs/wm8962.h | 3787 ++ + sound/soc/codecs/wm8971.c | 247 +- + sound/soc/codecs/wm8971.h | 8 - + sound/soc/codecs/wm8974.c | 167 +- + sound/soc/codecs/wm8974.h | 3 - + sound/soc/codecs/wm8978.c | 190 +- + sound/soc/codecs/wm8978.h | 3 - + sound/soc/codecs/wm8988.c | 262 +- + sound/soc/codecs/wm8988.h | 3 - + sound/soc/codecs/wm8990.c | 222 +- + sound/soc/codecs/wm8990.h | 8 - + sound/soc/codecs/wm8993.c | 304 +- + sound/soc/codecs/wm8993.h | 3 - + sound/soc/codecs/wm8994.c | 264 +- + sound/soc/codecs/wm8994.h | 3 - + sound/soc/codecs/wm9081.c | 208 +- + sound/soc/codecs/wm9081.h | 3 - + sound/soc/codecs/wm9090.c | 183 +- + sound/soc/codecs/wm9090.h | 2 - + sound/soc/codecs/wm9705.c | 116 +- + sound/soc/codecs/wm9705.h | 3 - + sound/soc/codecs/wm9712.c | 124 +- + sound/soc/codecs/wm9712.h | 3 - + sound/soc/codecs/wm9713.c | 131 +- + sound/soc/codecs/wm9713.h | 3 - + sound/soc/davinci/davinci-evm.c | 109 +- + sound/soc/davinci/davinci-i2s.c | 44 +- + sound/soc/davinci/davinci-i2s.h | 2 - + sound/soc/davinci/davinci-mcasp.c | 32 +- + sound/soc/davinci/davinci-mcasp.h | 2 - + sound/soc/davinci/davinci-pcm.c | 45 +- + sound/soc/davinci/davinci-pcm.h | 3 - + sound/soc/davinci/davinci-sffsdr.c | 27 +- + sound/soc/davinci/davinci-vcif.c | 25 +- + sound/soc/davinci/davinci-vcif.h | 28 - + sound/soc/ep93xx/ep93xx-i2s.c | 34 +- + sound/soc/ep93xx/ep93xx-i2s.h | 18 - + sound/soc/ep93xx/ep93xx-pcm.c | 37 +- + sound/soc/ep93xx/ep93xx-pcm.h | 2 - + sound/soc/ep93xx/snappercl15.c | 24 +- + sound/soc/fsl/Kconfig | 27 +- + sound/soc/fsl/Makefile | 11 +- + sound/soc/fsl/efika-audio-fabric.c | 20 +- + sound/soc/fsl/fsl_dma.c | 458 +- + sound/soc/fsl/fsl_dma.h | 20 - + sound/soc/fsl/fsl_ssi.c | 298 +- + sound/soc/fsl/fsl_ssi.h | 26 - + sound/soc/fsl/mpc5200_dma.c | 66 +- + sound/soc/fsl/mpc5200_dma.h | 5 - + sound/soc/fsl/mpc5200_psc_ac97.c | 34 +- + sound/soc/fsl/mpc5200_psc_ac97.h | 2 - + sound/soc/fsl/mpc5200_psc_i2s.c | 19 +- + sound/soc/fsl/mpc8610_hpcd.c | 660 +- + sound/soc/fsl/p1022_ds.c | 591 + + sound/soc/fsl/pcm030-audio-fabric.c | 21 +- + sound/soc/fsl/soc-of-simple.c | 172 - + sound/soc/imx/Kconfig | 16 + + sound/soc/imx/Makefile | 10 +- + sound/soc/imx/eukrea-tlv320.c | 16 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 43 +- + sound/soc/imx/imx-pcm-fiq.c | 68 +- + sound/soc/imx/imx-ssi.c | 148 +- + sound/soc/imx/imx-ssi.h | 7 +- + sound/soc/imx/phycore-ac97.c | 19 +- + sound/soc/imx/wm1133-ev1.c | 27 +- + sound/soc/jz4740/jz4740-i2s.c | 104 +- + sound/soc/jz4740/jz4740-i2s.h | 2 - + sound/soc/jz4740/jz4740-pcm.c | 18 +- + sound/soc/jz4740/jz4740-pcm.h | 2 - + sound/soc/jz4740/qi_lb60.c | 25 +- + sound/soc/kirkwood/kirkwood-dma.c | 66 +- + sound/soc/kirkwood/kirkwood-dma.h | 17 - + sound/soc/kirkwood/kirkwood-i2s.c | 52 +- + sound/soc/kirkwood/kirkwood-i2s.h | 17 - + sound/soc/kirkwood/kirkwood-openrd.c | 21 +- + sound/soc/nuc900/nuc900-ac97.c | 12 +- + sound/soc/nuc900/nuc900-audio.c | 16 +- + sound/soc/nuc900/nuc900-audio.h | 4 - + sound/soc/nuc900/nuc900-pcm.c | 38 +- + sound/soc/omap/am3517evm.c | 25 +- + sound/soc/omap/ams-delta.c | 98 +- + sound/soc/omap/igep0020.c | 22 +- + sound/soc/omap/mcpdm.c | 19 +- + sound/soc/omap/mcpdm.h | 2 + + sound/soc/omap/n810.c | 42 +- + sound/soc/omap/omap-mcbsp.c | 123 +- + sound/soc/omap/omap-mcbsp.h | 2 - + sound/soc/omap/omap-mcpdm.c | 71 +- + sound/soc/omap/omap-mcpdm.h | 29 - + sound/soc/omap/omap-pcm.c | 47 +- + sound/soc/omap/omap-pcm.h | 2 - + sound/soc/omap/omap2evm.c | 25 +- + sound/soc/omap/omap3beagle.c | 23 +- + sound/soc/omap/omap3evm.c | 30 +- + sound/soc/omap/omap3pandora.c | 36 +- + sound/soc/omap/osk5912.c | 24 +- + sound/soc/omap/overo.c | 22 +- + sound/soc/omap/rx51.c | 37 +- + sound/soc/omap/sdp3430.c | 56 +- + sound/soc/omap/sdp4430.c | 23 +- + sound/soc/omap/zoom2.c | 64 +- + sound/soc/pxa/Kconfig | 18 + + sound/soc/pxa/Makefile | 4 + + sound/soc/pxa/corgi.c | 28 +- + sound/soc/pxa/e740_wm9705.c | 29 +- + sound/soc/pxa/e750_wm9705.c | 26 +- + sound/soc/pxa/e800_wm9712.c | 26 +- + sound/soc/pxa/em-x270.c | 22 +- + sound/soc/pxa/imote2.c | 20 +- + sound/soc/pxa/magician.c | 35 +- + sound/soc/pxa/mioa701_wm9713.c | 33 +- + sound/soc/pxa/palm27x.c | 27 +- + sound/soc/pxa/poodle.c | 29 +- + sound/soc/pxa/pxa-ssp.c | 174 +- + sound/soc/pxa/pxa-ssp.h | 2 - + sound/soc/pxa/pxa2xx-ac97.c | 46 +- + sound/soc/pxa/pxa2xx-ac97.h | 2 - + sound/soc/pxa/pxa2xx-i2s.c | 91 +- + sound/soc/pxa/pxa2xx-i2s.h | 2 - + sound/soc/pxa/pxa2xx-pcm.c | 46 +- + sound/soc/pxa/pxa2xx-pcm.h | 19 - + sound/soc/pxa/raumfeld.c | 114 +- + sound/soc/pxa/saarb.c | 200 + + sound/soc/pxa/spitz.c | 26 +- + sound/soc/pxa/tavorevb3.c | 200 + + sound/soc/pxa/tosa.c | 27 +- + sound/soc/pxa/z2.c | 26 +- + sound/soc/pxa/zylonite.c | 40 +- + sound/soc/s3c24xx/Kconfig | 26 + + sound/soc/s3c24xx/Makefile | 6 + + sound/soc/s3c24xx/aquila_wm8994.c | 295 + + sound/soc/s3c24xx/goni_wm8994.c | 298 + + sound/soc/s3c24xx/jive_wm8750.c | 23 +- + sound/soc/s3c24xx/ln2440sbc_alc650.c | 17 +- + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 58 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 37 +- + sound/soc/s3c24xx/rx1950_uda1380.c | 335 + + sound/soc/s3c24xx/s3c-ac97.c | 22 +- + sound/soc/s3c24xx/s3c-ac97.h | 2 - + sound/soc/s3c24xx/s3c-dma.c | 46 +- + sound/soc/s3c24xx/s3c-dma.h | 1 - + sound/soc/s3c24xx/s3c-i2s-v2.c | 50 +- + sound/soc/s3c24xx/s3c-i2s-v2.h | 13 +- + sound/soc/s3c24xx/s3c-pcm.c | 42 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 54 +- + sound/soc/s3c24xx/s3c2412-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx-i2s.c | 40 +- + sound/soc/s3c24xx/s3c24xx-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx_simtec.c | 15 +- + sound/soc/s3c24xx/s3c24xx_simtec.h | 4 +- + sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 25 +- + sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 21 +- + sound/soc/s3c24xx/s3c24xx_uda134x.c | 21 +- + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 135 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 206 +- + sound/soc/s3c24xx/s3c64xx-i2s.h | 2 - + sound/soc/s3c24xx/smartq_wm8987.c | 15 +- + sound/soc/s3c24xx/smdk2443_wm9710.c | 17 +- + sound/soc/s3c24xx/smdk64xx_wm8580.c | 66 +- + sound/soc/s3c24xx/smdk_wm9713.c | 38 +- + sound/soc/s6000/s6000-i2s.c | 56 +- + sound/soc/s6000/s6000-i2s.h | 2 - + sound/soc/s6000/s6000-pcm.c | 100 +- + sound/soc/s6000/s6000-pcm.h | 2 - + sound/soc/s6000/s6105-ipcam.c | 31 +- + sound/soc/sh/Kconfig | 7 + + sound/soc/sh/Makefile | 2 + + sound/soc/sh/dma-sh7760.c | 53 +- + sound/soc/sh/fsi-ak4642.c | 29 +- + sound/soc/sh/fsi-da7210.c | 22 +- + sound/soc/sh/fsi-hdmi.c | 61 + + sound/soc/sh/fsi.c | 47 +- + sound/soc/sh/hac.c | 46 +- + sound/soc/sh/migor.c | 29 +- + sound/soc/sh/sh7760-ac97.c | 25 +- + sound/soc/sh/siu.h | 5 +- + sound/soc/sh/siu_dai.c | 66 +- + sound/soc/sh/siu_pcm.c | 32 +- + sound/soc/sh/ssi.c | 55 +- + sound/soc/soc-cache.c | 42 +- + sound/soc/soc-core.c | 1680 +- + sound/soc/soc-dapm.c | 88 +- + sound/soc/soc-jack.c | 10 +- + sound/soc/txx9/txx9aclc-ac97.c | 55 +- + sound/soc/txx9/txx9aclc-generic.c | 24 +- + sound/soc/txx9/txx9aclc.c | 141 +- + sound/soc/txx9/txx9aclc.h | 13 +- + 359 files changed, 61720 insertions(+), 13681 deletions(-) + rename arch/powerpc/include/asm/{immap_86xx.h => fsl_guts.h} (66%) + delete mode 100644 include/sound/soc-of-simple.h + create mode 100644 include/sound/wm8962.h + delete mode 100644 sound/soc/blackfin/bf5xx-i2s.h + create mode 100644 sound/soc/codecs/88pm860x-codec.c + create mode 100644 sound/soc/codecs/88pm860x-codec.h + delete mode 100644 sound/soc/codecs/ac97.h + delete mode 100644 sound/soc/codecs/ak4104.h + delete mode 100644 sound/soc/codecs/ak4642.h + delete mode 100644 sound/soc/codecs/cq93vc.h + delete mode 100644 sound/soc/codecs/cs4270.h + delete mode 100644 sound/soc/codecs/da7210.h + delete mode 100644 sound/soc/codecs/jz4740.h + delete mode 100644 sound/soc/codecs/spdif_transciever.h + delete mode 100644 sound/soc/codecs/twl4030.h + create mode 100644 sound/soc/codecs/wl1273.c + create mode 100644 sound/soc/codecs/wl1273.h + delete mode 100644 sound/soc/codecs/wm8727.h + create mode 100644 sound/soc/codecs/wm8962-tables.c + create mode 100644 sound/soc/codecs/wm8962.c + create mode 100644 sound/soc/codecs/wm8962.h + delete mode 100644 sound/soc/davinci/davinci-vcif.h + delete mode 100644 sound/soc/ep93xx/ep93xx-i2s.h + create mode 100644 sound/soc/fsl/p1022_ds.c + delete mode 100644 sound/soc/fsl/soc-of-simple.c + delete mode 100644 sound/soc/kirkwood/kirkwood-dma.h + delete mode 100644 sound/soc/kirkwood/kirkwood-i2s.h + delete mode 100644 sound/soc/omap/omap-mcpdm.h + delete mode 100644 sound/soc/pxa/pxa2xx-pcm.h + create mode 100644 sound/soc/pxa/saarb.c + create mode 100644 sound/soc/pxa/tavorevb3.c + create mode 100644 sound/soc/s3c24xx/aquila_wm8994.c + create mode 100644 sound/soc/s3c24xx/goni_wm8994.c + create mode 100644 sound/soc/s3c24xx/rx1950_uda1380.c + create mode 100644 sound/soc/sh/fsi-hdmi.c +Merging sound/for-next +$ git merge sound/for-next +Removing sound/isa/sgalaxy.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 82 ++- + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + include/sound/pcm.h | 1 + + sound/core/pcm_lib.c | 14 +- + sound/core/pcm_native.c | 2 + + sound/drivers/Kconfig | 19 + + sound/drivers/Makefile | 2 + + sound/drivers/aloop.c | 1055 +++++++++++++++++++++++ + sound/isa/Kconfig | 36 +- + sound/isa/Makefile | 4 +- + sound/isa/galaxy/Makefile | 10 + + sound/isa/galaxy/azt1605.c | 91 ++ + sound/isa/galaxy/azt2316.c | 111 +++ + sound/isa/galaxy/galaxy.c | 652 ++++++++++++++ + sound/isa/sgalaxy.c | 369 -------- + sound/pci/hda/hda_codec.c | 65 ++- + sound/pci/hda/hda_local.h | 14 +- + sound/pci/hda/patch_analog.c | 30 +- + sound/pci/hda/patch_ca0110.c | 9 +- + sound/pci/hda/patch_cirrus.c | 38 +- + sound/pci/hda/patch_conexant.c | 57 ++ + sound/pci/hda/patch_realtek.c | 278 +++--- + sound/pci/hda/patch_sigmatel.c | 183 ++-- + sound/pci/hda/patch_via.c | 522 +++--------- + sound/pci/ice1712/delta.c | 10 + + sound/pci/ice1712/delta.h | 4 +- + sound/usb/card.c | 48 +- + sound/usb/clock.c | 3 +- + sound/usb/endpoint.c | 13 +- + sound/usb/format.c | 22 +- + sound/usb/helper.c | 17 +- + sound/usb/midi.c | 9 +- + sound/usb/mixer.c | 10 +- + sound/usb/pcm.c | 7 +- + sound/usb/proc.c | 2 +- + sound/usb/quirks-table.h | 161 ++++- + sound/usb/urb.c | 2 +- + 37 files changed, 2825 insertions(+), 1128 deletions(-) + create mode 100644 sound/drivers/aloop.c + create mode 100644 sound/isa/galaxy/Makefile + create mode 100644 sound/isa/galaxy/azt1605.c + create mode 100644 sound/isa/galaxy/azt2316.c + create mode 100644 sound/isa/galaxy/galaxy.c + delete mode 100644 sound/isa/sgalaxy.c +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Already up-to-date. +Merging input/next +$ git merge input/next +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Removing drivers/staging/mrst-touchscreen/Kconfig +Removing drivers/staging/mrst-touchscreen/Makefile +Removing drivers/staging/mrst-touchscreen/TODO +Removing drivers/staging/mrst-touchscreen/intel-mid-touch.c +Merge made by recursive. + arch/arm/plat-omap/include/plat/omap4-keypad.h | 16 + + drivers/hid/hid-core.c | 5 + + drivers/hid/hid-ids.h | 4 + + drivers/input/input.c | 6 +- + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/omap4-keypad.c | 287 +++++++ + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ab8500-ponkey.c | 157 ++++ + drivers/input/tablet/Kconfig | 11 + + drivers/input/tablet/Makefile | 1 + + drivers/input/tablet/hanwang.c | 365 +++++++++ + drivers/input/tablet/wacom.h | 1 + + drivers/input/tablet/wacom_sys.c | 57 +- + drivers/input/tablet/wacom_wac.c | 123 +++- + drivers/input/tablet/wacom_wac.h | 15 + + drivers/input/touchscreen/Kconfig | 22 + + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/intel-mid-touch.c | 687 ++++++++++++++++ + drivers/input/touchscreen/lpc32xx_ts.c | 411 ++++++++++ + drivers/input/touchscreen/s3c2410_ts.c | 2 +- + drivers/input/touchscreen/stmpe-ts.c | 11 +- + drivers/input/touchscreen/tps6507x-ts.c | 3 +- + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/wacom_w8001.c | 185 ++++- + drivers/input/touchscreen/wm97xx-core.c | 18 +- + drivers/mfd/ab8500-core.c | 20 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/mrst-touchscreen/Kconfig | 7 - + drivers/staging/mrst-touchscreen/Makefile | 3 - + drivers/staging/mrst-touchscreen/TODO | 2 - + drivers/staging/mrst-touchscreen/intel-mid-touch.c | 864 -------------------- + include/linux/input.h | 2 +- + 35 files changed, 2392 insertions(+), 921 deletions(-) + create mode 100644 arch/arm/plat-omap/include/plat/omap4-keypad.h + create mode 100644 drivers/input/keyboard/omap4-keypad.c + create mode 100644 drivers/input/misc/ab8500-ponkey.c + create mode 100644 drivers/input/tablet/hanwang.c + create mode 100644 drivers/input/touchscreen/intel-mid-touch.c + create mode 100644 drivers/input/touchscreen/lpc32xx_ts.c + delete mode 100644 drivers/staging/mrst-touchscreen/Kconfig + delete mode 100644 drivers/staging/mrst-touchscreen/Makefile + delete mode 100644 drivers/staging/mrst-touchscreen/TODO + delete mode 100644 drivers/staging/mrst-touchscreen/intel-mid-touch.c +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + Documentation/block/cfq-iosched.txt | 45 ++++++++++++ + Documentation/cgroups/blkio-controller.txt | 28 ++++++++ + block/blk-cgroup.c | 2 +- + block/blk-core.c | 6 +- + block/blk-sysfs.c | 1 + + block/cfq-iosched.c | 103 ++++++++++++++++++++++++---- + block/elevator.c | 44 ++++++++---- + drivers/block/cciss.c | 11 +++ + drivers/block/loop.c | 2 +- + drivers/block/mg_disk.c | 3 +- + drivers/s390/char/tape_block.c | 3 +- + fs/bio-integrity.c | 4 +- + fs/fs-writeback.c | 2 +- + include/linux/elevator.h | 1 + + lib/scatterlist.c | 14 +++- + mm/backing-dev.c | 7 ++- + 16 files changed, 232 insertions(+), 44 deletions(-) + create mode 100644 Documentation/block/cfq-iosched.txt +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. + drivers/serial/serial_cs.c | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) +Merging battery/master +$ git merge battery/master +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Merge made by recursive. + arch/arm/mach-omap2/board-rx51-peripherals.c | 5 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/isp1704_charger.c | 369 ++++++++++++++++++++++++++ + drivers/power/wm831x_power.c | 1 - + 5 files changed, 382 insertions(+), 1 deletions(-) + create mode 100644 drivers/power/isp1704_charger.c +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Merge made by recursive. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_display.c +Auto-merging drivers/gpu/drm/radeon/radeon_fb.c +Auto-merging drivers/gpu/drm/radeon/radeon_legacy_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_mode.h +Merge made by recursive. + drivers/char/keyboard.c | 37 ++++++++ + drivers/gpu/drm/drm_fb_helper.c | 5 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 ++ + drivers/gpu/drm/nouveau/nv04_crtc.c | 46 +++++++++-- + drivers/gpu/drm/nouveau/nv50_crtc.c | 49 ++++++++--- + drivers/gpu/drm/radeon/atombios_crtc.c | 119 +++++++++++++++++++-------- + drivers/gpu/drm/radeon/radeon_display.c | 32 +++++++ + drivers/gpu/drm/radeon/radeon_fb.c | 2 + + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 50 +++++++++--- + drivers/gpu/drm/radeon/radeon_mode.h | 13 +++- + drivers/serial/kgdboc.c | 13 +++ + include/drm/drm_crtc_helper.h | 3 +- + include/linux/kbd_kern.h | 1 + + 14 files changed, 306 insertions(+), 72 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slub_def.h | 7 +- + mm/slob.c | 4 +- + mm/slub.c | 424 ++++++++++++++++++++++++++-------------------- + 3 files changed, 248 insertions(+), 187 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/gpio/stmpe-gpio.c | 5 ++ + drivers/gpio/wm8994-gpio.c | 1 + + drivers/mfd/Kconfig | 1 + + drivers/mfd/ab3100-core.c | 143 +++++++++++++++++++----------------- + drivers/mfd/pcf50633-core.c | 7 -- + drivers/mfd/wm831x-irq.c | 9 ++- + include/linux/mfd/pcf50633/core.h | 7 ++ + include/linux/mfd/stmpe.h | 6 ++ + 8 files changed, 102 insertions(+), 77 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 viafb/viafb-next +$ git merge viafb/viafb-next +Removing drivers/video/via/lcdtbl.h +Merge made by recursive. + drivers/video/via/dvi.c | 172 +++++++++---- + drivers/video/via/dvi.h | 4 +- + drivers/video/via/hw.c | 456 ++++++++++++-------------------- + drivers/video/via/hw.h | 16 +- + drivers/video/via/ioctl.c | 2 + + drivers/video/via/lcd.c | 49 +++- + drivers/video/via/lcd.h | 6 +- + drivers/video/via/lcdtbl.h | 591 ------------------------------------------ + drivers/video/via/viafbdev.c | 8 +- + drivers/video/via/viafbdev.h | 3 + + 10 files changed, 360 insertions(+), 947 deletions(-) + delete mode 100644 drivers/video/via/lcdtbl.h +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/regulator/ad5398.c +Auto-merging drivers/regulator/isl6271a-regulator.c +Merge made by recursive. + Documentation/power/regulator/overview.txt | 2 +- + drivers/regulator/88pm8607.c | 4 +- + drivers/regulator/Kconfig | 8 + + drivers/regulator/Makefile | 1 + + drivers/regulator/ab3100.c | 5 +- + drivers/regulator/ab8500.c | 9 +- + drivers/regulator/ad5398.c | 12 +- + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/max1586.c | 12 +- + drivers/regulator/max8952.c | 360 ++++++++++++++++++++++++++++ + drivers/regulator/max8998.c | 8 +- + drivers/regulator/tps6507x-regulator.c | 6 - + drivers/regulator/tps6586x-regulator.c | 4 +- + include/linux/regulator/max8952.h | 135 +++++++++++ + 14 files changed, 532 insertions(+), 36 deletions(-) + create mode 100644 drivers/regulator/max8952.c + create mode 100644 include/linux/regulator/max8952.h +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + security/apparmor/.gitignore | 1 + + security/integrity/ima/ima.h | 1 + + security/integrity/ima/ima_iint.c | 4 +++- + security/integrity/ima/ima_main.c | 8 +++++--- + security/security.c | 12 ++---------- + security/selinux/ss/policydb.c | 4 ++-- + security/tomoyo/common.c | 6 ++++-- + 7 files changed, 18 insertions(+), 18 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merging include/linux/wlp.h +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c +Auto-merging arch/blackfin/mach-bf537/boards/stamp.c +Auto-merging block/blk-core.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/rtc/rtc-nuc900.c +Auto-merging drivers/s390/block/dasd_3990_erp.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/usb/gadget/rndis.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/io_ti.c +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging fs/exofs/inode.c +Auto-merging fs/exofs/ios.c +Auto-merging init/Kconfig +Auto-merging mm/vmscan.c +Merge made by recursive. + Documentation/arm/SA1100/FreeBird | 4 ++-- + Documentation/kernel-parameters.txt | 2 +- + MAINTAINERS | 2 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + block/blk-core.c | 2 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/base/core.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/ide/ide-disk.c | 3 +-- + drivers/media/video/zoran/videocodec.h | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/net/depca.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/ps3_gelic_net.c | 4 ++-- + drivers/net/skfp/hwt.c | 2 +- + drivers/net/skfp/skfddi.c | 2 +- + drivers/net/tulip/pnic2.c | 2 +- + drivers/parport/parport_pc.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/char/tape_3590.c | 6 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 1 - + drivers/usb/gadget/f_audio.c | 2 -- + drivers/usb/gadget/f_hid.c | 4 ---- + drivers/usb/gadget/fsl_udc_core.c | 6 ------ + drivers/usb/gadget/pxa27x_udc.c | 2 -- + drivers/usb/gadget/rndis.c | 2 -- + drivers/usb/host/ehci-hcd.c | 1 - + drivers/usb/host/imx21-hcd.c | 4 ++-- + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/oxu210hp-hcd.c | 9 --------- + drivers/usb/host/pci-quirks.c | 2 -- + drivers/usb/host/u132-hcd.c | 8 ++------ + drivers/usb/image/microtek.c | 9 --------- + drivers/usb/misc/ftdi-elan.c | 2 -- + drivers/usb/mon/mon_main.c | 2 -- + drivers/usb/musb/musb_gadget.c | 1 - + drivers/usb/serial/cypress_m8.c | 2 -- + drivers/usb/serial/ftdi_sio.c | 1 - + drivers/usb/serial/garmin_gps.c | 1 - + drivers/usb/serial/io_edgeport.c | 11 ----------- + drivers/usb/serial/io_ti.c | 4 ---- + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/keyspan_pda.c | 1 - + drivers/usb/serial/mos7720.c | 6 ------ + drivers/usb/serial/mos7840.c | 7 ------- + drivers/usb/serial/omninet.c | 2 -- + drivers/usb/serial/sierra.c | 2 -- + drivers/usb/serial/spcp8x5.c | 1 - + drivers/usb/serial/usb_wwan.c | 1 - + drivers/usb/serial/whiteheat.c | 6 ------ + drivers/video/bf54x-lq043fb.c | 6 +++--- + drivers/video/bfin-t350mcqb-fb.c | 2 +- + drivers/video/vesafb.c | 2 +- + fs/exofs/inode.c | 14 +++++++------- + fs/exofs/ios.c | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + include/linux/jhash.h | 2 +- + include/video/vga.h | 2 +- + init/Kconfig | 2 +- + kernel/trace/trace_kprobe.c | 2 +- + lib/idr.c | 13 +++++++------ + mm/percpu.c | 2 +- + mm/vmscan.c | 4 ++-- + net/mac80211/mesh.h | 2 +- + net/wanrouter/wanmain.c | 4 ++-- + usr/Kconfig | 2 +- + 70 files changed, 69 insertions(+), 163 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Merge made by recursive. + drivers/base/power/main.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Already up-to-date. +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6f47976] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging catalin/for-next +$ git merge catalin/for-next +Auto-merging arch/arm/mm/Kconfig +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 ++++ + arch/arm/include/asm/assembler.h | 13 +- + arch/arm/include/asm/cacheflush.h | 9 +- + arch/arm/include/asm/domain.h | 31 ++++- + arch/arm/include/asm/futex.h | 9 +- + arch/arm/include/asm/pgtable.h | 29 ++++- + arch/arm/include/asm/smp_plat.h | 4 + + arch/arm/include/asm/tlbflush.h | 12 ++- + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 + + arch/arm/kernel/swp_emulate.c | 260 +++++++++++++++++++++++++++++++++++++ + arch/arm/kernel/traps.c | 14 ++- + arch/arm/lib/getuser.S | 13 +- + arch/arm/lib/putuser.S | 29 ++-- + arch/arm/lib/uaccess.S | 83 ++++++------ + arch/arm/mm/Kconfig | 43 ++++++ + arch/arm/mm/cache-l2x0.c | 15 ++- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 6 + + arch/arm/mm/fault-armv.c | 8 +- + arch/arm/mm/flush.c | 46 +++++-- + arch/arm/mm/mmu.c | 20 +++- + arch/arm/mm/proc-macros.S | 7 + + arch/arm/mm/proc-v7.S | 9 +- + 30 files changed, 600 insertions(+), 123 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + create mode 100644 arch/arm/kernel/swp_emulate.c +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'include/linux/Kbuild' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e009049] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/edac/i7core_edac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4592017] Merge remote branch 'i7core_edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Merge made by recursive. + drivers/spi/amba-pl022.c | 3 ++- + drivers/spi/omap2_mcspi.c | 36 +++++++++--------------------------- + drivers/spi/orion_spi.c | 4 ++-- + 3 files changed, 13 insertions(+), 30 deletions(-) +Merging limits/writable_limits +$ git merge limits/writable_limits +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging Documentation/DocBook/kernel-locking.tmpl +Auto-merging drivers/vhost/vhost.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/input.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/mm_types.h +Auto-merging init/Kconfig +Auto-merging lib/radix-tree.c +Merge made by recursive. + Documentation/DocBook/kernel-locking.tmpl | 14 +- + Documentation/RCU/checklist.txt | 46 ++- + drivers/input/evdev.c | 2 +- + drivers/vhost/net.c | 16 +- + drivers/vhost/vhost.c | 22 +- + drivers/vhost/vhost.h | 10 +- + include/linux/cgroup.h | 4 +- + include/linux/compiler.h | 4 + + include/linux/cred.h | 2 +- + include/linux/fdtable.h | 6 +- + include/linux/fs.h | 2 +- + include/linux/genhd.h | 6 +- + include/linux/hardirq.h | 2 +- + include/linux/idr.h | 4 +- + include/linux/init_task.h | 14 +- + include/linux/input.h | 2 +- + include/linux/iocontext.h | 2 +- + include/linux/key.h | 3 +- + include/linux/kvm_host.h | 2 +- + include/linux/mm_types.h | 2 +- + include/linux/nfs_fs.h | 2 +- + include/linux/notifier.h | 10 +- + include/linux/radix-tree.h | 4 +- + include/linux/rculist.h | 62 +++- + include/linux/rculist_nulls.h | 16 +- + include/linux/rcupdate.h | 482 ++++++++++++++++-------- + include/linux/rcutiny.h | 104 +++--- + include/linux/rcutree.h | 57 +--- + include/linux/sched.h | 16 +- + include/linux/srcu.h | 34 ++- + include/linux/sunrpc/auth_gss.h | 4 +- + include/net/cls_cgroup.h | 3 +- + include/net/netfilter/nf_conntrack.h | 2 +- + init/Kconfig | 26 ++- + kernel/Makefile | 1 + + kernel/cgroup.c | 2 +- + kernel/pid.c | 3 +- + kernel/rcupdate.c | 6 +- + kernel/rcutiny.c | 33 +- + kernel/rcutiny_plugin.h | 578 ++++++++++++++++++++++++++++- + kernel/rcutorture.c | 6 + + kernel/rcutree.c | 85 +++-- + kernel/rcutree.h | 17 +- + kernel/rcutree_plugin.h | 45 ++- + kernel/rcutree_trace.c | 2 +- + lib/Kconfig.debug | 37 ++ + lib/radix-tree.c | 2 +- + net/ipv4/netfilter/nf_nat_core.c | 2 +- + net/netfilter/core.c | 2 +- + net/netfilter/nf_conntrack_ecache.c | 4 +- + net/netfilter/nf_conntrack_extend.c | 2 +- + net/netfilter/nf_conntrack_proto.c | 4 +- + net/netfilter/nf_log.c | 2 +- + net/netfilter/nf_queue.c | 2 +- + 54 files changed, 1364 insertions(+), 458 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/kernel/perf_event.c +Auto-merging arch/x86/Kconfig +Removing arch/x86/include/asm/vmi.h +Removing arch/x86/include/asm/vmi_time.h +Removing arch/x86/kernel/vmi_32.c +Removing arch/x86/kernel/vmiclock_32.c +Merge made by recursive. + Documentation/DocBook/kernel-locking.tmpl | 6 + + Documentation/feature-removal-schedule.txt | 28 - + Documentation/kernel-parameters.txt | 7 +- + Documentation/mutex-design.txt | 3 +- + Documentation/x86/x86_64/kernel-stacks | 6 +- + MAINTAINERS | 2 + + arch/arm/kernel/perf_event.c | 62 +-- + arch/powerpc/kernel/perf_callchain.c | 86 +-- + arch/sh/kernel/perf_callchain.c | 50 +-- + arch/sparc/kernel/perf_event.c | 69 +-- + arch/x86/Kconfig | 58 +- + arch/x86/Kconfig.debug | 10 - + arch/x86/include/asm/amd_iommu.h | 4 +- + arch/x86/include/asm/apb_timer.h | 1 - + arch/x86/include/asm/calgary.h | 4 +- + arch/x86/include/asm/cpu.h | 1 - + arch/x86/include/asm/dwarf2.h | 20 + + arch/x86/include/asm/gart.h | 20 +- + arch/x86/include/asm/iomap.h | 4 +- + arch/x86/include/asm/iommu_table.h | 101 ++++ + arch/x86/include/asm/irq.h | 12 +- + arch/x86/include/asm/module.h | 7 +- + arch/x86/include/asm/page_32_types.h | 4 - + arch/x86/include/asm/paravirt.h | 5 - + arch/x86/include/asm/paravirt_types.h | 1 - + arch/x86/include/asm/perf_event_p4.h | 52 +- + arch/x86/include/asm/pgtable.h | 2 + + arch/x86/include/asm/pgtable_64.h | 2 + + arch/x86/include/asm/swiotlb.h | 13 +- + arch/x86/include/asm/vmi.h | 269 --------- + arch/x86/include/asm/vmi_time.h | 98 --- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/amd_iommu_init.c | 15 +- + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/aperture_64.c | 29 +- + arch/x86/kernel/apic/io_apic.c | 12 +- + arch/x86/kernel/cpu/amd.c | 21 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 11 +- + arch/x86/kernel/cpu/perf_event.c | 142 ++--- + arch/x86/kernel/cpu/perf_event_intel.c | 15 +- + arch/x86/kernel/cpu/perf_event_p4.c | 294 +++++++++- + arch/x86/kernel/entry_32.S | 310 ++++------- + arch/x86/kernel/entry_64.S | 108 ++-- + arch/x86/kernel/i387.c | 6 + + arch/x86/kernel/irq_32.c | 8 +- + arch/x86/kernel/paravirt.c | 1 - + arch/x86/kernel/pci-calgary_64.c | 18 +- + arch/x86/kernel/pci-dma.c | 44 +- + arch/x86/kernel/pci-gart_64.c | 4 +- + arch/x86/kernel/pci-iommu_table.c | 89 +++ + arch/x86/kernel/pci-swiotlb.c | 44 ++- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 119 +--- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/smpboot.c | 2 - + arch/x86/kernel/sys_i386_32.c | 4 +- + arch/x86/kernel/trampoline.c | 3 +- + arch/x86/kernel/tsc.c | 58 -- + arch/x86/kernel/vmi_32.c | 893 ---------------------------- + arch/x86/kernel/vmiclock_32.c | 317 ---------- + arch/x86/kernel/vmlinux.lds.S | 28 + + arch/x86/lib/memcpy_32.c | 36 +- + arch/x86/lib/memcpy_64.S | 158 ++++-- + arch/x86/lib/memmove_64.c | 46 ++- + arch/x86/mm/fault.c | 32 +- + arch/x86/mm/init_64.c | 40 ++- + arch/x86/mm/iomap_32.c | 6 +- + arch/x86/mm/k8topology_64.c | 6 +- + arch/x86/mm/kmemcheck/opcode.c | 2 +- + arch/x86/mm/pgtable.c | 4 - + arch/x86/oprofile/nmi_int.c | 22 +- + arch/x86/xen/mmu.c | 1 - + arch/x86/xen/pci-swiotlb-xen.c | 5 + + drivers/char/agp/amd64-agp.c | 4 +- + drivers/char/agp/generic.c | 4 +- + drivers/oprofile/buffer_sync.c | 27 +- + drivers/oprofile/cpu_buffer.c | 2 - + drivers/pci/dmar.c | 6 +- + include/asm-generic/pgtable.h | 4 + + include/linux/debug_locks.h | 5 - + include/linux/dmar.h | 6 +- + include/linux/ftrace_event.h | 4 +- + include/linux/io-mapping.h | 24 +- + include/linux/irq.h | 2 +- + include/linux/mutex.h | 8 + + include/linux/perf_event.h | 30 +- + kernel/debug/kdb/kdb_bp.c | 2 - + kernel/hrtimer.c | 3 +- + kernel/hung_task.c | 4 +- + kernel/lockdep.c | 8 +- + kernel/mutex.c | 23 +- + kernel/perf_event.c | 285 ++++++++- + kernel/sched_fair.c | 3 +- + kernel/sys.c | 2 + + kernel/sysctl.c | 5 +- + kernel/trace/ftrace.c | 15 +- + kernel/trace/ring_buffer.c | 23 +- + kernel/trace/trace_event_perf.c | 21 +- + kernel/trace/trace_events.c | 55 +-- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/watchdog.c | 55 +- + lib/Kconfig.debug | 8 +- + mm/memory.c | 2 +- + tools/perf/Documentation/perf-annotate.txt | 11 +- + tools/perf/Documentation/perf-report.txt | 7 + + tools/perf/Makefile | 30 +- + tools/perf/builtin-annotate.c | 26 +- + tools/perf/builtin-report.c | 14 +- + tools/perf/feature-tests.mak | 11 + + tools/perf/util/cache.h | 2 + + tools/perf/util/callchain.c | 98 +++- + tools/perf/util/callchain.h | 26 +- + tools/perf/util/hist.c | 4 +- + tools/perf/util/path.c | 3 +- + tools/perf/util/sort.h | 2 +- + tools/perf/util/symbol.c | 14 + + tools/perf/util/symbol.h | 1 + + tools/perf/util/ui/browser.c | 93 ++-- + tools/perf/util/ui/browser.h | 9 +- + tools/perf/util/ui/browsers/annotate.c | 38 +- + tools/perf/util/ui/browsers/hists.c | 286 ++++++---- + tools/perf/util/ui/browsers/map.c | 23 +- + tools/perf/util/ui/util.c | 4 +- + tools/perf/util/util.h | 13 - + 128 files changed, 2216 insertions(+), 3118 deletions(-) + create mode 100644 arch/x86/include/asm/iommu_table.h + delete mode 100644 arch/x86/include/asm/vmi.h + delete mode 100644 arch/x86/include/asm/vmi_time.h + create mode 100644 arch/x86/kernel/pci-iommu_table.c + delete mode 100644 arch/x86/kernel/vmi_32.c + delete mode 100644 arch/x86/kernel/vmiclock_32.c +Merging lost-spurious-irq/lost-spurious-irq +$ git merge lost-spurious-irq/lost-spurious-irq +Resolved 'drivers/ata/libata-core.c' using previous resolution. +Resolved 'include/linux/libata.h' using previous resolution. +Auto-merging arch/arm/mach-bcmring/core.c +Auto-merging arch/arm/mach-ep93xx/core.c +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Auto-merging arch/arm/mach-mmp/time.c +Auto-merging arch/arm/mach-u300/timer.c +Auto-merging arch/arm/plat-iop/time.c +Auto-merging arch/ia64/kernel/time.c +Auto-merging drivers/ata/libata-core.c +CONFLICT (content): Merge conflict in drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/sata_fsl.c +Auto-merging drivers/ata/sata_mv.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/irq.h +Auto-merging include/linux/libata.h +CONFLICT (content): Merge conflict in include/linux/libata.h +Auto-merging kernel/irq/manage.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cb0b661] Merge remote branch 'lost-spurious-irq/lost-spurious-irq' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-at91/at91rm9200_time.c | 2 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-cns3xxx/core.c | 2 +- + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-footbridge/dc21285-timer.c | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 2 +- + arch/arm/mach-h720x/cpu-h7201.c | 2 +- + arch/arm/mach-h720x/cpu-h7202.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 3 - + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-nuc93x/time.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-shark/core.c | 2 +- + arch/arm/mach-u300/timer.c | 2 +- + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-samsung/time.c | 2 +- + arch/arm/plat-versatile/timer-sp.c | 2 +- + arch/blackfin/kernel/time-ts.c | 6 +- + arch/ia64/kernel/time.c | 2 +- + arch/parisc/kernel/irq.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 5 +- + arch/x86/kernel/time.c | 2 +- + drivers/ata/libata-core.c | 55 ++- + drivers/ata/libata-eh.c | 4 +- + drivers/ata/libata-sff.c | 37 +- + drivers/clocksource/sh_cmt.c | 3 +- + drivers/clocksource/sh_mtu2.c | 3 +- + drivers/clocksource/sh_tmu.c | 3 +- + drivers/usb/core/hcd.c | 1 + + include/linux/interrupt.h | 43 +- + include/linux/irq.h | 40 +- + include/linux/libata.h | 2 + + kernel/irq/chip.c | 20 +- + kernel/irq/handle.c | 7 +- + kernel/irq/internals.h | 10 +- + kernel/irq/manage.c | 18 +- + kernel/irq/proc.c | 5 +- + kernel/irq/spurious.c | 978 +++++++++++++++++++++++++----- + 56 files changed, 1031 insertions(+), 286 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Merge made by recursive. + arch/arm/oprofile/common.c | 49 ++++++++++++++++++++++++------------------- + drivers/oprofile/oprof.c | 11 +-------- + 2 files changed, 29 insertions(+), 31 deletions(-) +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging mm/percpu.c +Merge made by recursive. + include/asm-generic/percpu.h | 15 ++++++++++----- + include/linux/percpu.h | 2 +- + mm/percpu.c | 6 ++++-- + mm/percpu_up.c | 4 ++-- + 4 files changed, 17 insertions(+), 10 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by recursive. + Documentation/DocBook/tracepoint.tmpl | 5 +++ + include/linux/workqueue.h | 18 +++++++---- + kernel/workqueue.c | 53 +++++++++++++++++++++++--------- + 3 files changed, 54 insertions(+), 22 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Merge made by recursive. + drivers/platform/x86/Kconfig | 6 + + drivers/platform/x86/dell-wmi.c | 256 ++++++++++++------------------- + drivers/platform/x86/hp-wmi.c | 172 ++++++--------------- + drivers/platform/x86/panasonic-laptop.c | 172 ++++++++------------- + drivers/platform/x86/topstar-laptop.c | 161 +++++++------------- + drivers/platform/x86/toshiba_acpi.c | 191 ++++++++--------------- + 6 files changed, 332 insertions(+), 626 deletions(-) +$ git am -3 ../patches/0001-Fix-Kconfig-mistaken-update.patch +Applying: Fix Kconfig mistaken update +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/Kconfig +$ git add . +$ git commit -v -a --amend +[master cdce928] Merge remote branch 'drivers-x86/linux-next' +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging bkl-core/bkl/core +$ git merge bkl-core/bkl/core +Already up-to-date. +Merging bkl-procfs/bkl/procfs +$ git merge bkl-procfs/bkl/procfs +Already up-to-date. +Merging bkl-ioctl/bkl/ioctl +$ git merge bkl-ioctl/bkl/ioctl +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/base/core.c +Auto-merging drivers/misc/Kconfig +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/ABI/testing/sysfs-module | 12 + + Documentation/dynamic-debug-howto.txt | 48 ++- + Documentation/kernel-parameters.txt | 7 +- + drivers/base/bus.c | 22 - + drivers/base/class.c | 19 - + drivers/base/core.c | 194 ++-------- + drivers/base/platform.c | 39 ++- + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/pch_phub.c | 717 ++++++++++++++++++++++++++++++++ + drivers/scsi/hosts.c | 2 - + drivers/scsi/scsi_scan.c | 2 - + drivers/uio/uio_pci_generic.c | 13 +- + include/linux/dynamic_debug.h | 5 + + include/linux/platform_device.h | 3 + + include/sound/core.h | 6 - + init/Kconfig | 46 +-- + kernel/params.c | 17 +- + lib/dynamic_debug.c | 98 ++++-- + sound/core/init.c | 11 +- + 20 files changed, 979 insertions(+), 295 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-module + create mode 100644 drivers/misc/pch_phub.c +Merging quilt/tty +$ git merge quilt/tty +Resolved 'drivers/serial/uartlite.c' using previous resolution. +Auto-merging drivers/serial/uartlite.c +CONFLICT (content): Merge conflict in drivers/serial/uartlite.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1f1b6d2] Merge branch 'quilt/tty' +$ git diff -M --stat --summary HEAD^.. + Documentation/devices.txt | 1 + + arch/arm/include/asm/ioctls.h | 83 +-------------- + arch/avr32/include/asm/ioctls.h | 86 +-------------- + arch/cris/include/asm/ioctls.h | 84 +-------------- + arch/frv/include/asm/ioctls.h | 80 +------------- + arch/h8300/include/asm/ioctls.h | 81 +------------- + arch/ia64/include/asm/ioctls.h | 89 +-------------- + arch/m32r/include/asm/ioctls.h | 83 +-------------- + arch/m68k/include/asm/ioctls.h | 80 +------------- + arch/mn10300/include/asm/ioctls.h | 84 +-------------- + arch/s390/include/asm/ioctls.h | 88 +-------------- + drivers/char/Kconfig | 15 +++ + drivers/char/Makefile | 1 + + drivers/char/mxser.c | 47 ++++---- + drivers/char/pty.c | 4 +- + drivers/char/tty_io.c | 32 +++++- + drivers/char/ttyprintk.c | 225 +++++++++++++++++++++++++++++++++++++ + drivers/input/serio/serport.c | 1 + + drivers/serial/mfd.c | 6 + + drivers/serial/serial_core.c | 14 ++- + drivers/serial/uartlite.c | 2 +- + include/asm-generic/ioctls.h | 2 + + include/linux/tty.h | 3 +- + 23 files changed, 330 insertions(+), 861 deletions(-) + create mode 100644 drivers/char/ttyprintk.c +Merging quilt/usb +$ git merge quilt/usb +Auto-merging drivers/usb/gadget/at91_udc.c +Auto-merging drivers/usb/gadget/fsl_udc_core.c +Auto-merging drivers/usb/gadget/pxa27x_udc.c +Auto-merging drivers/usb/musb/musb_gadget.c +Merge made by recursive. + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/urb.c | 5 +- + drivers/usb/gadget/amd5536udc.c | 11 +- + drivers/usb/gadget/at91_udc.c | 11 +- + drivers/usb/gadget/atmel_usba_udc.c | 7 +- + drivers/usb/gadget/audio.c | 10 +- + drivers/usb/gadget/cdc2.c | 10 +- + drivers/usb/gadget/ci13xxx_udc.c | 18 +- + drivers/usb/gadget/composite.c | 136 ++- + drivers/usb/gadget/dbgp.c | 19 +- + drivers/usb/gadget/dummy_hcd.c | 10 +- + drivers/usb/gadget/ether.c | 16 +- + drivers/usb/gadget/f_loopback.c | 7 +- + drivers/usb/gadget/f_mass_storage.c | 16 +- + drivers/usb/gadget/f_sourcesink.c | 5 +- + drivers/usb/gadget/file_storage.c | 54 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/fsl_udc_core.c | 10 +- + drivers/usb/gadget/g_ffs.c | 91 +- + drivers/usb/gadget/gmidi.c | 5 +- + drivers/usb/gadget/goku_udc.c | 9 +- + drivers/usb/gadget/hid.c | 10 +- + drivers/usb/gadget/imx_udc.c | 9 +- + drivers/usb/gadget/inode.c | 6 +- + drivers/usb/gadget/langwell_udc.c | 1047 +++++++++------ + drivers/usb/gadget/langwell_udc.h | 15 +- + drivers/usb/gadget/lh7a40x_udc.c | 10 +- + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/mass_storage.c | 82 +-- + drivers/usb/gadget/multi.c | 36 +- + drivers/usb/gadget/net2280.c | 10 +- + drivers/usb/gadget/nokia.c | 11 +- + drivers/usb/gadget/omap_udc.c | 10 +- + drivers/usb/gadget/printer.c | 7 +- + drivers/usb/gadget/pxa25x_udc.c | 9 +- + drivers/usb/gadget/pxa27x_udc.c | 12 +- + drivers/usb/gadget/r8a66597-udc.c | 9 +- + drivers/usb/gadget/s3c-hsotg.c | 9 +- + drivers/usb/gadget/s3c2410_udc.c | 17 +- + drivers/usb/gadget/serial.c | 11 +- + drivers/usb/gadget/storage_common.c | 3 +- + drivers/usb/gadget/webcam.c | 11 +- + drivers/usb/gadget/zero.c | 5 +- + drivers/usb/musb/musb_gadget.c | 9 +- + drivers/usb/otg/Kconfig | 14 + + drivers/usb/otg/Makefile | 1 + + drivers/usb/otg/langwell_otg.c | 2408 +++++++++++++++++++++++++++++++++++ + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/sam-ba.c | 206 +++ + include/linux/init.h | 13 +- + include/linux/usb/ch9.h | 10 + + include/linux/usb/composite.h | 40 +- + include/linux/usb/gadget.h | 20 +- + include/linux/usb/langwell_otg.h | 139 ++ + 55 files changed, 3802 insertions(+), 880 deletions(-) + create mode 100644 drivers/usb/otg/langwell_otg.c + create mode 100644 drivers/usb/serial/sam-ba.c + create mode 100644 include/linux/usb/langwell_otg.h +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Removing drivers/staging/batman-adv/CHANGELOG +Auto-merging drivers/staging/batman-adv/hard-interface.c +CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c +Auto-merging drivers/staging/batman-adv/send.c +CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree. +CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree. +Removing drivers/staging/rtl8192su/Kconfig +Removing drivers/staging/rtl8192su/Makefile +Removing drivers/staging/rtl8192su/TODO +Removing drivers/staging/rtl8192su/authors +Removing drivers/staging/rtl8192su/ieee80211/Makefile +Removing drivers/staging/rtl8192su/ieee80211/dot11d.c +Removing drivers/staging/rtl8192su/ieee80211/dot11d.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_module.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c +Removing drivers/staging/rtl8192su/ieee80211/readme +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c +Removing drivers/staging/rtl8192su/r8192SU_HWImg.c +Removing drivers/staging/rtl8192su/r8192SU_HWImg.h +Removing drivers/staging/rtl8192su/r8192SU_led.c +Removing drivers/staging/rtl8192su/r8192SU_led.h +Removing drivers/staging/rtl8192su/r8192S_Efuse.c +Removing drivers/staging/rtl8192su/r8192S_Efuse.h +Removing drivers/staging/rtl8192su/r8192S_firmware.c +Removing drivers/staging/rtl8192su/r8192S_firmware.h +Removing drivers/staging/rtl8192su/r8192S_hw.h +Removing drivers/staging/rtl8192su/r8192S_phy.c +Removing drivers/staging/rtl8192su/r8192S_phy.h +Removing drivers/staging/rtl8192su/r8192S_phyreg.h +Removing drivers/staging/rtl8192su/r8192S_rtl6052.c +Removing drivers/staging/rtl8192su/r8192S_rtl6052.h +Removing drivers/staging/rtl8192su/r8192S_rtl8225.c +Removing drivers/staging/rtl8192su/r8192S_rtl8225.h +Removing drivers/staging/rtl8192su/r8192U.h +Removing drivers/staging/rtl8192su/r8192U_core.c +Removing drivers/staging/rtl8192su/r8192U_dm.c +Removing drivers/staging/rtl8192su/r8192U_dm.h +Removing drivers/staging/rtl8192su/r8192U_pm.c +Removing drivers/staging/rtl8192su/r8192U_pm.h +Removing drivers/staging/rtl8192su/r8192U_wx.c +Removing drivers/staging/rtl8192su/r8192U_wx.h +Removing drivers/staging/rtl8192su/r819xU_HTGen.h +Removing drivers/staging/rtl8192su/r819xU_HTType.h +Removing drivers/staging/rtl8192su/r819xU_cmdpkt.c +Removing drivers/staging/rtl8192su/r819xU_cmdpkt.h +Auto-merging drivers/staging/spectra/Kconfig +Removing drivers/staging/tidspbridge/include/dspbridge/cfg.h +Removing drivers/staging/tidspbridge/include/dspbridge/services.h +Removing drivers/staging/tidspbridge/services/cfg.c +Removing drivers/staging/tidRecorded preimage for 'drivers/staging/batman-adv/hard-interface.c' +Resolved 'drivers/staging/Makefile' using previous resolution. +spbridge/services/ntfy.c +Removing drivers/staging/tidspbridge/services/services.c +Auto-merging drivers/staging/zram/zram_drv.c +Removing drivers/staging/zram/zram_ioctl.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c +drivers/staging/Makefile: needs merge +drivers/staging/batman-adv/hard-interface.c: needs merge +drivers/staging/mrst-touchscreen/Makefile: needs merge +drivers/staging/mrst-touchscreen/intel-mid-touch.c: needs merge +rm 'drivers/staging/mrst-touchscreen/Makefile' +rm 'drivers/staging/mrst-touchscreen/intel-mid-touch.c' +$ git commit -v -a +Recorded resolution for 'drivers/staging/batman-adv/hard-interface.c'. +[master 80b5e81] Merge remote branch 'staging-next/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 99 + + drivers/staging/Kconfig | 10 +- + drivers/staging/Makefile | 5 +- + drivers/staging/adis16255/adis16255.c | 4 +- + drivers/staging/ath6kl/Kconfig | 163 + + drivers/staging/ath6kl/Makefile | 159 + + drivers/staging/ath6kl/TODO | 8 + + drivers/staging/ath6kl/bmi/include/bmi_internal.h | 55 + + drivers/staging/ath6kl/bmi/src/bmi.c | 1010 ++ + .../staging/ath6kl/hif/common/hif_sdio_common.h | 87 + + .../hif/sdio/linux_sdio/include/hif_internal.h | 134 + + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 1298 ++ + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 393 + + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 1471 ++ + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 398 + + drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 784 + + drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 756 + + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 1280 ++ + drivers/staging/ath6kl/htc2/htc.c | 579 + + drivers/staging/ath6kl/htc2/htc_debug.h | 38 + + drivers/staging/ath6kl/htc2/htc_internal.h | 220 + + drivers/staging/ath6kl/htc2/htc_recv.c | 1578 ++ + drivers/staging/ath6kl/htc2/htc_send.c | 1023 ++ + drivers/staging/ath6kl/htc2/htc_services.c | 450 + + drivers/staging/ath6kl/include/a_config.h | 53 + + drivers/staging/ath6kl/include/a_debug.h | 224 + + drivers/staging/ath6kl/include/a_drv.h | 54 + + drivers/staging/ath6kl/include/a_drv_api.h | 232 + + drivers/staging/ath6kl/include/a_osapi.h | 61 + + drivers/staging/ath6kl/include/a_types.h | 58 + + drivers/staging/ath6kl/include/aggr_recv_api.h | 140 + + drivers/staging/ath6kl/include/ar3kconfig.h | 65 + + drivers/staging/ath6kl/include/ar6000_api.h | 54 + + drivers/staging/ath6kl/include/ar6000_diag.h | 48 + + drivers/staging/ath6kl/include/ar6kap_common.h | 44 + + drivers/staging/ath6kl/include/athbtfilter.h | 135 + + drivers/staging/ath6kl/include/athendpack.h | 52 + + drivers/staging/ath6kl/include/athstartpack.h | 55 + + drivers/staging/ath6kl/include/bmi.h | 135 + + .../ath6kl/include/common/AR6002/AR6002_regdump.h | 60 + + .../ath6kl/include/common/AR6002/AR6K_version.h | 52 + + .../staging/ath6kl/include/common/AR6002/addrs.h | 90 + + .../include/common/AR6002/hw.0/analog_intf_reg.h | 64 + + .../ath6kl/include/common/AR6002/hw.0/analog_reg.h | 1932 +++ + .../ath6kl/include/common/AR6002/hw.0/apb_map.h | 13 + + .../ath6kl/include/common/AR6002/hw.0/gpio_reg.h | 977 ++ + .../include/common/AR6002/hw.0/mbox_host_reg.h | 386 + + .../ath6kl/include/common/AR6002/hw.0/mbox_reg.h | 481 + + .../ath6kl/include/common/AR6002/hw.0/rtc_reg.h | 1163 ++ + .../ath6kl/include/common/AR6002/hw.0/si_reg.h | 186 + + .../ath6kl/include/common/AR6002/hw.0/uart_reg.h | 327 + + .../ath6kl/include/common/AR6002/hw.0/vmc_reg.h | 76 + + .../staging/ath6kl/include/common/AR6002/hw2.0/hw | 1 + + .../common/AR6002/hw4.0/hw/analog_intf_ares_reg.h | 3291 ++++ + .../AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h | 3674 +++++ + .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 37 + + .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h | 40 + + .../include/common/AR6002/hw4.0/hw/apb_map.h | 48 + + .../include/common/AR6002/hw4.0/hw/bb_lc_reg.h | 7076 ++++++++ + .../include/common/AR6002/hw4.0/hw/efuse_reg.h | 108 + + .../common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h | 1253 ++ + .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 1094 ++ + .../include/common/AR6002/hw4.0/hw/mac_dma_reg.h | 605 + + .../include/common/AR6002/hw4.0/hw/mac_pcu_reg.h | 3065 ++++ + .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 37 + + .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 560 + + .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 522 + + .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 638 + + .../include/common/AR6002/hw4.0/hw/rdma_reg.h | 564 + + .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 975 ++ + .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 2065 +++ + .../ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h | 209 + + .../include/common/AR6002/hw4.0/hw/uart_reg.h | 260 + + .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 37 + + .../common/AR6002/hw4.0/hw/umbox_wlan_reg.h | 322 + + .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 167 + + .../include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h | 195 + + drivers/staging/ath6kl/include/common/a_hci.h | 682 + + drivers/staging/ath6kl/include/common/athdefs.h | 84 + + drivers/staging/ath6kl/include/common/bmi_msg.h | 241 + + drivers/staging/ath6kl/include/common/btcoexGpio.h | 86 + + drivers/staging/ath6kl/include/common/cnxmgmt.h | 36 + + drivers/staging/ath6kl/include/common/dbglog.h | 134 + + drivers/staging/ath6kl/include/common/dbglog_id.h | 558 + + drivers/staging/ath6kl/include/common/discovery.h | 75 + + .../staging/ath6kl/include/common/dset_internal.h | 63 + + drivers/staging/ath6kl/include/common/dsetid.h | 134 + + .../staging/ath6kl/include/common/epping_test.h | 120 + + drivers/staging/ath6kl/include/common/gmboxif.h | 78 + + drivers/staging/ath6kl/include/common/gpio.h | 45 + + drivers/staging/ath6kl/include/common/htc.h | 236 + + .../staging/ath6kl/include/common/htc_services.h | 52 + + drivers/staging/ath6kl/include/common/ini_dset.h | 82 + + drivers/staging/ath6kl/include/common/pkt_log.h | 45 + + drivers/staging/ath6kl/include/common/regDb.h | 29 + + drivers/staging/ath6kl/include/common/regdump.h | 59 + + .../include/common/regulatory/reg_dbschema.h | 237 + + .../include/common/regulatory/reg_dbvalues.h | 504 + + drivers/staging/ath6kl/include/common/roaming.h | 41 + + drivers/staging/ath6kl/include/common/targaddrs.h | 245 + + drivers/staging/ath6kl/include/common/testcmd.h | 185 + + drivers/staging/ath6kl/include/common/tlpm.h | 38 + + drivers/staging/ath6kl/include/common/wlan_defs.h | 79 + + drivers/staging/ath6kl/include/common/wlan_dset.h | 33 + + drivers/staging/ath6kl/include/common/wmi.h | 3119 ++++ + drivers/staging/ath6kl/include/common/wmi_thin.h | 347 + + drivers/staging/ath6kl/include/common/wmix.h | 279 + + drivers/staging/ath6kl/include/common_drv.h | 108 + + drivers/staging/ath6kl/include/dbglog_api.h | 52 + + drivers/staging/ath6kl/include/dl_list.h | 153 + + drivers/staging/ath6kl/include/dset_api.h | 65 + + drivers/staging/ath6kl/include/gpio_api.h | 59 + + drivers/staging/ath6kl/include/hci_transport_api.h | 259 + + drivers/staging/ath6kl/include/hif.h | 458 + + drivers/staging/ath6kl/include/host_version.h | 52 + + drivers/staging/ath6kl/include/htc_api.h | 575 + + drivers/staging/ath6kl/include/htc_packet.h | 227 + + drivers/staging/ath6kl/include/target_reg_table.h | 244 + + drivers/staging/ath6kl/include/wlan_api.h | 128 + + drivers/staging/ath6kl/include/wmi_api.h | 441 + + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 566 + + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 572 + + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 79 + + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 980 ++ + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 127 + + drivers/staging/ath6kl/miscdrv/common_drv.c | 1027 ++ + drivers/staging/ath6kl/miscdrv/credit_dist.c | 418 + + drivers/staging/ath6kl/miscdrv/miscdrv.h | 42 + + drivers/staging/ath6kl/os/linux/ar6000_android.c | 413 + + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6453 ++++++++ + drivers/staging/ath6kl/os/linux/ar6000_pm.c | 731 + + drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 455 + + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 481 + + drivers/staging/ath6kl/os/linux/cfg80211.c | 1478 ++ + drivers/staging/ath6kl/os/linux/eeprom.c | 576 + + .../staging/ath6kl/os/linux/export_hci_transport.c | 125 + + drivers/staging/ath6kl/os/linux/hci_bridge.c | 1144 ++ + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 770 + + drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 36 + + .../ath6kl/os/linux/include/ar6xapi_linux.h | 197 + + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1219 ++ + .../ath6kl/os/linux/include/athtypes_linux.h | 53 + + drivers/staging/ath6kl/os/linux/include/cfg80211.h | 50 + + .../staging/ath6kl/os/linux/include/config_linux.h | 60 + + .../staging/ath6kl/os/linux/include/debug_linux.h | 50 + + .../ath6kl/os/linux/include/export_hci_transport.h | 76 + + .../ath6kl/os/linux/include/ieee80211_ioctl.h | 179 + + .../staging/ath6kl/os/linux/include/osapi_linux.h | 387 + + .../staging/ath6kl/os/linux/include/wlan_config.h | 111 + + .../ath6kl/os/linux/include/wmi_filter_linux.h | 293 + + drivers/staging/ath6kl/os/linux/ioctl.c | 4649 ++++++ + drivers/staging/ath6kl/os/linux/netbuf.c | 236 + + drivers/staging/ath6kl/os/linux/wireless_ext.c | 2725 ++++ + drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 116 + + drivers/staging/ath6kl/reorder/rcv_aggr.c | 666 + + drivers/staging/ath6kl/wlan/include/ieee80211.h | 401 + + .../staging/ath6kl/wlan/include/ieee80211_node.h | 93 + + drivers/staging/ath6kl/wlan/src/wlan_node.c | 636 + + drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 200 + + drivers/staging/ath6kl/wlan/src/wlan_utils.c | 61 + + drivers/staging/ath6kl/wmi/wmi.c | 6672 ++++++++ + drivers/staging/ath6kl/wmi/wmi_host.h | 102 + + drivers/staging/batman-adv/CHANGELOG | 63 - + drivers/staging/batman-adv/Makefile | 2 +- + drivers/staging/batman-adv/README | 45 +- + drivers/staging/batman-adv/TODO | 3 - + drivers/staging/batman-adv/aggregation.c | 57 +- + drivers/staging/batman-adv/bat_sysfs.c | 106 +- + drivers/staging/batman-adv/bitarray.c | 22 +- + drivers/staging/batman-adv/bitarray.h | 7 +- + drivers/staging/batman-adv/hard-interface.c | 224 +- + drivers/staging/batman-adv/hard-interface.h | 6 +- + drivers/staging/batman-adv/hash.c | 6 +- + drivers/staging/batman-adv/hash.h | 4 +- + drivers/staging/batman-adv/icmp_socket.c | 70 +- + drivers/staging/batman-adv/main.c | 138 +- + drivers/staging/batman-adv/main.h | 28 +- + drivers/staging/batman-adv/originator.c | 166 +- + drivers/staging/batman-adv/originator.h | 8 +- + drivers/staging/batman-adv/packet.h | 26 +- + drivers/staging/batman-adv/routing.c | 440 +- + drivers/staging/batman-adv/routing.h | 16 +- + drivers/staging/batman-adv/send.c | 166 +- + drivers/staging/batman-adv/send.h | 7 +- + drivers/staging/batman-adv/soft-interface.c | 238 +- + drivers/staging/batman-adv/soft-interface.h | 13 +- + drivers/staging/batman-adv/translation-table.c | 266 +- + drivers/staging/batman-adv/translation-table.h | 30 +- + drivers/staging/batman-adv/types.h | 98 +- + drivers/staging/batman-adv/unicast.c | 265 + + drivers/staging/batman-adv/unicast.h | 39 + + drivers/staging/batman-adv/vis.c | 500 +- + drivers/staging/batman-adv/vis.h | 27 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 5 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 5 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 13 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 5 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 29 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 6 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 6 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 19 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 60 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 15 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 9 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- + drivers/staging/comedi/drivers/dt2817.c | 14 +- + drivers/staging/comedi/drivers/dt3000.c | 17 +- + drivers/staging/comedi/drivers/me4000.c | 29 +- + drivers/staging/comedi/drivers/rtd520.c | 7 +- + drivers/staging/comedi/drivers/skel.c | 7 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 1 + + drivers/staging/cx25821/cx25821-audio-upstream.c | 15 +- + drivers/staging/cx25821/cx25821-audio.h | 16 +- + drivers/staging/cx25821/cx25821-core.c | 13 +- + drivers/staging/et131x/et131x_initpci.c | 2 +- + drivers/staging/frontier/alphatrack.c | 2 +- + drivers/staging/frontier/tranzport.c | 2 +- + .../iio/Documentation/lis3l02dqbuffersimple.c | 4 +- + drivers/staging/iio/Documentation/overview.txt | 17 +- + drivers/staging/iio/Documentation/ring.txt | 6 +- + .../{sysfs-class-iio => sysfs-bus-iio} | 72 +- + drivers/staging/iio/Documentation/userspace.txt | 56 +- + drivers/staging/iio/accel/accel.h | 42 +- + drivers/staging/iio/accel/adis16209_core.c | 34 +- + drivers/staging/iio/accel/adis16209_ring.c | 49 +- + drivers/staging/iio/accel/adis16209_trigger.c | 2 +- + drivers/staging/iio/accel/adis16220_core.c | 14 +- + drivers/staging/iio/accel/adis16240_core.c | 27 +- + drivers/staging/iio/accel/adis16240_ring.c | 41 +- + drivers/staging/iio/accel/adis16240_trigger.c | 2 +- + drivers/staging/iio/accel/inclinometer.h | 2 + + drivers/staging/iio/accel/lis3l02dq_core.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 65 +- + drivers/staging/iio/accel/sca3000.h | 2 +- + drivers/staging/iio/accel/sca3000_core.c | 4 +- + drivers/staging/iio/accel/sca3000_ring.c | 12 +- + drivers/staging/iio/adc/adc.h | 7 + + drivers/staging/iio/adc/max1363_core.c | 1 - + drivers/staging/iio/adc/max1363_ring.c | 18 +- + drivers/staging/iio/chrdev.h | 2 - + drivers/staging/iio/gyro/adis16260_core.c | 22 +- + drivers/staging/iio/gyro/adis16260_ring.c | 39 +- + drivers/staging/iio/gyro/adis16260_trigger.c | 2 +- + drivers/staging/iio/gyro/gyro.h | 46 +- + drivers/staging/iio/iio.h | 106 +- + drivers/staging/iio/imu/adis16300_core.c | 36 +- + drivers/staging/iio/imu/adis16300_ring.c | 51 +- + drivers/staging/iio/imu/adis16300_trigger.c | 2 +- + drivers/staging/iio/imu/adis16350_core.c | 45 +- + drivers/staging/iio/imu/adis16350_ring.c | 55 +- + drivers/staging/iio/imu/adis16350_trigger.c | 2 +- + drivers/staging/iio/imu/adis16400_core.c | 51 +- + drivers/staging/iio/imu/adis16400_ring.c | 57 +- + drivers/staging/iio/imu/adis16400_trigger.c | 2 +- + drivers/staging/iio/industrialio-core.c | 88 +- + drivers/staging/iio/industrialio-ring.c | 57 +- + drivers/staging/iio/magnetometer/hmc5843.c | 61 +- + drivers/staging/iio/ring_generic.h | 181 +- + drivers/staging/iio/ring_sw.c | 79 +- + drivers/staging/iio/ring_sw.h | 12 +- + drivers/staging/iio/sysfs.h | 100 +- + drivers/staging/iio/trigger.h | 6 +- + drivers/staging/iio/trigger/iio-trig-gpio.c | 2 +- + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 12 +- + drivers/staging/line6/Kconfig | 67 +- + drivers/staging/line6/audio.c | 16 +- + drivers/staging/line6/audio.h | 7 +- + drivers/staging/line6/capture.c | 231 +- + drivers/staging/line6/capture.h | 25 +- + drivers/staging/line6/control.c | 46 +- + drivers/staging/line6/control.h | 190 +- + drivers/staging/line6/driver.c | 569 +- + drivers/staging/line6/driver.h | 57 +- + drivers/staging/line6/dumprequest.c | 60 +- + drivers/staging/line6/dumprequest.h | 28 +- + drivers/staging/line6/midi.c | 96 +- + drivers/staging/line6/midi.h | 9 +- + drivers/staging/line6/midibuf.c | 90 +- + drivers/staging/line6/midibuf.h | 31 +- + drivers/staging/line6/pcm.c | 320 +- + drivers/staging/line6/pcm.h | 144 +- + drivers/staging/line6/playback.c | 313 +- + drivers/staging/line6/playback.h | 28 +- + drivers/staging/line6/pod.c | 758 +- + drivers/staging/line6/pod.h | 127 +- + drivers/staging/line6/revision.h | 2 +- + drivers/staging/line6/toneport.c | 276 +- + drivers/staging/line6/toneport.h | 33 +- + drivers/staging/line6/usbdefs.h | 42 +- + drivers/staging/line6/variax.c | 356 +- + drivers/staging/line6/variax.h | 84 +- + drivers/staging/lirc/lirc_imon.c | 16 +- + drivers/staging/lirc/lirc_sasem.c | 15 +- + drivers/staging/lirc/lirc_zilog.c | 10 +- + drivers/staging/octeon/cvmx-fpa.c | 2 +- + drivers/staging/octeon/cvmx-fpa.h | 2 +- + drivers/staging/otus/80211core/ratectrl.c | 26 +- + drivers/staging/pohmelfs/config.c | 34 +- + drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- + drivers/staging/quickstart/quickstart.c | 7 +- + drivers/staging/rt2860/ap.h | 20 +- + drivers/staging/rt2860/common/rtmp_init.c | 6 +- + drivers/staging/rt2860/eeprom.h | 4 +- + drivers/staging/rt2860/iface/rtmp_pci.h | 42 +- + drivers/staging/rt2860/iface/rtmp_usb.h | 110 +- + drivers/staging/rt2860/oid.h | 2 +- + drivers/staging/rt2860/rtmp.h | 18 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 - + .../rtl8187se/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8187se/r8180_core.c | 10 +- + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 71 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 18 +- + drivers/staging/rtl8192e/r8180_93cx6.c | 8 +- + drivers/staging/rtl8192e/r8190_rtl8256.c | 2 - + drivers/staging/rtl8192e/r8192E.h | 7 +- + drivers/staging/rtl8192e/r8192E_core.c | 155 +- + drivers/staging/rtl8192e/r8192E_dm.c | 50 +- + drivers/staging/rtl8192e/r8192E_dm.h | 2 - + drivers/staging/rtl8192e/r8192E_wx.c | 38 +- + drivers/staging/rtl8192e/r8192_pm.c | 6 +- + drivers/staging/rtl8192e/r819xE_firmware.c | 14 +- + drivers/staging/rtl8192e/r819xE_phy.c | 23 +- + drivers/staging/rtl8192su/Kconfig | 9 - + drivers/staging/rtl8192su/Makefile | 39 - + drivers/staging/rtl8192su/TODO | 21 - + drivers/staging/rtl8192su/authors | 1 - + drivers/staging/rtl8192su/ieee80211/Makefile | 30 - + drivers/staging/rtl8192su/ieee80211/dot11d.c | 224 - + drivers/staging/rtl8192su/ieee80211/dot11d.h | 111 - + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 1934 --- + .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 242 - + .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 86 - + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 471 - + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 776 - + .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 294 - + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 301 - + .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 449 - + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2580 --- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 3291 ---- + .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 625 - + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 916 -- + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 772 - + drivers/staging/rtl8192su/ieee80211/readme | 162 - + drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h | 79 - + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 745 - + drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 530 - + .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 1725 -- + drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 540 - + drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h | 71 - + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 631 - + drivers/staging/rtl8192su/r8192SU_HWImg.c | 647 - + drivers/staging/rtl8192su/r8192SU_HWImg.h | 60 - + drivers/staging/rtl8192su/r8192SU_led.c | 2338 --- + drivers/staging/rtl8192su/r8192SU_led.h | 93 - + drivers/staging/rtl8192su/r8192S_Efuse.c | 2199 --- + drivers/staging/rtl8192su/r8192S_Efuse.h | 79 - + drivers/staging/rtl8192su/r8192S_firmware.c | 481 - + drivers/staging/rtl8192su/r8192S_firmware.h | 210 - + drivers/staging/rtl8192su/r8192S_hw.h | 1445 -- + drivers/staging/rtl8192su/r8192S_phy.c | 3634 ----- + drivers/staging/rtl8192su/r8192S_phy.h | 135 - + drivers/staging/rtl8192su/r8192S_phyreg.h | 1033 -- + drivers/staging/rtl8192su/r8192S_rtl6052.c | 842 - + drivers/staging/rtl8192su/r8192S_rtl6052.h | 87 - + drivers/staging/rtl8192su/r8192S_rtl8225.c | 292 - + drivers/staging/rtl8192su/r8192S_rtl8225.h | 30 - + drivers/staging/rtl8192su/r8192U.h | 1519 -- + drivers/staging/rtl8192su/r8192U_core.c | 7712 --------- + drivers/staging/rtl8192su/r8192U_dm.c | 3982 ----- + drivers/staging/rtl8192su/r8192U_dm.h | 254 - + drivers/staging/rtl8192su/r8192U_pm.c | 72 - + drivers/staging/rtl8192su/r8192U_pm.h | 25 - + drivers/staging/rtl8192su/r8192U_wx.c | 1296 -- + drivers/staging/rtl8192su/r8192U_wx.h | 22 - + drivers/staging/rtl8192su/r819xU_HTGen.h | 22 - + drivers/staging/rtl8192su/r819xU_HTType.h | 383 - + drivers/staging/rtl8192su/r819xU_cmdpkt.c | 512 - + drivers/staging/rtl8192su/r819xU_cmdpkt.h | 192 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 2 +- + drivers/staging/rtl8712/Kconfig | 18 + + drivers/staging/rtl8712/Makefile | 34 + + drivers/staging/rtl8712/TODO | 16 + + drivers/staging/rtl8712/basic_types.h | 23 + + drivers/staging/rtl8712/big_endian.h | 69 + + drivers/staging/rtl8712/drv_types.h | 165 + + drivers/staging/rtl8712/ethernet.h | 23 + + drivers/staging/rtl8712/farray.h |10197 ++++++++++++ + drivers/staging/rtl8712/generic.h | 153 + + drivers/staging/rtl8712/hal_init.c | 358 + + drivers/staging/rtl8712/ieee80211.c | 454 + + drivers/staging/rtl8712/ieee80211.h | 770 + + drivers/staging/rtl8712/if_ether.h | 116 + + drivers/staging/rtl8712/ip.h | 137 + + drivers/staging/rtl8712/little_endian.h | 69 + + drivers/staging/rtl8712/mlme_linux.c | 170 + + drivers/staging/rtl8712/mlme_osdep.h | 18 + + drivers/staging/rtl8712/mp_custom_oid.h | 274 + + drivers/staging/rtl8712/os_intfs.c | 464 + + drivers/staging/rtl8712/osdep_intf.h | 19 + + drivers/staging/rtl8712/osdep_service.h | 260 + + drivers/staging/rtl8712/recv_linux.c | 169 + + drivers/staging/rtl8712/recv_osdep.h | 27 + + drivers/staging/rtl8712/rtl8712_bitdef.h | 19 + + drivers/staging/rtl8712/rtl8712_cmd.c | 465 + + drivers/staging/rtl8712/rtl8712_cmd.h | 157 + + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 89 + + drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 15 + + drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 36 + + drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 28 + + .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 52 + + .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 18 + + drivers/staging/rtl8712/rtl8712_efuse.c | 568 + + drivers/staging/rtl8712/rtl8712_efuse.h | 43 + + drivers/staging/rtl8712/rtl8712_event.h | 73 + + drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 126 + + drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 57 + + drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 54 + + drivers/staging/rtl8712/rtl8712_gp_regdef.h | 17 + + drivers/staging/rtl8712/rtl8712_hal.h | 124 + + drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 39 + + drivers/staging/rtl8712/rtl8712_io.c | 151 + + drivers/staging/rtl8712/rtl8712_led.c | 1815 +++ + .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 28 + + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 16 + + drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 33 + + drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 20 + + drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 30 + + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 31 + + drivers/staging/rtl8712/rtl8712_recv.c | 1131 ++ + drivers/staging/rtl8712/rtl8712_recv.h | 128 + + drivers/staging/rtl8712/rtl8712_regdef.h | 19 + + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 29 + + drivers/staging/rtl8712/rtl8712_spec.h | 110 + + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 145 + + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 31 + + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 44 + + drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 20 + + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 37 + + drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 24 + + drivers/staging/rtl8712/rtl8712_xmit.c | 509 + + drivers/staging/rtl8712/rtl8712_xmit.h | 95 + + drivers/staging/rtl8712/rtl871x_byteorder.h | 13 + + drivers/staging/rtl8712/rtl871x_cmd.c | 926 ++ + drivers/staging/rtl8712/rtl871x_cmd.h | 719 + + drivers/staging/rtl8712/rtl871x_debug.h | 142 + + drivers/staging/rtl8712/rtl871x_eeprom.c | 233 + + drivers/staging/rtl8712/rtl871x_eeprom.h | 82 + + drivers/staging/rtl8712/rtl871x_event.h | 95 + + drivers/staging/rtl8712/rtl871x_ht.h | 19 + + drivers/staging/rtl8712/rtl871x_io.c | 163 + + drivers/staging/rtl8712/rtl871x_io.h | 233 + + drivers/staging/rtl8712/rtl871x_ioctl.h | 97 + + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2258 +++ + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 535 + + drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 96 + + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 379 + + drivers/staging/rtl8712/rtl871x_ioctl_set.h | 24 + + drivers/staging/rtl8712/rtl871x_led.h | 99 + + drivers/staging/rtl8712/rtl871x_mlme.c | 1840 +++ + drivers/staging/rtl8712/rtl871x_mlme.h | 208 + + drivers/staging/rtl8712/rtl871x_mp.c | 736 + + drivers/staging/rtl8712/rtl871x_mp.h | 318 + + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 1475 ++ + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 457 + + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 1025 ++ + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 250 + + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 127 + + drivers/staging/rtl8712/rtl871x_recv.c | 693 + + drivers/staging/rtl8712/rtl871x_recv.h | 330 + + drivers/staging/rtl8712/rtl871x_rf.h | 43 + + drivers/staging/rtl8712/rtl871x_security.c | 1389 ++ + drivers/staging/rtl8712/rtl871x_security.h | 196 + + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 299 + + drivers/staging/rtl8712/rtl871x_wlan_sme.h | 22 + + drivers/staging/rtl8712/rtl871x_xmit.c | 1052 ++ + drivers/staging/rtl8712/rtl871x_xmit.h | 260 + + drivers/staging/rtl8712/sta_info.h | 125 + + drivers/staging/rtl8712/swab.h | 106 + + drivers/staging/rtl8712/usb_halinit.c | 317 + + drivers/staging/rtl8712/usb_intf.c | 571 + + drivers/staging/rtl8712/usb_ops.c | 201 + + drivers/staging/rtl8712/usb_ops.h | 25 + + drivers/staging/rtl8712/usb_ops_linux.c | 529 + + drivers/staging/rtl8712/usb_osintf.h | 24 + + drivers/staging/rtl8712/usb_vendor_req.h | 33 + + drivers/staging/rtl8712/wifi.h | 622 + + drivers/staging/rtl8712/wlan_bssdef.h | 242 + + drivers/staging/rtl8712/xmit_linux.c | 182 + + drivers/staging/rtl8712/xmit_osdep.h | 38 + + drivers/staging/sbe-2t3e3/2t3e3.h | 894 + + drivers/staging/sbe-2t3e3/Kconfig | 13 + + drivers/staging/sbe-2t3e3/Makefile | 4 + + drivers/staging/sbe-2t3e3/TODO | 6 + + drivers/staging/sbe-2t3e3/cpld.c | 366 + + drivers/staging/sbe-2t3e3/ctrl.c | 362 + + drivers/staging/sbe-2t3e3/ctrl.h | 131 + + drivers/staging/sbe-2t3e3/dc.c | 502 + + drivers/staging/sbe-2t3e3/exar7250.c | 217 + + drivers/staging/sbe-2t3e3/exar7300.c | 182 + + drivers/staging/sbe-2t3e3/intr.c | 635 + + drivers/staging/sbe-2t3e3/io.c | 352 + + drivers/staging/sbe-2t3e3/main.c | 171 + + drivers/staging/sbe-2t3e3/maps.c | 104 + + drivers/staging/sbe-2t3e3/module.c | 210 + + drivers/staging/sbe-2t3e3/netdev.c | 142 + + drivers/staging/slicoss/slic.h | 8 +- + drivers/staging/slicoss/slicoss.c | 42 +- + drivers/staging/sm7xx/smtcfb.c | 13 +- + drivers/staging/solo6x10/solo6010-core.c | 40 +- + drivers/staging/solo6x10/solo6010-g723.c | 2 +- + drivers/staging/spectra/Kconfig | 2 +- + drivers/staging/spectra/flash.h | 2 +- + drivers/staging/spectra/lld_nand.c | 7 +- + drivers/staging/ti-st/st.h | 1 - + drivers/staging/ti-st/st_core.c | 14 +- + drivers/staging/ti-st/st_core.h | 2 +- + drivers/staging/ti-st/st_kim.c | 22 +- + drivers/staging/tidspbridge/Makefile | 4 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 1 - + drivers/staging/tidspbridge/core/dsp-clock.c | 1 - + drivers/staging/tidspbridge/core/io_sm.c | 1 - + .../staging/tidspbridge/{services => core}/sync.c | 17 + + drivers/staging/tidspbridge/core/tiomap3430.c | 1 - + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 4 +- + drivers/staging/tidspbridge/core/tiomap_io.c | 1 - + drivers/staging/tidspbridge/gen/gb.c | 1 - + .../staging/tidspbridge/include/dspbridge/cfg.h | 222 - + .../staging/tidspbridge/include/dspbridge/drv.h | 2 +- + .../staging/tidspbridge/include/dspbridge/mgr.h | 2 +- + .../tidspbridge/include/dspbridge/services.h | 50 - + .../staging/tidspbridge/include/dspbridge/wdt.h | 2 +- + drivers/staging/tidspbridge/pmgr/chnl.c | 1 - + drivers/staging/tidspbridge/pmgr/cmm.c | 1 - + drivers/staging/tidspbridge/pmgr/dbll.c | 2 +- + drivers/staging/tidspbridge/pmgr/dev.c | 69 +- + drivers/staging/tidspbridge/pmgr/dspapi.c | 12 +- + drivers/staging/tidspbridge/pmgr/io.c | 3 - + drivers/staging/tidspbridge/rmgr/drv.c | 59 +- + drivers/staging/tidspbridge/rmgr/drv_interface.c | 14 +- + drivers/staging/tidspbridge/rmgr/dspdrv.c | 12 +- + drivers/staging/tidspbridge/rmgr/mgr.c | 52 +- + drivers/staging/tidspbridge/rmgr/node.c | 1 - + drivers/staging/tidspbridge/rmgr/proc.c | 48 +- + drivers/staging/tidspbridge/rmgr/strm.c | 1 - + drivers/staging/tidspbridge/services/cfg.c | 253 - + drivers/staging/tidspbridge/services/ntfy.c | 31 - + drivers/staging/tidspbridge/services/services.c | 70 - + drivers/staging/tm6000/tm6000-alsa.c | 7 +- + drivers/staging/tm6000/tm6000-core.c | 6 +- + drivers/staging/udlfb/udlfb.c | 898 +- + drivers/staging/udlfb/udlfb.h | 35 +- + drivers/staging/udlfb/udlfb.txt | 144 + + drivers/staging/usbip/stub_dev.c | 2 +- + drivers/staging/vt6655/device_main.c | 3 +- + drivers/staging/vt6655/iwctl.c | 2 +- + drivers/staging/vt6656/80211mgr.h | 10 +- + drivers/staging/vt6656/baseband.c | 2 - + drivers/staging/vt6656/bssdb.c | 14 +- + drivers/staging/vt6656/device.h | 19 +- + drivers/staging/vt6656/dpc.c | 17 +- + drivers/staging/vt6656/firmware.c | 4 +- + drivers/staging/vt6656/ioctl.c | 2 +- + drivers/staging/vt6656/iwctl.c | 20 +- + drivers/staging/vt6656/iwctl.h | 3 - + drivers/staging/vt6656/key.c | 2 +- + drivers/staging/vt6656/main_usb.c | 29 +- + drivers/staging/vt6656/power.c | 6 +- + drivers/staging/vt6656/rxtx.c | 26 +- + drivers/staging/vt6656/tether.h | 32 +- + drivers/staging/vt6656/usbpipe.c | 52 +- + drivers/staging/vt6656/wcmd.c | 4 +- + drivers/staging/vt6656/wmgr.c | 19 +- + drivers/staging/vt6656/wmgr.h | 2 +- + drivers/staging/vt6656/wpa.c | 8 +- + drivers/staging/vt6656/wpactl.c | 6 +- + drivers/staging/westbridge/Kconfig | 34 + + drivers/staging/westbridge/TODO | 7 + + drivers/staging/westbridge/astoria/Kconfig | 9 + + drivers/staging/westbridge/astoria/Makefile | 11 + + drivers/staging/westbridge/astoria/api/Makefile | 14 + + .../staging/westbridge/astoria/api/src/cyasdma.c | 1107 ++ + .../staging/westbridge/astoria/api/src/cyasintr.c | 143 + + .../westbridge/astoria/api/src/cyaslep2pep.c | 358 + + .../westbridge/astoria/api/src/cyaslowlevel.c | 1264 ++ + .../staging/westbridge/astoria/api/src/cyasmisc.c | 3474 ++++ + .../staging/westbridge/astoria/api/src/cyasmtp.c | 1128 ++ + .../westbridge/astoria/api/src/cyasstorage.c | 4104 +++++ + .../staging/westbridge/astoria/api/src/cyasusb.c | 3718 +++++ + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 2450 +++ + .../plat-omap/include/mach/westbridge/cyashaldef.h | 55 + + .../cyashalomap_kernel.h | 319 + + .../westbridge-omap3-pnand-hal/cyasmemmap.h | 555 + + .../cyasomapdev_kernel.h | 72 + + drivers/staging/westbridge/astoria/block/Kconfig | 9 + + drivers/staging/westbridge/astoria/block/Makefile | 11 + + .../westbridge/astoria/block/cyasblkdev_block.c | 1628 ++ + .../westbridge/astoria/block/cyasblkdev_queue.c | 417 + + .../westbridge/astoria/block/cyasblkdev_queue.h | 64 + + drivers/staging/westbridge/astoria/device/Kconfig | 9 + + drivers/staging/westbridge/astoria/device/Makefile | 23 + + .../westbridge/astoria/device/cyandevice_export.h | 132 + + .../staging/westbridge/astoria/device/cyasdevice.c | 394 + + drivers/staging/westbridge/astoria/gadget/Kconfig | 9 + + drivers/staging/westbridge/astoria/gadget/Makefile | 11 + + .../staging/westbridge/astoria/gadget/cyasgadget.c | 2211 +++ + .../staging/westbridge/astoria/gadget/cyasgadget.h | 193 + + .../westbridge/astoria/gadget/cyasgadget_ioctl.h | 99 + + .../astoria/include/linux/westbridge/cyanerr.h | 418 + + .../astoria/include/linux/westbridge/cyanmedia.h | 59 + + .../astoria/include/linux/westbridge/cyanmisc.h | 614 + + .../astoria/include/linux/westbridge/cyanregs.h | 180 + + .../include/linux/westbridge/cyansdkversion.h | 30 + + .../astoria/include/linux/westbridge/cyanstorage.h | 419 + + .../astoria/include/linux/westbridge/cyantioch.h | 35 + + .../astoria/include/linux/westbridge/cyantypes.h | 31 + + .../astoria/include/linux/westbridge/cyanusb.h | 619 + + .../include/linux/westbridge/cyas_cplus_end.h | 11 + + .../include/linux/westbridge/cyas_cplus_start.h | 11 + + .../astoria/include/linux/westbridge/cyascast.h | 35 + + .../astoria/include/linux/westbridge/cyasdevice.h | 1057 ++ + .../astoria/include/linux/westbridge/cyasdma.h | 375 + + .../astoria/include/linux/westbridge/cyaserr.h | 1094 ++ + .../astoria/include/linux/westbridge/cyashal.h | 108 + + .../astoria/include/linux/westbridge/cyashalcb.h | 44 + + .../astoria/include/linux/westbridge/cyashaldoc.h | 800 + + .../astoria/include/linux/westbridge/cyasintr.h | 104 + + .../astoria/include/linux/westbridge/cyaslep2pep.h | 36 + + .../include/linux/westbridge/cyaslowlevel.h | 366 + + .../astoria/include/linux/westbridge/cyasmedia.h | 54 + + .../astoria/include/linux/westbridge/cyasmisc.h | 1549 ++ + .../include/linux/westbridge/cyasmisc_dep.h | 53 + + .../astoria/include/linux/westbridge/cyasmtp.h | 646 + + .../include/linux/westbridge/cyasprotocol.h | 3838 +++++ + .../astoria/include/linux/westbridge/cyasregs.h | 201 + + .../astoria/include/linux/westbridge/cyasstorage.h | 2759 ++++ + .../include/linux/westbridge/cyasstorage_dep.h | 309 + + .../astoria/include/linux/westbridge/cyastoria.h | 36 + + .../include/linux/westbridge/cyastsdkversion.h | 30 + + .../astoria/include/linux/westbridge/cyastypes.h | 71 + + .../astoria/include/linux/westbridge/cyasusb.h | 1862 +++ + .../astoria/include/linux/westbridge/cyasusb_dep.h | 224 + + drivers/staging/wlags49_h2/mdd.h | 2 +- + drivers/staging/wlags49_h2/wl_main.c | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- + drivers/staging/xgifb/XGI_accel.h | 3 +- + drivers/staging/xgifb/XGI_main.h | 30 +- + drivers/staging/xgifb/XGI_main_26.c | 30 +- + drivers/staging/xgifb/vb_ext.c | 1737 +-- + drivers/staging/xgifb/vb_init.c | 5022 +++---- + drivers/staging/xgifb/vb_setmode.c |17044 +++++++++----------- + drivers/staging/xgifb/vb_table.h | 620 +- + drivers/staging/xgifb/vb_util.c | 192 +- + drivers/staging/zram/Kconfig | 12 - + drivers/staging/zram/Makefile | 2 +- + drivers/staging/zram/zram.txt | 58 +- + drivers/staging/zram/zram_drv.c | 221 +- + drivers/staging/zram/zram_drv.h | 57 +- + drivers/staging/zram/zram_ioctl.h | 41 - + drivers/staging/zram/zram_sysfs.c | 224 + + 674 files changed, 197653 insertions(+), 66324 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-block-zram + create mode 100644 drivers/staging/ath6kl/Kconfig + create mode 100644 drivers/staging/ath6kl/Makefile + create mode 100644 drivers/staging/ath6kl/TODO + create mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h + create mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c + create mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h + create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h + create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c + create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c + create mode 100644 drivers/staging/ath6kl/htc2/htc.c + create mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h + create mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h + create mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c + create mode 100644 drivers/staging/ath6kl/htc2/htc_send.c + create mode 100644 drivers/staging/ath6kl/htc2/htc_services.c + create mode 100644 drivers/staging/ath6kl/include/a_config.h + create mode 100644 drivers/staging/ath6kl/include/a_debug.h + create mode 100644 drivers/staging/ath6kl/include/a_drv.h + create mode 100644 drivers/staging/ath6kl/include/a_drv_api.h + create mode 100644 drivers/staging/ath6kl/include/a_osapi.h + create mode 100644 drivers/staging/ath6kl/include/a_types.h + create mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h + create mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h + create mode 100644 drivers/staging/ath6kl/include/ar6000_api.h + create mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h + create mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h + create mode 100644 drivers/staging/ath6kl/include/athbtfilter.h + create mode 100644 drivers/staging/ath6kl/include/athendpack.h + create mode 100644 drivers/staging/ath6kl/include/athstartpack.h + create mode 100644 drivers/staging/ath6kl/include/bmi.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/analog_intf_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/analog_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/apb_map.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/gpio_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/mbox_host_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/mbox_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/rtc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/si_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/uart_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/vmc_reg.h + create mode 120000 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_ares_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/bb_lc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/efuse_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_dma_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_pcu_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rdma_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/a_hci.h + create mode 100644 drivers/staging/ath6kl/include/common/athdefs.h + create mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h + create mode 100644 drivers/staging/ath6kl/include/common/btcoexGpio.h + create mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h + create mode 100644 drivers/staging/ath6kl/include/common/dbglog.h + create mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h + create mode 100644 drivers/staging/ath6kl/include/common/discovery.h + create mode 100644 drivers/staging/ath6kl/include/common/dset_internal.h + create mode 100644 drivers/staging/ath6kl/include/common/dsetid.h + create mode 100644 drivers/staging/ath6kl/include/common/epping_test.h + create mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h + create mode 100644 drivers/staging/ath6kl/include/common/gpio.h + create mode 100644 drivers/staging/ath6kl/include/common/htc.h + create mode 100644 drivers/staging/ath6kl/include/common/htc_services.h + create mode 100644 drivers/staging/ath6kl/include/common/ini_dset.h + create mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h + create mode 100644 drivers/staging/ath6kl/include/common/regDb.h + create mode 100644 drivers/staging/ath6kl/include/common/regdump.h + create mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h + create mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbvalues.h + create mode 100644 drivers/staging/ath6kl/include/common/roaming.h + create mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h + create mode 100644 drivers/staging/ath6kl/include/common/testcmd.h + create mode 100644 drivers/staging/ath6kl/include/common/tlpm.h + create mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h + create mode 100644 drivers/staging/ath6kl/include/common/wlan_dset.h + create mode 100644 drivers/staging/ath6kl/include/common/wmi.h + create mode 100644 drivers/staging/ath6kl/include/common/wmi_thin.h + create mode 100644 drivers/staging/ath6kl/include/common/wmix.h + create mode 100644 drivers/staging/ath6kl/include/common_drv.h + create mode 100644 drivers/staging/ath6kl/include/dbglog_api.h + create mode 100644 drivers/staging/ath6kl/include/dl_list.h + create mode 100644 drivers/staging/ath6kl/include/dset_api.h + create mode 100644 drivers/staging/ath6kl/include/gpio_api.h + create mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h + create mode 100644 drivers/staging/ath6kl/include/hif.h + create mode 100644 drivers/staging/ath6kl/include/host_version.h + create mode 100644 drivers/staging/ath6kl/include/htc_api.h + create mode 100644 drivers/staging/ath6kl/include/htc_packet.h + create mode 100644 drivers/staging/ath6kl/include/target_reg_table.h + create mode 100644 drivers/staging/ath6kl/include/wlan_api.h + create mode 100644 drivers/staging/ath6kl/include/wmi_api.h + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h + create mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c + create mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c + create mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c + create mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c + create mode 100644 drivers/staging/ath6kl/os/linux/eeprom.c + create mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c + create mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c + create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athendpack_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athtypes_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c + create mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c + create mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c + create mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h + create mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c + create mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h + create mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h + create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c + create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c + create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c + create mode 100644 drivers/staging/ath6kl/wmi/wmi.c + create mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h + delete mode 100644 drivers/staging/batman-adv/CHANGELOG + create mode 100644 drivers/staging/batman-adv/unicast.c + create mode 100644 drivers/staging/batman-adv/unicast.h + rename drivers/staging/iio/Documentation/{sysfs-class-iio => sysfs-bus-iio} (95%) + delete mode 100644 drivers/staging/rtl8192su/Kconfig + delete mode 100644 drivers/staging/rtl8192su/Makefile + delete mode 100644 drivers/staging/rtl8192su/TODO + delete mode 100644 drivers/staging/rtl8192su/authors + delete mode 100644 drivers/staging/rtl8192su/ieee80211/Makefile + delete mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_module.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/readme + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c + delete mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.c + delete mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.h + delete mode 100644 drivers/staging/rtl8192su/r8192SU_led.c + delete mode 100644 drivers/staging/rtl8192su/r8192SU_led.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_firmware.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_firmware.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_hw.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_phy.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_phy.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_phyreg.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.h + delete mode 100644 drivers/staging/rtl8192su/r8192U.h + delete mode 100644 drivers/staging/rtl8192su/r8192U_core.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_dm.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_dm.h + delete mode 100644 drivers/staging/rtl8192su/r8192U_pm.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_pm.h + delete mode 100644 drivers/staging/rtl8192su/r8192U_wx.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_wx.h + delete mode 100644 drivers/staging/rtl8192su/r819xU_HTGen.h + delete mode 100644 drivers/staging/rtl8192su/r819xU_HTType.h + delete mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.c + delete mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.h + create mode 100644 drivers/staging/rtl8712/Kconfig + create mode 100644 drivers/staging/rtl8712/Makefile + create mode 100644 drivers/staging/rtl8712/TODO + create mode 100644 drivers/staging/rtl8712/basic_types.h + create mode 100644 drivers/staging/rtl8712/big_endian.h + create mode 100644 drivers/staging/rtl8712/drv_types.h + create mode 100644 drivers/staging/rtl8712/ethernet.h + create mode 100644 drivers/staging/rtl8712/farray.h + create mode 100644 drivers/staging/rtl8712/generic.h + create mode 100644 drivers/staging/rtl8712/hal_init.c + create mode 100644 drivers/staging/rtl8712/ieee80211.c + create mode 100644 drivers/staging/rtl8712/ieee80211.h + create mode 100644 drivers/staging/rtl8712/if_ether.h + create mode 100644 drivers/staging/rtl8712/ip.h + create mode 100644 drivers/staging/rtl8712/little_endian.h + create mode 100644 drivers/staging/rtl8712/mlme_linux.c + create mode 100644 drivers/staging/rtl8712/mlme_osdep.h + create mode 100644 drivers/staging/rtl8712/mp_custom_oid.h + create mode 100644 drivers/staging/rtl8712/os_intfs.c + create mode 100644 drivers/staging/rtl8712/osdep_intf.h + create mode 100644 drivers/staging/rtl8712/osdep_service.h + create mode 100644 drivers/staging/rtl8712/recv_linux.c + create mode 100644 drivers/staging/rtl8712/recv_osdep.h + create mode 100644 drivers/staging/rtl8712/rtl8712_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_cmd.c + create mode 100644 drivers/staging/rtl8712/rtl8712_cmd.h + create mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_efuse.c + create mode 100644 drivers/staging/rtl8712/rtl8712_efuse.h + create mode 100644 drivers/staging/rtl8712/rtl8712_event.h + create mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_gp_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_gp_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_hal.h + create mode 100644 drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_io.c + create mode 100644 drivers/staging/rtl8712/rtl8712_led.c + create mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_powersave_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_powersave_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_recv.c + create mode 100644 drivers/staging/rtl8712/rtl8712_recv.h + create mode 100644 drivers/staging/rtl8712/rtl8712_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_security_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_spec.h + create mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_wmac_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_wmac_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_xmit.c + create mode 100644 drivers/staging/rtl8712/rtl8712_xmit.h + create mode 100644 drivers/staging/rtl8712/rtl871x_byteorder.h + create mode 100644 drivers/staging/rtl8712/rtl871x_cmd.c + create mode 100644 drivers/staging/rtl8712/rtl871x_cmd.h + create mode 100644 drivers/staging/rtl8712/rtl871x_debug.h + create mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.c + create mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.h + create mode 100644 drivers/staging/rtl8712/rtl871x_event.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ht.h + create mode 100644 drivers/staging/rtl8712/rtl871x_io.c + create mode 100644 drivers/staging/rtl8712/rtl871x_io.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_linux.c + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.c + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.h + create mode 100644 drivers/staging/rtl8712/rtl871x_led.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mlme.c + create mode 100644 drivers/staging/rtl8712/rtl871x_mlme.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mp.c + create mode 100644 drivers/staging/rtl8712/rtl871x_mp.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.c + create mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.c + create mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_recv.c + create mode 100644 drivers/staging/rtl8712/rtl871x_recv.h + create mode 100644 drivers/staging/rtl8712/rtl871x_rf.h + create mode 100644 drivers/staging/rtl8712/rtl871x_security.c + create mode 100644 drivers/staging/rtl8712/rtl871x_security.h + create mode 100644 drivers/staging/rtl8712/rtl871x_sta_mgt.c + create mode 100644 drivers/staging/rtl8712/rtl871x_wlan_sme.h + create mode 100644 drivers/staging/rtl8712/rtl871x_xmit.c + create mode 100644 drivers/staging/rtl8712/rtl871x_xmit.h + create mode 100644 drivers/staging/rtl8712/sta_info.h + create mode 100644 drivers/staging/rtl8712/swab.h + create mode 100644 drivers/staging/rtl8712/usb_halinit.c + create mode 100644 drivers/staging/rtl8712/usb_intf.c + create mode 100644 drivers/staging/rtl8712/usb_ops.c + create mode 100644 drivers/staging/rtl8712/usb_ops.h + create mode 100644 drivers/staging/rtl8712/usb_ops_linux.c + create mode 100644 drivers/staging/rtl8712/usb_osintf.h + create mode 100644 drivers/staging/rtl8712/usb_vendor_req.h + create mode 100644 drivers/staging/rtl8712/wifi.h + create mode 100644 drivers/staging/rtl8712/wlan_bssdef.h + create mode 100644 drivers/staging/rtl8712/xmit_linux.c + create mode 100644 drivers/staging/rtl8712/xmit_osdep.h + create mode 100644 drivers/staging/sbe-2t3e3/2t3e3.h + create mode 100644 drivers/staging/sbe-2t3e3/Kconfig + create mode 100644 drivers/staging/sbe-2t3e3/Makefile + create mode 100644 drivers/staging/sbe-2t3e3/TODO + create mode 100644 drivers/staging/sbe-2t3e3/cpld.c + create mode 100644 drivers/staging/sbe-2t3e3/ctrl.c + create mode 100644 drivers/staging/sbe-2t3e3/ctrl.h + create mode 100644 drivers/staging/sbe-2t3e3/dc.c + create mode 100644 drivers/staging/sbe-2t3e3/exar7250.c + create mode 100644 drivers/staging/sbe-2t3e3/exar7300.c + create mode 100644 drivers/staging/sbe-2t3e3/intr.c + create mode 100644 drivers/staging/sbe-2t3e3/io.c + create mode 100644 drivers/staging/sbe-2t3e3/main.c + create mode 100644 drivers/staging/sbe-2t3e3/maps.c + create mode 100644 drivers/staging/sbe-2t3e3/module.c + create mode 100644 drivers/staging/sbe-2t3e3/netdev.c + rename drivers/staging/tidspbridge/{services => core}/sync.c (85%) + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfg.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/services.h + delete mode 100644 drivers/staging/tidspbridge/services/cfg.c + delete mode 100644 drivers/staging/tidspbridge/services/ntfy.c + delete mode 100644 drivers/staging/tidspbridge/services/services.c + create mode 100644 drivers/staging/udlfb/udlfb.txt + create mode 100644 drivers/staging/westbridge/Kconfig + create mode 100644 drivers/staging/westbridge/TODO + create mode 100644 drivers/staging/westbridge/astoria/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/Makefile + create mode 100644 drivers/staging/westbridge/astoria/api/Makefile + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasdma.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasintr.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmisc.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmtp.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasstorage.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasusb.c + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/cyashaldef.h + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasomapdev_kernel.h + create mode 100644 drivers/staging/westbridge/astoria/block/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/block/Makefile + create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_block.c + create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c + create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h + create mode 100644 drivers/staging/westbridge/astoria/device/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/device/Makefile + create mode 100644 drivers/staging/westbridge/astoria/device/cyandevice_export.h + create mode 100644 drivers/staging/westbridge/astoria/device/cyasdevice.c + create mode 100644 drivers/staging/westbridge/astoria/gadget/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/gadget/Makefile + create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.c + create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.h + create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget_ioctl.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanerr.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmedia.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmisc.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanregs.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyansdkversion.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanstorage.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantioch.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantypes.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanusb.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_end.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_start.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyascast.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashalcb.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslep2pep.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslowlevel.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmedia.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc_dep.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmtp.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasregs.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage_dep.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastoria.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastsdkversion.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastypes.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb_dep.h + delete mode 100644 drivers/staging/zram/zram_ioctl.h + create mode 100644 drivers/staging/zram/zram_sysfs.c +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -r ../rebase-tmp |