$ date Mon Aug 29 10:31:02 EST 2011 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at b4ca46e x86-32: Fix boot with CONFIG_X86_INVD_BUG Merging origin/master $ git merge origin/master Updating b4ca46e..c11a7e2 Fast-forward Documentation/power/runtime_pm.txt | 3 +- MAINTAINERS | 7 +- arch/alpha/include/asm/sysinfo.h | 9 -- arch/alpha/include/asm/thread_info.h | 8 +- arch/alpha/kernel/osf_sys.c | 12 ++- arch/alpha/kernel/systbls.S | 2 +- arch/arm/kernel/calls.S | 2 +- arch/arm/mach-shmobile/board-ap4evb.c | 1 + arch/arm/mach-shmobile/board-mackerel.c | 1 + arch/arm/mach-shmobile/clock-sh7372.c | 2 + arch/arm/plat-omap/omap_device.c | 3 +- arch/avr32/kernel/syscall_table.S | 2 +- arch/blackfin/mach-common/entry.S | 2 +- arch/cris/arch-v10/kernel/entry.S | 2 +- arch/cris/arch-v32/kernel/entry.S | 2 +- arch/cris/include/asm/serial.h | 9 ++ arch/frv/kernel/entry.S | 2 +- arch/h8300/kernel/syscalls.S | 2 +- arch/ia64/kernel/entry.S | 2 +- arch/m32r/kernel/syscall_table.S | 2 +- arch/m68k/kernel/syscalltable.S | 2 +- arch/microblaze/kernel/syscall_table.S | 2 +- arch/mips/kernel/scall32-o32.S | 2 +- arch/mips/kernel/scall64-64.S | 2 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mn10300/kernel/entry.S | 2 +- arch/powerpc/sysdev/fsl_rio.c | 5 +- arch/s390/kernel/compat_wrapper.S | 6 -- arch/s390/kernel/early.c | 14 ++-- arch/s390/kernel/ipl.c | 7 +- arch/s390/kernel/syscalls.S | 2 +- arch/sh/kernel/syscalls_32.S | 2 +- arch/sh/kernel/syscalls_64.S | 2 +- arch/sparc/kernel/sys32.S | 1 - arch/sparc/kernel/systbls_32.S | 2 +- arch/sparc/kernel/systbls_64.S | 2 +- arch/x86/ia32/ia32entry.S | 2 +- arch/x86/include/asm/unistd_64.h | 2 +- arch/x86/kernel/syscall_table_32.S | 2 +- arch/x86/platform/mrst/mrst.c | 4 +- arch/xtensa/include/asm/unistd.h | 2 +- drivers/base/devres.c | 1 + drivers/base/devtmpfs.c | 2 +- drivers/base/platform.c | 2 +- drivers/base/power/clock_ops.c | 40 ++++++----- drivers/char/msm_smd_pkt.c | 5 +- drivers/firewire/sbp2.c | 4 + drivers/firmware/google/gsmi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/leds/leds-ams-delta.c | 1 + drivers/leds/leds-bd2802.c | 5 + drivers/leds/leds-hp6xx.c | 1 + drivers/misc/Kconfig | 1 + drivers/misc/ab8500-pwm.c | 2 +- drivers/misc/fsa9480.c | 4 +- drivers/misc/pti.c | 2 + drivers/misc/ti-st/st_core.c | 10 ++- drivers/misc/ti-st/st_kim.c | 33 ++++++++ drivers/misc/ti-st/st_ll.c | 19 +++++ drivers/net/rionet.c | 23 ++---- drivers/rapidio/rio-scan.c | 3 +- drivers/rtc/rtc-s3c.c | 79 ++++++++------------ drivers/s390/block/dasd_ioctl.c | 10 ++- drivers/s390/char/sclp_cmd.c | 6 +- drivers/staging/brcm80211/brcmsmac/otp.c | 1 + drivers/staging/brcm80211/brcmsmac/types.h | 1 + drivers/staging/octeon/ethernet-rgmii.c | 1 + drivers/staging/octeon/ethernet-spi.c | 1 + drivers/staging/tidspbridge/core/dsp-clock.c | 1 - drivers/staging/zcache/tmem.c | 2 +- drivers/staging/zcache/zcache-main.c | 8 +- drivers/tty/pty.c | 17 ++++- drivers/tty/serial/8250.c | 8 +- drivers/tty/serial/8250_pci.c | 11 +-- drivers/tty/serial/8250_pnp.c | 3 + drivers/tty/serial/atmel_serial.c | 8 +- drivers/tty/serial/max3107-aava.c | 2 +- drivers/tty/serial/max3107.c | 2 +- drivers/tty/serial/mrst_max3110.c | 2 +- drivers/tty/serial/omap-serial.c | 3 +- drivers/tty/serial/pch_uart.c | 3 +- drivers/tty/serial/samsung.c | 8 ++- drivers/tty/serial/serial_core.c | 5 + drivers/tty/serial/sh-sci.c | 1 + drivers/tty/serial/ucc_uart.c | 2 +- drivers/tty/tty_io.c | 3 +- drivers/usb/core/hcd.c | 2 + drivers/usb/gadget/f_phonet.c | 1 + drivers/usb/host/ehci-hub.c | 7 +- drivers/usb/host/ehci-s5p.c | 1 + drivers/usb/host/xhci-hub.c | 17 +++- drivers/usb/host/xhci-ring.c | 90 ++++++++++++++++------- drivers/usb/host/xhci.c | 28 ++++++- drivers/usb/musb/blackfin.c | 1 + drivers/usb/musb/cppi_dma.c | 26 ++++-- drivers/usb/musb/musb_core.h | 12 ++- drivers/usb/musb/musb_gadget.c | 4 +- drivers/usb/musb/musb_regs.h | 6 +- drivers/usb/musb/tusb6010.c | 1 + drivers/usb/musb/tusb6010_omap.c | 1 + drivers/usb/musb/ux500_dma.c | 38 +++++---- drivers/usb/serial/ftdi_sio.c | 20 +++++- drivers/usb/serial/option.c | 104 +++++++++++++++++++++++++- drivers/video/backlight/adp8870_bl.c | 2 +- drivers/video/backlight/ep93xx_bl.c | 2 +- drivers/video/backlight/pwm_bl.c | 9 ++ drivers/w1/masters/ds2490.c | 4 +- drivers/w1/masters/matrox_w1.c | 4 +- drivers/w1/slaves/w1_ds2408.c | 2 +- drivers/w1/slaves/w1_smem.c | 4 +- drivers/w1/slaves/w1_therm.c | 4 +- drivers/w1/w1.c | 4 +- drivers/w1/w1.h | 2 +- drivers/w1/w1_family.c | 2 +- drivers/w1/w1_family.h | 2 +- drivers/w1/w1_int.c | 2 +- drivers/w1/w1_int.h | 2 +- drivers/w1/w1_io.c | 2 +- drivers/w1/w1_log.h | 2 +- drivers/w1/w1_netlink.c | 2 +- drivers/w1/w1_netlink.h | 2 +- fs/compat.c | 5 - include/asm-generic/unistd.h | 2 +- include/linux/compat.h | 1 - include/linux/connector.h | 2 +- include/linux/pwm_backlight.h | 1 + include/linux/rio_regs.h | 18 ++-- include/linux/syscalls.h | 3 - include/linux/ti_wilink_st.h | 27 +++++++- include/linux/tty.h | 2 + include/linux/tty_driver.h | 3 + kernel/printk.c | 2 +- kernel/sys_ni.c | 1 - mm/memcontrol.c | 26 ++----- mm/vmscan.c | 19 +++-- scripts/checkpatch.pl | 3 +- scripts/get_maintainer.pl | 2 +- sound/pci/hda/patch_conexant.c | 57 +++++++++----- sound/pci/hda/patch_realtek.c | 28 ++++--- sound/soc/blackfin/bf5xx-ad193x.c | 2 +- sound/soc/codecs/ad193x.c | 11 +-- sound/soc/codecs/ad193x.h | 5 +- sound/soc/codecs/sta32x.c | 1 + sound/soc/codecs/wm8962.c | 12 ++- sound/soc/codecs/wm8996.c | 28 +++++--- sound/soc/ep93xx/ep93xx-i2s.c | 5 +- sound/soc/fsl/fsl_dma.c | 2 + sound/soc/fsl/mpc8610_hpcd.c | 18 ++-- sound/soc/fsl/p1022_ds.c | 4 +- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/omap/ams-delta.c | 6 +- sound/soc/samsung/Kconfig | 1 + sound/soc/samsung/h1940_uda1380.c | 1 + sound/soc/samsung/rx1950_uda1380.c | 1 + sound/soc/samsung/speyside_wm8962.c | 6 ++ sound/soc/soc-core.c | 2 +- sound/soc/soc-io.c | 23 ++++++ sound/soc/soc-jack.c | 2 +- sound/soc/soc-pcm.c | 3 + sound/soc/tegra/tegra_wm8903.c | 4 +- 161 files changed, 821 insertions(+), 428 deletions(-) create mode 100644 arch/cris/include/asm/serial.h Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. $ git am -3 ../patches/0001-remove-remaining-references-to-nfsservctl.patch Applying: remove remaining references to nfsservctl Merging kbuild-current/rc-fixes $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging 52xx-and-virtex-current/powerpc/merge $ git merge 52xx-and-virtex-current/powerpc/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Auto-merging MAINTAINERS Merge made by recursive. Documentation/ABI/testing/sysfs-class-scsi_host | 13 + MAINTAINERS | 11 + drivers/scsi/hpsa.c | 57 +++-- drivers/scsi/isci/host.c | 13 +- drivers/scsi/isci/host.h | 3 + drivers/scsi/isci/init.c | 47 +++-- drivers/scsi/isci/phy.c | 13 + drivers/scsi/isci/registers.h | 12 + drivers/scsi/isci/request.c | 30 ++-- drivers/scsi/isci/unsolicited_frame_control.c | 2 +- drivers/scsi/isci/unsolicited_frame_control.h | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 7 +- drivers/scsi/qla2xxx/qla_dbg.c | 36 ++-- drivers/scsi/qla2xxx/qla_def.h | 2 + drivers/scsi/qla2xxx/qla_fw.h | 5 + drivers/scsi/qla2xxx/qla_init.c | 3 - drivers/scsi/qla2xxx/qla_inline.h | 29 +++ drivers/scsi/qla2xxx/qla_iocb.c | 282 +++++++++++++++++++---- drivers/scsi/qla2xxx/qla_isr.c | 109 +++++++-- drivers/scsi/qla2xxx/qla_mid.c | 2 +- drivers/scsi/qla2xxx/qla_nx.c | 25 +- drivers/scsi/qla2xxx/qla_os.c | 30 ++- drivers/scsi/qla2xxx/qla_version.h | 2 +- 23 files changed, 562 insertions(+), 173 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-scsi_host Merging net-current/master $ git merge net-current/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 4 +- drivers/bcma/main.c | 12 ++++++ drivers/bluetooth/ath3k.c | 1 + drivers/bluetooth/btusb.c | 13 +++++-- drivers/net/can/ti_hecc.c | 3 +- drivers/net/cassini.c | 3 +- drivers/net/ibmveth.c | 12 +++++-- drivers/net/phy/national.c | 17 ++++++--- drivers/net/sh_eth.c | 1 + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 4 ++ drivers/net/wireless/ath/carl9170/main.c | 4 ++- drivers/net/wireless/rt2x00/rt2x00usb.c | 14 +------- drivers/net/wireless/wl12xx/main.c | 1 + drivers/net/wireless/wl12xx/sdio.c | 2 +- drivers/net/wireless/wl12xx/testmode.c | 45 ------------------------ include/net/cfg80211.h | 3 ++ net/bluetooth/af_bluetooth.c | 6 ++-- net/bluetooth/bnep/bnep.h | 1 + net/bluetooth/bnep/core.c | 13 ++++--- net/bluetooth/cmtp/capi.c | 3 +- net/bluetooth/cmtp/cmtp.h | 1 + net/bluetooth/cmtp/core.c | 20 ++++++---- net/bluetooth/hci_core.c | 8 +++-- net/bluetooth/hidp/core.c | 19 +++++----- net/bluetooth/l2cap_core.c | 6 ++-- net/bluetooth/l2cap_sock.c | 30 ++++++++-------- net/bluetooth/rfcomm/core.c | 17 ++++----- net/bluetooth/rfcomm/sock.c | 28 +++++++------- net/bluetooth/sco.c | 28 +++++++------- net/bridge/br_multicast.c | 21 +++++++---- net/core/neighbour.c | 8 +++- net/core/netpoll.c | 4 ++- net/ipv4/igmp.c | 2 +- net/ipv6/mcast.c | 2 +- net/mac80211/main.c | 2 +- net/socket.c | 10 +++-- net/wireless/core.c | 7 ++++ net/wireless/sysfs.c | 6 ++- 39 files changed, 200 insertions(+), 183 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 Merge made by recursive. drivers/pci/hotplug/shpchp_core.c | 4 ++-- drivers/pci/hotplug/shpchp_hpc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging driver-core.current/driver-core-linus $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus $ git merge staging.current/staging-linus Already up-to-date. 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/input/keyboard/adp5588-keys.c | 1 - drivers/input/misc/cm109.c | 2 +- drivers/input/tablet/wacom_sys.c | 14 -------------- drivers/input/tablet/wacom_wac.c | 10 +++++----- 4 files changed, 6 insertions(+), 21 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Merge made by recursive. drivers/md/linear.h | 2 +- drivers/md/md.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging sh-current/sh-fixes-for-linus $ git merge sh-current/sh-fixes-for-linus Auto-merging drivers/tty/serial/sh-sci.c Merge made by recursive. arch/sh/include/asm/ptrace.h | 2 +- arch/sh/kernel/idle.c | 2 +- drivers/clocksource/sh_cmt.c | 34 +++++++++++++++++++- drivers/sh/intc/chip.c | 3 ++ drivers/tty/serial/sh-sci.c | 69 +++++++++++++++++++++++++++++++++++------ 5 files changed, 96 insertions(+), 14 deletions(-) Merging rmobile-current/rmobile-fixes-for-linus $ git merge rmobile-current/rmobile-fixes-for-linus Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/mach-shmobile/clock-sh7372.c Merge made by recursive. arch/arm/boot/compressed/mmcif-sh7372.c | 2 +- arch/arm/boot/compressed/sdhi-sh7372.c | 2 +- arch/arm/mach-shmobile/board-ag5evm.c | 3 ++- arch/arm/mach-shmobile/board-mackerel.c | 4 ++++ arch/arm/mach-shmobile/clock-sh7372.c | 8 ++++---- arch/arm/mach-shmobile/setup-sh7372.c | 30 +++++++++++++++--------------- 6 files changed, 27 insertions(+), 22 deletions(-) Merging fbdev-current/fbdev-fixes-for-linus $ git merge fbdev-current/fbdev-fixes-for-linus Auto-merging drivers/video/msm/mdp.c Auto-merging drivers/video/udlfb.c Merge made by recursive. drivers/video/carminefb.c | 6 +++--- drivers/video/msm/mdp.c | 4 +++- drivers/video/s3c2410fb.c | 1 - drivers/video/udlfb.c | 21 +++++++++++++++------ 4 files changed, 21 insertions(+), 11 deletions(-) Merging devicetree-current/devicetree/merge $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging spi-current/spi/merge $ git merge spi-current/spi/merge Already up-to-date. Merging arm/for-next $ git merge arm/for-next Removing arch/arm/include/asm/auxvec.h Removing arch/arm/include/asm/bitsperlong.h Removing arch/arm/include/asm/cputime.h Removing arch/arm/include/asm/emergency-restart.h Removing arch/arm/include/asm/errno.h Removing arch/arm/include/asm/ioctl.h Removing arch/arm/include/asm/irq_regs.h Removing arch/arm/include/asm/kdebug.h Removing arch/arm/include/asm/local.h Removing arch/arm/include/asm/local64.h Removing arch/arm/include/asm/percpu.h Removing arch/arm/include/asm/poll.h Removing arch/arm/include/asm/resource.h Removing arch/arm/include/asm/sections.h Removing arch/arm/include/asm/siginfo.h Removing arch/arm/include/asm/sizes.h Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h Auto-merging arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h Auto-merging arch/arm/mach-shmobile/board-ag5evm.c Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h Auto-merging drivers/gpio/gpio-davinci.c Auto-merging drivers/gpio/gpio-ks8695.c Auto-merging drivers/gpio/gpio-lpc32xx.c Auto-merging drivers/gpio/gpio-sa1100.c Merge made by recursive. Documentation/devicetree/bindings/arm/l2cc.txt | 42 ++++ arch/arm/Kconfig | 55 ++++- arch/arm/Makefile | 3 + arch/arm/boot/Makefile | 9 + arch/arm/boot/compressed/Makefile | 8 + arch/arm/common/gic.c | 17 +- arch/arm/common/scoop.c | 2 +- arch/arm/include/asm/Kbuild | 17 ++ arch/arm/include/asm/auxvec.h | 4 - arch/arm/include/asm/bitsperlong.h | 1 - arch/arm/include/asm/cputime.h | 6 - arch/arm/include/asm/cputype.h | 6 + arch/arm/include/asm/dma-mapping.h | 9 +- arch/arm/include/asm/ecard.h | 1 - arch/arm/include/asm/emergency-restart.h | 6 - arch/arm/include/asm/errno.h | 6 - arch/arm/include/asm/gpio.h | 19 ++ arch/arm/include/asm/hardware/cache-l2x0.h | 19 ++- arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 + arch/arm/include/asm/io.h | 21 ++ arch/arm/include/asm/ioctl.h | 1 - arch/arm/include/asm/irq_regs.h | 1 - arch/arm/include/asm/kdebug.h | 1 - arch/arm/include/asm/local.h | 1 - arch/arm/include/asm/local64.h | 1 - arch/arm/include/asm/mach/arch.h | 2 +- arch/arm/include/asm/memory.h | 16 -- arch/arm/include/asm/module.h | 4 - arch/arm/include/asm/percpu.h | 6 - arch/arm/include/asm/pgalloc.h | 2 +- arch/arm/include/asm/pgtable.h | 23 +- arch/arm/include/asm/pmu.h | 10 +- arch/arm/include/asm/poll.h | 1 - arch/arm/include/asm/resource.h | 6 - arch/arm/include/asm/sections.h | 1 - arch/arm/include/asm/siginfo.h | 6 - arch/arm/include/asm/sizes.h | 21 -- arch/arm/include/asm/smp.h | 6 + arch/arm/include/asm/system.h | 3 +- arch/arm/include/asm/tlb.h | 1 + arch/arm/include/asm/topology.h | 33 +++ arch/arm/kernel/Makefile | 1 + arch/arm/kernel/ecard.c | 36 +-- arch/arm/kernel/entry-armv.S | 44 +++- arch/arm/kernel/head.S | 135 ++++------- arch/arm/kernel/module.c | 2 +- arch/arm/kernel/pmu.c | 26 +- arch/arm/kernel/relocate_kernel.S | 3 +- arch/arm/kernel/setup.c | 56 +++-- arch/arm/kernel/smp.c | 20 ++ arch/arm/kernel/smp_twd.c | 4 +- arch/arm/kernel/topology.c | 148 +++++++++++ arch/arm/mach-at91/Makefile.boot | 6 +- arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91rm9200_devices.c | 2 +- arch/arm/mach-at91/at91sam9260_devices.c | 2 +- arch/arm/mach-at91/at91sam9261_devices.c | 2 +- arch/arm/mach-at91/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 2 + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-at91/board-1arm.c | 2 +- arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-cap9adk.c | 2 +- arch/arm/mach-at91/board-carmeva.c | 2 +- arch/arm/mach-at91/board-cpu9krea.c | 2 +- arch/arm/mach-at91/board-cpuat91.c | 2 +- arch/arm/mach-at91/board-csb337.c | 2 +- arch/arm/mach-at91/board-csb637.c | 2 +- arch/arm/mach-at91/board-eb9200.c | 2 +- arch/arm/mach-at91/board-ecbat91.c | 2 +- arch/arm/mach-at91/board-kafa.c | 2 +- arch/arm/mach-at91/board-kb9202.c | 2 +- arch/arm/mach-at91/board-neocore926.c | 2 +- arch/arm/mach-at91/board-picotux200.c | 2 +- arch/arm/mach-at91/board-qil-a9260.c | 2 +- arch/arm/mach-at91/board-rm9200dk.c | 2 +- arch/arm/mach-at91/board-rm9200ek.c | 2 +- arch/arm/mach-at91/board-sam9-l9260.c | 2 +- arch/arm/mach-at91/board-sam9260ek.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 2 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9g20ek.c | 2 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-at91/board-usb-a9260.c | 2 +- arch/arm/mach-at91/board-usb-a9263.c | 2 +- arch/arm/mach-at91/board-yl-9200.c | 2 +- arch/arm/mach-at91/gpio.c | 4 +- arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 - arch/arm/mach-at91/include/mach/gpio.h | 5 - arch/arm/mach-at91/leds.c | 2 +- arch/arm/mach-at91/pm.c | 2 +- arch/arm/mach-bcmring/Makefile.boot | 2 +- arch/arm/mach-bcmring/include/mach/memory.h | 5 - arch/arm/mach-bcmring/mm.c | 3 + arch/arm/mach-clps711x/Makefile.boot | 2 +- arch/arm/mach-clps711x/autcpu12.c | 2 +- arch/arm/mach-clps711x/cdb89712.c | 2 +- arch/arm/mach-clps711x/ceiva.c | 2 +- arch/arm/mach-clps711x/clep7312.c | 2 +- arch/arm/mach-clps711x/edb7211-arch.c | 2 +- arch/arm/mach-clps711x/fortunet.c | 1 - arch/arm/mach-clps711x/p720t.c | 2 +- arch/arm/mach-cns3xxx/Makefile.boot | 2 +- arch/arm/mach-cns3xxx/cns3420vb.c | 2 +- arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/Makefile.boot | 4 +- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- arch/arm/mach-davinci/board-dm365-evm.c | 2 +- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 4 +- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- arch/arm/mach-davinci/board-sffsdr.c | 2 +- arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +- arch/arm/mach-davinci/common.c | 3 + arch/arm/mach-davinci/da830.c | 3 +- arch/arm/mach-davinci/da850.c | 3 +- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 3 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/gpio-davinci.h | 91 +++++++ arch/arm/mach-davinci/include/mach/gpio.h | 79 +------ arch/arm/mach-davinci/include/mach/memory.h | 5 - arch/arm/mach-davinci/tnetv107x.c | 3 +- arch/arm/mach-dove/Makefile.boot | 2 +- arch/arm/mach-dove/cm-a510.c | 2 +- arch/arm/mach-dove/dove-db-setup.c | 2 +- arch/arm/mach-ebsa110/Makefile.boot | 2 +- arch/arm/mach-ebsa110/core.c | 2 +- arch/arm/mach-ebsa110/include/mach/io.h | 2 - arch/arm/mach-ep93xx/Makefile.boot | 10 +- arch/arm/mach-ep93xx/adssphere.c | 2 +- arch/arm/mach-ep93xx/edb93xx.c | 16 +- arch/arm/mach-ep93xx/gesbc9312.c | 2 +- arch/arm/mach-ep93xx/include/mach/gpio.h | 17 +-- arch/arm/mach-ep93xx/include/mach/ts72xx.h | 26 ++- arch/arm/mach-ep93xx/micro9.c | 8 +- arch/arm/mach-ep93xx/simone.c | 4 +- arch/arm/mach-ep93xx/snappercl15.c | 2 +- arch/arm/mach-ep93xx/ts72xx.c | 2 +- arch/arm/mach-exynos4/Makefile.boot | 2 +- arch/arm/mach-exynos4/include/mach/gpio.h | 7 - arch/arm/mach-exynos4/mach-armlex4210.c | 2 +- arch/arm/mach-exynos4/mach-nuri.c | 2 +- arch/arm/mach-exynos4/mach-smdkc210.c | 2 +- arch/arm/mach-exynos4/mach-smdkv310.c | 2 +- arch/arm/mach-exynos4/mach-universal_c210.c | 2 +- arch/arm/mach-footbridge/Kconfig | 1 + arch/arm/mach-footbridge/Makefile.boot | 2 +- arch/arm/mach-footbridge/cats-hw.c | 2 +- arch/arm/mach-footbridge/ebsa285.c | 2 +- arch/arm/mach-footbridge/include/mach/io.h | 2 - arch/arm/mach-footbridge/netwinder-hw.c | 2 +- arch/arm/mach-footbridge/personal.c | 2 +- arch/arm/mach-gemini/Makefile.boot | 4 +- arch/arm/mach-gemini/board-nas4220b.c | 2 +- arch/arm/mach-gemini/board-rut1xx.c | 2 +- arch/arm/mach-gemini/board-wbd111.c | 2 +- arch/arm/mach-gemini/board-wbd222.c | 2 +- arch/arm/mach-gemini/include/mach/gpio.h | 5 - arch/arm/mach-h720x/Makefile.boot | 2 +- arch/arm/mach-h720x/h7201-eval.c | 2 +- arch/arm/mach-h720x/h7202-eval.c | 2 +- arch/arm/mach-imx/Makefile.boot | 10 +- arch/arm/mach-imx/iomux-imx31.c | 3 +- arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- arch/arm/mach-imx/mach-cpuimx27.c | 4 +- arch/arm/mach-imx/mach-cpuimx35.c | 4 +- arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 4 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- arch/arm/mach-imx/mach-imx27ipcam.c | 2 +- arch/arm/mach-imx/mach-imx27lite.c | 2 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 2 +- arch/arm/mach-imx/mach-mx1ads.c | 4 +- arch/arm/mach-imx/mach-mx21ads.c | 2 +- arch/arm/mach-imx/mach-mx25_3ds.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- arch/arm/mach-imx/mach-mx27ads.c | 5 +- arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- arch/arm/mach-imx/mach-mx31ads.c | 2 +- arch/arm/mach-imx/mach-mx31lilly.c | 2 +- arch/arm/mach-imx/mach-mx31lite.c | 2 +- arch/arm/mach-imx/mach-mx31moboard.c | 2 +- arch/arm/mach-imx/mach-mx35_3ds.c | 2 +- arch/arm/mach-imx/mach-mxt_td60.c | 2 +- arch/arm/mach-imx/mach-pca100.c | 2 +- arch/arm/mach-imx/mach-pcm037.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/mach-imx/mach-pcm043.c | 2 +- arch/arm/mach-imx/mach-qong.c | 2 +- arch/arm/mach-imx/mach-scb9328.c | 2 +- arch/arm/mach-integrator/Makefile.boot | 2 +- arch/arm/mach-integrator/include/mach/io.h | 2 - arch/arm/mach-integrator/integrator_ap.c | 2 +- arch/arm/mach-integrator/integrator_cp.c | 2 +- arch/arm/mach-iop13xx/Makefile.boot | 2 +- arch/arm/mach-iop13xx/iq81340mc.c | 2 +- arch/arm/mach-iop13xx/iq81340sc.c | 2 +- arch/arm/mach-iop32x/Makefile.boot | 2 +- arch/arm/mach-iop32x/em7210.c | 2 +- arch/arm/mach-iop32x/glantank.c | 2 +- arch/arm/mach-iop32x/iq31244.c | 4 +- arch/arm/mach-iop32x/iq80321.c | 2 +- arch/arm/mach-iop32x/n2100.c | 2 +- arch/arm/mach-iop33x/Makefile.boot | 2 +- arch/arm/mach-iop33x/iq80331.c | 2 +- arch/arm/mach-iop33x/iq80332.c | 2 +- arch/arm/mach-ixp2000/Makefile.boot | 2 +- arch/arm/mach-ixp2000/core.c | 4 +- arch/arm/mach-ixp2000/enp2611.c | 2 +- .../include/mach/{gpio.h => gpio-ixp2000.h} | 4 +- arch/arm/mach-ixp2000/ixdp2400.c | 2 +- arch/arm/mach-ixp2000/ixdp2800.c | 2 +- arch/arm/mach-ixp2000/ixdp2x00.c | 4 +- arch/arm/mach-ixp2000/ixdp2x01.c | 6 +- arch/arm/mach-ixp23xx/Makefile.boot | 2 +- arch/arm/mach-ixp23xx/espresso.c | 2 +- arch/arm/mach-ixp23xx/ixdp2351.c | 2 +- arch/arm/mach-ixp23xx/roadrunner.c | 2 +- arch/arm/mach-ixp4xx/Makefile.boot | 2 +- arch/arm/mach-ixp4xx/avila-setup.c | 4 +- arch/arm/mach-ixp4xx/common-pci.c | 3 +- arch/arm/mach-ixp4xx/coyote-setup.c | 4 +- arch/arm/mach-ixp4xx/dsmg600-setup.c | 5 +- arch/arm/mach-ixp4xx/fsg-setup.c | 5 +- arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 +- arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +- arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 +- arch/arm/mach-ixp4xx/include/mach/gpio.h | 3 + arch/arm/mach-ixp4xx/include/mach/io.h | 2 - arch/arm/mach-ixp4xx/ixdp425-setup.c | 8 +- arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +- arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +- arch/arm/mach-ixp4xx/vulcan-setup.c | 2 +- arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +- arch/arm/mach-kirkwood/Makefile.boot | 2 +- arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +- arch/arm/mach-kirkwood/dockstar-setup.c | 2 +- arch/arm/mach-kirkwood/guruplug-setup.c | 2 +- arch/arm/mach-kirkwood/irq.c | 3 +- arch/arm/mach-kirkwood/mpp.c | 3 +- arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +- arch/arm/mach-kirkwood/openrd-setup.c | 6 +- arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +- arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +- arch/arm/mach-kirkwood/t5325-setup.c | 2 +- arch/arm/mach-kirkwood/ts219-setup.c | 2 +- arch/arm/mach-kirkwood/ts41x-setup.c | 2 +- arch/arm/mach-ks8695/Makefile | 2 +- arch/arm/mach-ks8695/Makefile.boot | 2 +- arch/arm/mach-ks8695/board-acs5k.c | 6 +- arch/arm/mach-ks8695/board-dsm320.c | 6 +- arch/arm/mach-ks8695/board-micrel.c | 6 +- arch/arm/mach-ks8695/devices.c | 1 + arch/arm/mach-ks8695/include/mach/gpio-ks8695.h | 39 +++ arch/arm/mach-ks8695/include/mach/gpio.h | 38 --- arch/arm/mach-ks8695/leds.c | 4 +- arch/arm/mach-lpc32xx/Makefile | 2 +- arch/arm/mach-lpc32xx/Makefile.boot | 2 +- arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h | 50 ++++ arch/arm/mach-lpc32xx/include/mach/gpio.h | 74 ------ arch/arm/mach-lpc32xx/phy3250.c | 3 +- arch/arm/mach-mmp/Makefile.boot | 2 +- arch/arm/mach-mmp/aspenite.c | 5 +- arch/arm/mach-mmp/mmp2.c | 3 +- arch/arm/mach-mmp/pxa168.c | 3 +- arch/arm/mach-mmp/pxa910.c | 3 +- arch/arm/mach-mmp/tavorevb.c | 3 +- arch/arm/mach-mmp/ttc_dkb.c | 2 +- arch/arm/mach-msm/Makefile.boot | 2 +- arch/arm/mach-msm/board-halibut.c | 2 +- arch/arm/mach-msm/board-mahimahi.c | 2 +- arch/arm/mach-msm/board-msm7x27.c | 11 +- arch/arm/mach-msm/board-msm7x30.c | 31 ++- arch/arm/mach-msm/board-msm8960.c | 22 ++ arch/arm/mach-msm/board-msm8x60.c | 25 ++ arch/arm/mach-msm/board-qsd8x50.c | 7 +- arch/arm/mach-msm/board-sapphire.c | 5 +- arch/arm/mach-msm/board-trout-mmc.c | 3 +- arch/arm/mach-msm/board-trout-panel.c | 3 +- arch/arm/mach-msm/board-trout.c | 2 +- arch/arm/mach-msm/include/mach/gpio.h | 27 +-- arch/arm/mach-msm/include/mach/memory.h | 6 +- arch/arm/mach-mv78xx0/Makefile.boot | 2 +- arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +- arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +- arch/arm/mach-mv78xx0/irq.c | 3 +- arch/arm/mach-mv78xx0/mpp.c | 3 +- arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +- arch/arm/mach-mx5/Makefile.boot | 6 +- arch/arm/mach-mx5/board-cpuimx51.c | 2 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +- arch/arm/mach-mx5/board-mx51_3ds.c | 2 +- arch/arm/mach-mx5/board-mx51_babbage.c | 2 +- arch/arm/mach-mx5/board-mx51_efikamx.c | 2 +- arch/arm/mach-mx5/board-mx51_efikasb.c | 2 +- arch/arm/mach-mxs/Makefile.boot | 2 +- arch/arm/mach-mxs/include/mach/gpio.h | 8 - arch/arm/mach-netx/Makefile.boot | 2 +- arch/arm/mach-netx/nxdb500.c | 2 +- arch/arm/mach-netx/nxdkn.c | 2 +- arch/arm/mach-netx/nxeb500hmi.c | 2 +- arch/arm/mach-nomadik/Makefile.boot | 2 +- arch/arm/mach-nomadik/board-nhk8815.c | 3 +- arch/arm/mach-nomadik/cpu-8815.c | 2 +- arch/arm/mach-nomadik/i2c-8815nhk.c | 2 +- arch/arm/mach-nomadik/include/mach/gpio.h | 2 - arch/arm/mach-nuc93x/Makefile.boot | 2 +- arch/arm/mach-nuc93x/mach-nuc932evb.c | 1 - arch/arm/mach-omap1/Makefile.boot | 2 +- arch/arm/mach-omap1/board-ams-delta.c | 5 +- arch/arm/mach-omap1/board-fsample.c | 5 +- arch/arm/mach-omap1/board-generic.c | 5 +- arch/arm/mach-omap1/board-h2-mmc.c | 3 +- arch/arm/mach-omap1/board-h2.c | 5 +- arch/arm/mach-omap1/board-h3-mmc.c | 3 +- arch/arm/mach-omap1/board-h3.c | 5 +- arch/arm/mach-omap1/board-htcherald.c | 3 +- arch/arm/mach-omap1/board-innovator.c | 5 +- arch/arm/mach-omap1/board-nokia770.c | 5 +- arch/arm/mach-omap1/board-osk.c | 5 +- arch/arm/mach-omap1/board-palmte.c | 5 +- arch/arm/mach-omap1/board-palmtt.c | 4 +- arch/arm/mach-omap1/board-palmz71.c | 4 +- arch/arm/mach-omap1/board-perseus2.c | 5 +- arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 5 +- arch/arm/mach-omap1/board-voiceblue.c | 4 +- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/fpga.c | 2 +- arch/arm/mach-omap1/io.c | 1 + arch/arm/mach-omap1/irq.c | 3 +- arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- arch/arm/mach-omap1/leds-osk.c | 3 +- arch/arm/mach-omap1/leds.c | 2 +- arch/arm/mach-omap1/serial.c | 3 +- arch/arm/mach-omap2/Makefile.boot | 2 +- arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-3630sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 2 +- arch/arm/mach-omap2/board-am3517crane.c | 2 +- arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-apollon.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 4 +- arch/arm/mach-omap2/board-cm-t3517.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-generic.c | 5 +- arch/arm/mach-omap2/board-h4.c | 5 +- arch/arm/mach-omap2/board-igep0020.c | 4 +- arch/arm/mach-omap2/board-ldp.c | 5 +- arch/arm/mach-omap2/board-n8x0.c | 6 +- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3logic.c | 4 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/board-omap3stalker.c | 2 +- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/board-omap4panda.c | 2 +- arch/arm/mach-omap2/board-overo.c | 2 +- arch/arm/mach-omap2/board-rm680.c | 2 +- arch/arm/mach-omap2/board-rx51.c | 2 +- arch/arm/mach-omap2/board-ti8168evm.c | 2 +- arch/arm/mach-omap2/board-zoom.c | 4 +- arch/arm/mach-omap2/devices.c | 3 +- arch/arm/mach-omap2/io.c | 2 +- arch/arm/mach-orion5x/Makefile.boot | 2 +- arch/arm/mach-orion5x/d2net-setup.c | 4 +- arch/arm/mach-orion5x/db88f5281-setup.c | 5 +- arch/arm/mach-orion5x/dns323-setup.c | 5 +- arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +- arch/arm/mach-orion5x/irq.c | 3 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 7 +- arch/arm/mach-orion5x/ls-chl-setup.c | 2 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +- arch/arm/mach-orion5x/lsmini-setup.c | 2 +- arch/arm/mach-orion5x/mss2-setup.c | 2 +- arch/arm/mach-orion5x/mv2120-setup.c | 5 +- arch/arm/mach-orion5x/net2big-setup.c | 2 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 5 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 5 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +- arch/arm/mach-orion5x/terastation_pro2-setup.c | 5 +- arch/arm/mach-orion5x/ts209-setup.c | 5 +- arch/arm/mach-orion5x/ts409-setup.c | 5 +- arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- arch/arm/mach-orion5x/wnr854t-setup.c | 5 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 5 +- arch/arm/mach-pnx4008/Makefile.boot | 2 +- arch/arm/mach-pnx4008/core.c | 2 +- arch/arm/mach-pnx4008/gpio.c | 3 +- .../include/mach/{gpio.h => gpio-pnx4008.h} | 2 +- arch/arm/mach-pnx4008/serial.c | 3 +- arch/arm/mach-prima2/Makefile.boot | 2 +- arch/arm/mach-prima2/prima2.c | 2 +- arch/arm/mach-pxa/Makefile.boot | 2 +- arch/arm/mach-pxa/balloon3.c | 2 +- arch/arm/mach-pxa/capc7117.c | 2 +- arch/arm/mach-pxa/cm-x2xx.c | 2 +- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/colibri-pxa270.c | 4 +- arch/arm/mach-pxa/colibri-pxa300.c | 2 +- arch/arm/mach-pxa/colibri-pxa320.c | 2 +- arch/arm/mach-pxa/csb726.c | 2 +- arch/arm/mach-pxa/em-x270.c | 4 +- arch/arm/mach-pxa/eseries.c | 12 +- arch/arm/mach-pxa/ezx.c | 12 +- arch/arm/mach-pxa/generic.c | 2 +- arch/arm/mach-pxa/gumstix.c | 2 +- arch/arm/mach-pxa/h5000.c | 2 +- arch/arm/mach-pxa/himalaya.c | 2 +- arch/arm/mach-pxa/hx4700.c | 2 +- arch/arm/mach-pxa/icontrol.c | 2 +- arch/arm/mach-pxa/include/mach/littleton.h | 2 +- arch/arm/mach-pxa/irq.c | 3 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/lpd270.c | 5 +- arch/arm/mach-pxa/lubbock.c | 2 +- arch/arm/mach-pxa/magician.c | 2 +- arch/arm/mach-pxa/mainstone.c | 5 +- arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +- arch/arm/mach-pxa/mioa701.c | 2 +- arch/arm/mach-pxa/mp900.c | 2 +- arch/arm/mach-pxa/palmld.c | 2 +- arch/arm/mach-pxa/palmt5.c | 2 +- arch/arm/mach-pxa/palmtc.c | 2 +- arch/arm/mach-pxa/palmte2.c | 2 +- arch/arm/mach-pxa/palmtreo.c | 4 +- arch/arm/mach-pxa/palmtx.c | 2 +- arch/arm/mach-pxa/palmz72.c | 2 +- arch/arm/mach-pxa/pcm027.c | 2 +- arch/arm/mach-pxa/pcm990-baseboard.c | 3 +- arch/arm/mach-pxa/pxa25x.c | 2 +- arch/arm/mach-pxa/pxa27x.c | 2 +- arch/arm/mach-pxa/pxa3xx.c | 3 +- arch/arm/mach-pxa/pxa95x.c | 3 +- arch/arm/mach-pxa/raumfeld.c | 6 +- arch/arm/mach-pxa/saar.c | 4 +- arch/arm/mach-pxa/saarb.c | 5 +- arch/arm/mach-pxa/stargate2.c | 4 +- arch/arm/mach-pxa/tavorevb.c | 2 +- arch/arm/mach-pxa/tavorevb3.c | 2 +- arch/arm/mach-pxa/trizeps4.c | 4 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-pxa/vpac270.c | 2 +- arch/arm/mach-pxa/xcep.c | 2 +- arch/arm/mach-pxa/z2.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- arch/arm/mach-pxa/zylonite.c | 2 +- arch/arm/mach-realview/Makefile.boot | 4 +- arch/arm/mach-realview/include/mach/gpio.h | 7 +- arch/arm/mach-realview/include/mach/system.h | 1 + arch/arm/mach-realview/realview_eb.c | 2 +- arch/arm/mach-realview/realview_pb1176.c | 2 +- arch/arm/mach-realview/realview_pb11mp.c | 2 +- arch/arm/mach-realview/realview_pba8.c | 2 +- arch/arm/mach-realview/realview_pbx.c | 2 +- arch/arm/mach-rpc/Makefile.boot | 2 +- arch/arm/mach-rpc/include/mach/hardware.h | 25 +- arch/arm/mach-rpc/include/mach/io.h | 193 +-------------- arch/arm/mach-rpc/riscpc.c | 4 +- arch/arm/mach-s3c2410/Makefile.boot | 4 +- arch/arm/mach-s3c2410/include/mach/gpio.h | 6 - arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 2 +- arch/arm/mach-s3c2410/include/mach/io.h | 2 - arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- arch/arm/mach-s3c2410/mach-bast.c | 2 +- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/mach-s3c2410/mach-n30.c | 4 +- arch/arm/mach-s3c2410/mach-otom.c | 2 +- arch/arm/mach-s3c2410/mach-qt2410.c | 2 +- arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- arch/arm/mach-s3c2412/mach-jive.c | 2 +- arch/arm/mach-s3c2412/mach-smdk2413.c | 6 +- arch/arm/mach-s3c2412/mach-vstms.c | 2 +- arch/arm/mach-s3c2416/mach-smdk2416.c | 2 +- arch/arm/mach-s3c2440/mach-anubis.c | 2 +- arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- arch/arm/mach-s3c2440/mach-gta02.c | 2 +- arch/arm/mach-s3c2440/mach-mini2440.c | 2 +- arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- arch/arm/mach-s3c2440/mach-osiris.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +- arch/arm/mach-s3c64xx/Makefile.boot | 2 +- arch/arm/mach-s3c64xx/cpu.c | 2 + arch/arm/mach-s3c64xx/include/mach/gpio.h | 7 - arch/arm/mach-s3c64xx/include/mach/memory.h | 2 - arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-ncp.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +- arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s5p64x0/Makefile.boot | 2 +- arch/arm/mach-s5p64x0/cpu.c | 3 + arch/arm/mach-s5p64x0/include/mach/gpio.h | 7 - arch/arm/mach-s5p64x0/include/mach/memory.h | 1 - arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +- arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +- arch/arm/mach-s5pc100/Makefile.boot | 2 +- arch/arm/mach-s5pc100/include/mach/gpio.h | 7 - arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +- arch/arm/mach-s5pv210/Makefile.boot | 2 +- arch/arm/mach-s5pv210/cpu.c | 2 + arch/arm/mach-s5pv210/include/mach/gpio.h | 7 - arch/arm/mach-s5pv210/include/mach/memory.h | 1 - arch/arm/mach-s5pv210/mach-aquila.c | 2 +- arch/arm/mach-s5pv210/mach-goni.c | 2 +- arch/arm/mach-s5pv210/mach-smdkc110.c | 2 +- arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +- arch/arm/mach-s5pv210/mach-torbreck.c | 2 +- arch/arm/mach-sa1100/Makefile | 2 +- arch/arm/mach-sa1100/Makefile.boot | 5 +- arch/arm/mach-sa1100/assabet.c | 2 +- arch/arm/mach-sa1100/badge4.c | 2 +- arch/arm/mach-sa1100/generic.c | 2 +- arch/arm/mach-sa1100/h3100.c | 2 +- arch/arm/mach-sa1100/h3600.c | 2 +- arch/arm/mach-sa1100/hackkit.c | 2 +- arch/arm/mach-sa1100/include/mach/gpio.h | 4 +- arch/arm/mach-sa1100/include/mach/io.h | 6 +- arch/arm/mach-sa1100/jornada720.c | 2 +- arch/arm/mach-sa1100/lart.c | 2 +- arch/arm/mach-sa1100/nanoengine.c | 2 +- arch/arm/mach-sa1100/shannon.c | 2 +- arch/arm/mach-sa1100/simpad.c | 2 +- arch/arm/mach-shark/Makefile.boot | 2 +- arch/arm/mach-shark/core.c | 2 +- arch/arm/mach-shmobile/Makefile.boot | 2 +- arch/arm/mach-shmobile/board-ag5evm.c | 3 + arch/arm/mach-shmobile/board-ap4evb.c | 3 + arch/arm/mach-shmobile/board-g3evm.c | 3 + arch/arm/mach-shmobile/board-g4evm.c | 3 + arch/arm/mach-shmobile/board-mackerel.c | 3 + arch/arm/mach-shmobile/include/mach/gpio.h | 24 +-- arch/arm/mach-shmobile/include/mach/memory.h | 3 - arch/arm/mach-spear3xx/Makefile.boot | 2 +- arch/arm/mach-spear3xx/spear300_evb.c | 2 +- arch/arm/mach-spear3xx/spear310_evb.c | 2 +- arch/arm/mach-spear3xx/spear320_evb.c | 2 +- arch/arm/mach-spear6xx/Makefile.boot | 2 +- arch/arm/mach-spear6xx/spear600_evb.c | 2 +- arch/arm/mach-tcc8k/Makefile.boot | 2 +- arch/arm/mach-tcc8k/board-tcc8000-sdk.c | 2 +- arch/arm/mach-tegra/Makefile.boot | 2 +- arch/arm/mach-tegra/board-harmony.c | 2 +- arch/arm/mach-tegra/board-paz00.c | 2 +- arch/arm/mach-tegra/board-seaboard.c | 6 +- arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 +- arch/arm/mach-tegra/board-trimslice.c | 2 +- arch/arm/mach-tegra/include/mach/gpio.h | 23 +-- arch/arm/mach-u300/Makefile.boot | 4 +- arch/arm/mach-u300/core.c | 3 + arch/arm/mach-u300/include/mach/gpio-u300.h | 253 +++++++++++++++++++ arch/arm/mach-u300/include/mach/gpio.h | 259 +------------------- arch/arm/mach-u300/include/mach/memory.h | 13 +- arch/arm/mach-u300/mmc.c | 2 +- arch/arm/mach-u300/u300.c | 2 +- arch/arm/mach-ux500/Makefile.boot | 2 +- arch/arm/mach-ux500/board-mop500-pins.c | 2 +- arch/arm/mach-ux500/board-mop500-u8500uib.c | 3 +- arch/arm/mach-ux500/board-mop500.c | 7 +- arch/arm/mach-ux500/board-u5500-sdi.c | 2 +- arch/arm/mach-ux500/board-u5500.c | 4 +- arch/arm/mach-ux500/cpu-db5500.c | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 2 +- arch/arm/mach-ux500/devices-common.c | 2 +- arch/arm/mach-ux500/include/mach/gpio.h | 2 - arch/arm/mach-versatile/Makefile.boot | 2 +- arch/arm/mach-versatile/include/mach/gpio.h | 7 +- arch/arm/mach-versatile/versatile_ab.c | 2 +- arch/arm/mach-versatile/versatile_pb.c | 2 +- arch/arm/mach-vexpress/Makefile.boot | 2 +- arch/arm/mach-vexpress/include/mach/io.h | 2 - arch/arm/mach-vexpress/v2m.c | 9 +- arch/arm/mach-vt8500/Makefile.boot | 2 +- arch/arm/mach-vt8500/bv07.c | 2 +- arch/arm/mach-vt8500/include/mach/gpio.h | 7 +- arch/arm/mach-vt8500/include/mach/io.h | 2 - arch/arm/mach-vt8500/wm8505_7in.c | 2 +- arch/arm/mach-w90x900/Makefile.boot | 2 +- arch/arm/mach-w90x900/include/mach/gpio.h | 6 +- arch/arm/mach-w90x900/mach-nuc910evb.c | 1 - arch/arm/mach-w90x900/mach-nuc950evb.c | 1 - arch/arm/mach-w90x900/mach-nuc960evb.c | 1 - arch/arm/mach-zynq/Makefile.boot | 2 +- arch/arm/mm/cache-l2x0.c | 103 ++++++++ arch/arm/mm/dma-mapping.c | 46 +++- arch/arm/mm/init.c | 9 - arch/arm/mm/mmu.c | 14 +- arch/arm/mm/proc-arm920.S | 2 +- arch/arm/mm/proc-arm926.S | 2 +- arch/arm/mm/proc-sa1100.S | 10 +- arch/arm/mm/proc-v6.S | 16 ++ arch/arm/mm/proc-v7.S | 6 +- arch/arm/mm/proc-xsc3.S | 6 +- arch/arm/plat-mxc/include/mach/gpio.h | 6 - arch/arm/plat-mxc/include/mach/memory.h | 15 -- .../include/plat/{gpio.h => gpio-nomadik.h} | 17 +- arch/arm/plat-omap/debug-devices.c | 3 +- arch/arm/plat-omap/debug-leds.c | 3 +- arch/arm/plat-omap/devices.c | 3 +- arch/arm/plat-omap/include/plat/gpio.h | 20 -- arch/arm/plat-omap/include/plat/io.h | 2 + arch/arm/plat-omap/include/plat/memory.h | 13 - arch/arm/plat-omap/io.c | 8 + arch/arm/plat-orion/include/plat/gpio.h | 10 +- arch/arm/plat-pxa/gpio.c | 4 +- arch/arm/plat-pxa/include/plat/gpio.h | 2 + arch/arm/plat-spear/include/plat/gpio.h | 25 +-- arch/arm/tools/mach-types | 6 +- drivers/amba/bus.c | 57 ++++- drivers/ata/pata_at91.c | 2 +- drivers/gpio/Makefile | 6 +- .../gpio.c => drivers/gpio/gpio-davinci.c | 4 +- drivers/gpio/gpio-ep93xx.c | 19 ++- .../gpio.c => drivers/gpio/gpio-ks8695.c | 4 +- .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c | 2 +- drivers/gpio/gpio-nomadik.c | 3 +- drivers/gpio/gpio-omap.c | 2 +- .../gpio.c => drivers/gpio/gpio-sa1100.c | 4 +- drivers/gpio/gpio-tegra.c | 22 ++- .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c | 0 drivers/gpio/gpio-u300.c | 1 + drivers/i2c/busses/i2c-ixp2000.c | 2 +- drivers/ide/at91_ide.c | 2 +- drivers/input/keyboard/omap-keypad.c | 2 +- drivers/mfd/menelaus.c | 2 +- drivers/mmc/host/mmci.c | 12 + drivers/mmc/host/omap.c | 2 +- drivers/mmc/host/sdhci-tegra.c | 2 +- drivers/mtd/nand/ams-delta.c | 2 +- drivers/mtd/onenand/omap2.c | 2 +- drivers/net/arm/at91_ether.c | 2 +- drivers/pcmcia/pxa2xx_vpac270.c | 2 +- drivers/spi/spi-atmel.c | 2 +- drivers/spi/spi-pl022.c | 80 ++++--- drivers/tty/serial/atmel_serial.c | 2 +- drivers/usb/host/ohci-pnx4008.c | 2 +- drivers/usb/musb/davinci.c | 2 +- drivers/video/atmel_lcdfb.c | 2 +- drivers/video/omap/lcd_apollon.c | 2 +- drivers/video/omap/lcd_h3.c | 2 +- drivers/video/omap/lcd_inn1610.c | 2 +- drivers/video/omap/lcd_ldp.c | 2 +- drivers/video/omap/lcd_osk.c | 2 +- drivers/video/omap/lcd_overo.c | 2 +- drivers/video/omap/lcd_palmtt.c | 2 +- drivers/video/pnx4008/sdum.c | 2 +- tools/perf/arch/arm/util/dwarf-regs.c | 3 + 672 files changed, 2237 insertions(+), 2078 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt delete mode 100644 arch/arm/include/asm/auxvec.h delete mode 100644 arch/arm/include/asm/bitsperlong.h delete mode 100644 arch/arm/include/asm/cputime.h delete mode 100644 arch/arm/include/asm/emergency-restart.h delete mode 100644 arch/arm/include/asm/errno.h delete mode 100644 arch/arm/include/asm/ioctl.h delete mode 100644 arch/arm/include/asm/irq_regs.h delete mode 100644 arch/arm/include/asm/kdebug.h delete mode 100644 arch/arm/include/asm/local.h delete mode 100644 arch/arm/include/asm/local64.h delete mode 100644 arch/arm/include/asm/percpu.h delete mode 100644 arch/arm/include/asm/poll.h delete mode 100644 arch/arm/include/asm/resource.h delete mode 100644 arch/arm/include/asm/sections.h delete mode 100644 arch/arm/include/asm/siginfo.h delete mode 100644 arch/arm/include/asm/sizes.h create mode 100644 arch/arm/kernel/topology.c create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%) create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (99%) create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h rename arch/arm/plat-nomadik/include/plat/{gpio.h => gpio-nomadik.h} (82%) rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (99%) rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%) rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%) rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%) rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%) Merging arm-lpae/for-next $ git merge arm-lpae/for-next Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution. Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution. Resolved 'arch/arm/include/asm/tlb.h' using previous resolution. Resolved 'arch/arm/kernel/head.S' using previous resolution. Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution. Resolved 'arch/arm/mm/mmu.c' using previous resolution. Auto-merging arch/arm/Kconfig Auto-merging arch/arm/include/asm/pgalloc.h CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h Auto-merging arch/arm/include/asm/pgtable.h CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h Auto-merging arch/arm/include/asm/system.h Auto-merging arch/arm/include/asm/tlb.h CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h Auto-merging arch/arm/kernel/head.S CONFLICT (content): Merge conflict in arch/arm/kernel/head.S Auto-merging arch/arm/kernel/setup.c Auto-merging arch/arm/mm/dma-mapping.c CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c Auto-merging arch/arm/mm/mmu.c CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b392ac2] Merge remote-tracking branch 'arm-lpae/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/Kconfig | 2 +- arch/arm/boot/compressed/head.S | 1 + arch/arm/include/asm/assembler.h | 11 + arch/arm/include/asm/page.h | 44 +--- arch/arm/include/asm/pgalloc.h | 28 ++- arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++++++ arch/arm/include/asm/pgtable-2level-types.h | 67 +++++ arch/arm/include/asm/pgtable-2level.h | 143 +++++++++ arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++ arch/arm/include/asm/pgtable-3level-types.h | 70 +++++ arch/arm/include/asm/pgtable-3level.h | 107 +++++++ arch/arm/include/asm/pgtable-hwdef.h | 81 +----- arch/arm/include/asm/pgtable.h | 211 +++++--------- arch/arm/include/asm/proc-fns.h | 21 ++ arch/arm/include/asm/setup.h | 8 + arch/arm/include/asm/system.h | 8 + arch/arm/include/asm/tlb.h | 11 +- arch/arm/include/asm/tlbflush.h | 4 +- arch/arm/kernel/head.S | 45 +++- arch/arm/kernel/hw_breakpoint.c | 8 +- arch/arm/kernel/setup.c | 10 + arch/arm/kernel/sleep.S | 2 + arch/arm/mm/Kconfig | 13 + arch/arm/mm/Makefile | 4 + arch/arm/mm/alignment.c | 2 +- arch/arm/mm/context.c | 19 +- arch/arm/mm/fault.c | 87 ++++++ arch/arm/mm/idmap.c | 36 +++- arch/arm/mm/ioremap.c | 39 ++- arch/arm/mm/mm.h | 4 +- arch/arm/mm/mmu.c | 39 +++- arch/arm/mm/pgd.c | 51 +++- arch/arm/mm/proc-macros.S | 5 +- arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++ 34 files changed, 1477 insertions(+), 301 deletions(-) create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h create mode 100644 arch/arm/include/asm/pgtable-2level-types.h create mode 100644 arch/arm/include/asm/pgtable-2level.h create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h create mode 100644 arch/arm/include/asm/pgtable-3level-types.h create mode 100644 arch/arm/include/asm/pgtable-3level.h create mode 100644 arch/arm/mm/proc-v7lpae.S Merging arm-soc/for-next $ git merge arm-soc/for-next Recorded preimage for 'arch/arm/mach-u300/Makefile.boot' Auto-merging arch/arm/Kconfig Auto-merging arch/arm/Makefile Auto-merging arch/arm/configs/imx_v4_v5_defconfig Removing arch/arm/configs/mx1_defconfig Removing arch/arm/configs/mx21_defconfig Auto-merging arch/arm/configs/mx5_defconfig Removing arch/arm/mach-mx5/devices.c Removing arch/arm/mach-mx5/devices.h Auto-merging arch/arm/mach-orion5x/dns323-setup.c Auto-merging arch/arm/mach-u300/Makefile.boot CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-u300/Makefile.boot'. [master 1ab88b8] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/Kconfig | 1 + arch/arm/Makefile | 4 +- .../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +- arch/arm/configs/mx1_defconfig | 91 - arch/arm/configs/mx21_defconfig | 97 - arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-exynos4/clock.c | 2 +- arch/arm/mach-exynos4/cpu.c | 11 +- arch/arm/mach-exynos4/include/mach/irqs.h | 5 +- arch/arm/mach-exynos4/include/mach/regs-pmu.h | 2 + arch/arm/mach-exynos4/irq-eint.c | 7 + arch/arm/mach-exynos4/mach-universal_c210.c | 4 +- arch/arm/mach-exynos4/setup-usb-phy.c | 2 +- arch/arm/mach-footbridge/dc21285.c | 1 + arch/arm/mach-imx/Kconfig | 51 +- arch/arm/mach-imx/Makefile | 10 +- arch/arm/mach-imx/cache-l2x0.c | 2 +- arch/arm/mach-imx/clock-imx25.c | 6 + arch/arm/mach-imx/clock-imx27.c | 6 +- arch/arm/mach-imx/clock-imx31.c | 8 +- arch/arm/mach-imx/clock-imx35.c | 7 +- arch/arm/mach-imx/cpu-imx25.c | 41 + arch/arm/mach-imx/cpu-imx27.c | 28 +- arch/arm/mach-imx/cpu-imx31.c | 49 +- arch/arm/mach-imx/cpu-imx35.c | 30 +- arch/arm/mach-imx/devices-imx27.h | 4 + arch/arm/mach-imx/devices-imx31.h | 4 + arch/arm/mach-imx/devices-imx35.h | 4 + arch/arm/mach-imx/mach-armadillo5x0.c | 18 +- arch/arm/mach-imx/mach-mx1ads.c | 15 +- arch/arm/mach-imx/mach-mx25_3ds.c | 10 + arch/arm/mach-mx5/Kconfig | 29 +- arch/arm/mach-mx5/Makefile | 2 +- arch/arm/mach-mx5/board-cpuimx51.c | 19 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 21 +- arch/arm/mach-mx5/board-mx51_3ds.c | 1 - arch/arm/mach-mx5/board-mx51_babbage.c | 26 +- arch/arm/mach-mx5/board-mx51_efikamx.c | 2 - arch/arm/mach-mx5/board-mx51_efikasb.c | 6 +- arch/arm/mach-mx5/board-mx53_loco.c | 20 + arch/arm/mach-mx5/clock-mx51-mx53.c | 14 +- arch/arm/mach-mx5/cpu.c | 74 +- arch/arm/mach-mx5/devices-imx51.h | 17 + arch/arm/mach-mx5/devices-imx53.h | 4 + arch/arm/mach-mx5/devices.c | 120 - arch/arm/mach-mx5/devices.h | 5 - arch/arm/mach-mx5/ehci.c | 2 +- arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 1 - arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +- arch/arm/mach-mx5/mm.c | 8 +- arch/arm/mach-mx5/mx51_efika.c | 17 +- arch/arm/mach-mxs/Kconfig | 6 + arch/arm/mach-mxs/clock-mx28.c | 8 +- arch/arm/mach-mxs/devices-mx23.h | 2 + arch/arm/mach-mxs/devices-mx28.h | 5 + arch/arm/mach-mxs/devices/Kconfig | 6 + arch/arm/mach-mxs/devices/Makefile | 2 + arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 + arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 + arch/arm/mach-mxs/include/mach/devices-common.h | 12 + arch/arm/mach-mxs/mach-mx23evk.c | 2 +- arch/arm/mach-mxs/mach-mx28evk.c | 79 +- arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 +- arch/arm/mach-mxs/mach-tx28.c | 1 + arch/arm/mach-orion5x/dns323-setup.c | 2 +- arch/arm/mach-orion5x/pci.c | 1 + arch/arm/mach-s3c64xx/pm.c | 1 + arch/arm/mach-s5p64x0/irq-eint.c | 2 +- arch/arm/mach-s5pv210/pm.c | 2 +- arch/arm/mach-tegra/board-harmony.c | 5 +- arch/arm/mach-tegra/board-paz00-pinmux.c | 3 + arch/arm/mach-tegra/board-paz00.c | 62 +- arch/arm/mach-tegra/board-paz00.h | 16 +- arch/arm/mach-tegra/board-seaboard-pinmux.c | 6 +- arch/arm/mach-tegra/board-seaboard.c | 81 +- arch/arm/mach-tegra/board-seaboard.h | 12 +- arch/arm/mach-tegra/board-trimslice.c | 3 +- arch/arm/mach-u300/Kconfig | 46 - arch/arm/mach-u300/Makefile.boot | 17 +- arch/arm/mach-u300/core.c | 82 +- arch/arm/mach-u300/include/mach/memory.h | 22 +- arch/arm/mach-u300/u300.c | 16 - arch/arm/plat-mxc/Kconfig | 39 +- arch/arm/plat-mxc/audmux-v2.c | 18 +- arch/arm/plat-mxc/cpu.c | 9 + arch/arm/plat-mxc/devices.c | 14 - arch/arm/plat-mxc/devices/Kconfig | 5 +- arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 5 + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 6 + arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 9 + arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 + arch/arm/plat-mxc/include/mach/common.h | 2 +- arch/arm/plat-mxc/include/mach/devices-common.h | 8 + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2270 +++++--------- arch/arm/plat-mxc/include/mach/iomux-mx53.h | 3530 +++++++------------- arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 + arch/arm/plat-mxc/include/mach/memory.h | 16 +- arch/arm/plat-mxc/include/mach/mx25.h | 4 + arch/arm/plat-mxc/include/mach/mx35.h | 2 +- arch/arm/plat-mxc/include/mach/mx3x.h | 18 +- arch/arm/plat-mxc/include/mach/mx51.h | 167 +- arch/arm/plat-mxc/pwm.c | 2 +- arch/arm/plat-s5p/clock.c | 2 +- arch/arm/plat-s5p/irq-gpioint.c | 6 + arch/arm/plat-samsung/include/plat/backlight.h | 2 +- arch/arm/plat-samsung/irq-vic-timer.c | 5 + 108 files changed, 2999 insertions(+), 4860 deletions(-) rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%) delete mode 100644 arch/arm/configs/mx1_defconfig delete mode 100644 arch/arm/configs/mx21_defconfig rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%) create mode 100644 arch/arm/mach-imx/cpu-imx25.c delete mode 100644 arch/arm/mach-mx5/devices.c delete mode 100644 arch/arm/mach-mx5/devices.h create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c Merging at91/at91-next $ git merge at91/at91-next Already up-to-date. Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Already up-to-date. Merging linux-spec/for-next $ git merge linux-spec/for-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Resolved 'arch/arm/mach-msm/io.c' using previous resolution. Auto-merging arch/arm/mach-msm/Makefile Auto-merging arch/arm/mach-msm/acpuclock-arm11.c Auto-merging arch/arm/mach-msm/board-halibut.c Auto-merging arch/arm/mach-msm/board-mahimahi.c Auto-merging arch/arm/mach-msm/board-msm7x30.c Auto-merging arch/arm/mach-msm/board-msm8960.c Auto-merging arch/arm/mach-msm/board-msm8x60.c Auto-merging arch/arm/mach-msm/board-qsd8x50.c Auto-merging arch/arm/mach-msm/board-trout.c Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h Auto-merging arch/arm/mach-msm/io.c CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 549c202] Merge remote-tracking branch 'msm/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-msm/Makefile | 5 +- arch/arm/mach-msm/acpuclock-arm11.c | 2 +- arch/arm/mach-msm/board-halibut.c | 1 + arch/arm/mach-msm/board-mahimahi.c | 1 + arch/arm/mach-msm/board-msm7x30.c | 1 + arch/arm/mach-msm/board-msm8960.c | 18 + arch/arm/mach-msm/board-msm8x60.c | 9 +- arch/arm/mach-msm/board-qsd8x50.c | 1 + arch/arm/mach-msm/board-trout.c | 1 + arch/arm/mach-msm/clock-dummy.c | 81 +++++ arch/arm/mach-msm/clock.h | 11 + arch/arm/mach-msm/devices-msm7x00.c | 21 ++- arch/arm/mach-msm/devices-msm7x30.c | 21 ++- arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++ arch/arm/mach-msm/devices-msm8x60.c | 56 ++++ arch/arm/mach-msm/devices-qsd8x50.c | 21 ++- arch/arm/mach-msm/devices.h | 8 + arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++----- arch/arm/mach-msm/include/mach/dma.h | 84 +++--- arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +- arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +- arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +- arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 + arch/arm/mach-msm/io.c | 3 - 25 files changed, 808 insertions(+), 133 deletions(-) create mode 100644 arch/arm/mach-msm/clock-dummy.c create mode 100644 arch/arm/mach-msm/devices-msm8x60.c Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Already up-to-date. Merging s5p/for-next $ git merge s5p/for-next Auto-merging arch/arm/mach-exynos4/mach-nuri.c Auto-merging arch/arm/mach-exynos4/mach-smdkv310.c Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c Merge made by recursive. arch/arm/configs/exynos4_defconfig | 1 + arch/arm/mach-exynos4/Kconfig | 16 ++ arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/mach-nuri.c | 34 +++++ arch/arm/mach-exynos4/mach-origen.c | 108 ++++++++++++++ arch/arm/mach-exynos4/mach-smdkv310.c | 11 ++ arch/arm/mach-exynos4/mach-universal_c210.c | 34 +++++ arch/arm/mach-s3c2410/dma.c | 14 -- arch/arm/mach-s3c2412/dma.c | 18 --- arch/arm/mach-s3c2440/dma.c | 17 -- arch/arm/mach-s3c2443/dma.c | 27 ---- arch/arm/mach-s3c64xx/Kconfig | 1 + arch/arm/mach-s3c64xx/Makefile | 2 +- arch/arm/mach-s3c64xx/include/mach/crag6410.h | 23 +++ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 173 ++++++++++++++++++++++ arch/arm/mach-s3c64xx/mach-crag6410.c | 97 ++----------- arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +- arch/arm/mach-s3c64xx/mach-real6410.c | 8 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 47 +------ arch/arm/mach-s5p64x0/mach-smdk6440.c | 8 +- arch/arm/mach-s5p64x0/mach-smdk6450.c | 8 +- arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +- arch/arm/mach-s5pv210/Kconfig | 6 - arch/arm/mach-s5pv210/Makefile | 2 +- arch/arm/mach-s5pv210/mach-smdkv210.c | 8 +- arch/arm/plat-samsung/dev-hsmmc.c | 19 +--- arch/arm/plat-samsung/dev-hsmmc1.c | 19 +--- arch/arm/plat-samsung/dev-hsmmc2.c | 19 +--- arch/arm/plat-samsung/dev-hsmmc3.c | 19 +--- arch/arm/plat-samsung/dev-ts.c | 9 + arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 6 - arch/arm/plat-samsung/include/plat/sdhci.h | 7 + arch/arm/plat-samsung/platformdata.c | 22 +++ 33 files changed, 467 insertions(+), 333 deletions(-) create mode 100644 arch/arm/mach-exynos4/mach-origen.c create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c Merging tegra/for-next $ git merge tegra/for-next Already up-to-date. Merging ux500-core/ux500-core $ git merge ux500-core/ux500-core Merge made by recursive. arch/arm/mach-ux500/Makefile | 1 + arch/arm/mach-ux500/cache-l2x0.c | 72 ++++++++++++++++++++++++++++++++++++++ arch/arm/mach-ux500/cpu.c | 69 ------------------------------------ 3 files changed, 73 insertions(+), 69 deletions(-) create mode 100644 arch/arm/mach-ux500/cache-l2x0.c Merging xilinx/arm-next $ git merge xilinx/arm-next Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Removing arch/blackfin/include/asm/mutex.h Merge made by recursive. arch/blackfin/include/asm/Kbuild | 1 + arch/blackfin/include/asm/bfin_serial.h | 2 + arch/blackfin/include/asm/mutex.h | 1 - arch/blackfin/include/asm/uaccess.h | 6 ++-- arch/blackfin/mach-bf518/boards/ezbrd.c | 14 +++++++++++- arch/blackfin/mach-bf518/boards/tcm-bf518.c | 14 +++++++++++- arch/blackfin/mach-bf527/boards/ad7160eval.c | 14 +++++++++++- arch/blackfin/mach-bf527/boards/cm_bf527.c | 14 +++++++++++- arch/blackfin/mach-bf527/boards/ezbrd.c | 14 +++++++++++- arch/blackfin/mach-bf527/boards/ezkit.c | 14 +++++++++++- arch/blackfin/mach-bf527/boards/tll6527m.c | 14 +++++++++++- arch/blackfin/mach-bf533/boards/H8606.c | 10 +++++++- arch/blackfin/mach-bf533/boards/blackstamp.c | 7 +++++- arch/blackfin/mach-bf533/boards/cm_bf533.c | 7 +++++- arch/blackfin/mach-bf533/boards/ezkit.c | 7 +++++- arch/blackfin/mach-bf533/boards/ip0x.c | 7 +++++- arch/blackfin/mach-bf533/boards/stamp.c | 7 +++++- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 14 +++++++++++- arch/blackfin/mach-bf537/boards/cm_bf537u.c | 14 +++++++++++- arch/blackfin/mach-bf537/boards/dnp5370.c | 14 +++++++++++- arch/blackfin/mach-bf537/boards/minotaur.c | 14 +++++++++++- arch/blackfin/mach-bf537/boards/pnav10.c | 14 +++++++++++- arch/blackfin/mach-bf537/boards/stamp.c | 14 +++++++++++- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 14 +++++++++++- arch/blackfin/mach-bf538/boards/ezkit.c | 21 ++++++++++++++++-- arch/blackfin/mach-bf548/boards/cm_bf548.c | 28 ++++++++++++++++++++++--- arch/blackfin/mach-bf548/boards/ezkit.c | 28 ++++++++++++++++++++++--- arch/blackfin/mach-bf561/boards/acvilon.c | 7 +++++- arch/blackfin/mach-bf561/boards/cm_bf561.c | 7 +++++- arch/blackfin/mach-bf561/boards/ezkit.c | 7 +++++- arch/blackfin/mach-bf561/boards/tepla.c | 7 +++++- 31 files changed, 302 insertions(+), 54 deletions(-) delete mode 100644 arch/blackfin/include/asm/mutex.h Merging cris/for-next $ git merge cris/for-next Auto-merging arch/cris/arch-v32/drivers/cryptocop.c Auto-merging drivers/net/cris/eth_v10.c Merge made by recursive. Documentation/cris/README | 62 +++++++++++++++--------------- arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- arch/cris/arch-v32/kernel/ptrace.c | 2 - arch/cris/include/arch-v32/arch/cache.h | 2 +- drivers/net/cris/eth_v10.c | 1 - 5 files changed, 34 insertions(+), 39 deletions(-) Merging ia64/test $ git merge ia64/test Merge made by recursive. arch/ia64/configs/generic_defconfig | 1 + arch/ia64/configs/gensparse_defconfig | 1 + arch/ia64/configs/tiger_defconfig | 1 + arch/ia64/configs/xen_domu_defconfig | 1 + arch/ia64/configs/zx1_defconfig | 1 + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 12 +++-- drivers/acpi/apei/erst.c | 2 +- drivers/char/agp/hp-agp.c | 6 ++- drivers/firmware/efivars.c | 2 +- fs/pstore/inode.c | 40 ++++++++++++++-- fs/pstore/internal.h | 2 +- fs/pstore/platform.c | 82 ++++++++++++++++++++++++++------ include/linux/pstore.h | 2 +- 13 files changed, 123 insertions(+), 30 deletions(-) Merging m68k/for-next $ git merge m68k/for-next Merge made by recursive. arch/m68k/mac/macints.c | 2 +- arch/m68k/mac/misc.c | 40 +++++++++++++++++++++++----------------- drivers/zorro/zorro-driver.c | 8 ++++---- 3 files changed, 28 insertions(+), 22 deletions(-) Merging m68knommu/for-next $ git merge m68knommu/for-next Auto-merging arch/m68k/Kconfig.machine Removing arch/m68k/Kconfig.mmu Removing arch/m68k/Makefile_mm Removing arch/m68k/Makefile_no Removing arch/m68k/include/asm/entry_mm.h Removing arch/m68k/include/asm/entry_no.h Removing arch/m68k/kernel/Makefile_mm Removing arch/m68k/kernel/Makefile_no Removing arch/m68k/kernel/traps_mm.c Removing arch/m68k/kernel/traps_no.c Merge made by recursive. arch/m68k/Kconfig | 195 +---- arch/m68k/Kconfig.bus | 55 ++ arch/m68k/Kconfig.cpu | 429 +++++++++ arch/m68k/Kconfig.devices | 171 ++++ arch/m68k/{Kconfig.nommu => Kconfig.machine} | 543 ++++-------- arch/m68k/Kconfig.mmu | 411 --------- arch/m68k/Makefile | 168 ++++- arch/m68k/Makefile_mm | 121 --- arch/m68k/Makefile_no | 124 --- arch/m68k/include/asm/entry.h | 255 ++++++- arch/m68k/include/asm/entry_mm.h | 128 --- arch/m68k/include/asm/entry_no.h | 181 ---- arch/m68k/include/asm/m520xsim.h | 26 +- arch/m68k/include/asm/mcfqspi.h | 8 +- arch/m68k/include/asm/page_no.h | 3 + arch/m68k/include/asm/processor.h | 6 + arch/m68k/include/asm/sections.h | 2 + arch/m68k/kernel/Makefile | 24 +- arch/m68k/kernel/Makefile_mm | 17 - arch/m68k/kernel/Makefile_no | 10 - arch/m68k/kernel/entry_no.S | 6 +- arch/m68k/kernel/setup_no.c | 4 +- arch/m68k/kernel/traps.c | 1108 +++++++++++++++++++++++- arch/m68k/kernel/traps_mm.c | 1207 -------------------------- arch/m68k/kernel/traps_no.c | 361 -------- arch/m68k/kernel/vectors.c | 145 +++ arch/m68k/lib/memcpy.c | 9 + arch/m68k/mm/init_no.c | 21 +- arch/m68k/platform/520x/config.c | 6 +- arch/m68k/platform/520x/gpio.c | 50 +- arch/m68k/platform/68328/Makefile | 5 +- arch/m68k/platform/68328/entry.S | 18 +- arch/m68k/platform/68360/Makefile | 6 +- arch/m68k/platform/68360/entry.S | 4 +- arch/m68k/platform/coldfire/entry.S | 6 +- 35 files changed, 2656 insertions(+), 3177 deletions(-) create mode 100644 arch/m68k/Kconfig.bus create mode 100644 arch/m68k/Kconfig.cpu create mode 100644 arch/m68k/Kconfig.devices rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%) delete mode 100644 arch/m68k/Kconfig.mmu delete mode 100644 arch/m68k/Makefile_mm delete mode 100644 arch/m68k/Makefile_no delete mode 100644 arch/m68k/include/asm/entry_mm.h delete mode 100644 arch/m68k/include/asm/entry_no.h delete mode 100644 arch/m68k/kernel/Makefile_mm delete mode 100644 arch/m68k/kernel/Makefile_no delete mode 100644 arch/m68k/kernel/traps_mm.c delete mode 100644 arch/m68k/kernel/traps_no.c create mode 100644 arch/m68k/kernel/vectors.c Merging microblaze/next $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Auto-merging arch/mips/kernel/scall32-o32.S Removing arch/mips/nxp/pnx8550/common/pci.c Removing arch/mips/nxp/pnx8550/common/setup.c Merge made by recursive. arch/mips/Kconfig | 1 + arch/mips/Makefile | 2 + arch/mips/alchemy/common/platform.c | 2 +- arch/mips/alchemy/common/power.c | 22 ++- arch/mips/ar7/irq.c | 3 +- arch/mips/bcm63xx/irq.c | 1 + arch/mips/cobalt/irq.c | 1 + arch/mips/dec/setup.c | 4 + arch/mips/emma/markeins/irq.c | 2 +- arch/mips/include/asm/cacheflush.h | 24 ++++ arch/mips/include/asm/io.h | 12 +-- .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 - arch/mips/include/asm/mipsprom.h | 6 +- arch/mips/include/asm/prom.h | 6 +- arch/mips/kernel/ftrace.c | 39 +++--- arch/mips/kernel/scall32-o32.S | 2 +- arch/mips/kernel/signal.c | 3 + arch/mips/kernel/traps.c | 6 +- arch/mips/lantiq/irq.c | 6 +- arch/mips/lasat/interrupt.c | 1 + arch/mips/loongson/fuloong-2e/irq.c | 1 + arch/mips/loongson/lemote-2f/irq.c | 3 +- arch/mips/mm/c-octeon.c | 6 + arch/mips/mm/c-r3k.c | 7 + arch/mips/mm/c-r4k.c | 35 +++++ arch/mips/mm/c-tx39.c | 7 + arch/mips/mm/cache.c | 5 + arch/mips/mm/tlbex.c | 3 +- arch/mips/mti-malta/malta-int.c | 6 +- arch/mips/netlogic/Platform | 5 + arch/mips/netlogic/xlr/setup.c | 4 +- arch/mips/netlogic/xlr/smp.c | 2 +- arch/mips/netlogic/xlr/smpboot.S | 16 ++- arch/mips/nxp/pnx8550/common/pci.c | 134 ------------------ arch/mips/nxp/pnx8550/common/setup.c | 143 -------------------- arch/mips/pci/pci-lantiq.c | 9 +- arch/mips/pci/pci-rc32434.c | 2 +- arch/mips/pmc-sierra/msp71xx/msp_irq.c | 6 +- arch/mips/pmc-sierra/msp71xx/msp_setup.c | 1 + arch/mips/pmc-sierra/yosemite/py-console.c | 12 +-- arch/mips/pnx8550/common/int.c | 2 +- arch/mips/pnx8550/common/prom.c | 2 +- arch/mips/sgi-ip22/ip22-int.c | 10 +- arch/mips/sgi-ip27/ip27-irq.c | 4 +- arch/mips/sni/rm200.c | 1 + arch/mips/vr41xx/common/irq.c | 1 + drivers/mtd/maps/lantiq-flash.c | 4 +- 47 files changed, 204 insertions(+), 371 deletions(-) delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c Merging openrisc/for-upstream $ git merge openrisc/for-upstream Merge made by recursive. arch/openrisc/include/asm/sigcontext.h | 7 +------ arch/openrisc/kernel/signal.c | 21 +++++---------------- 2 files changed, 6 insertions(+), 22 deletions(-) Merging parisc/for-next $ git merge parisc/for-next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Removing arch/powerpc/boot/dts/hcu4.dts Removing arch/powerpc/configs/40x/hcu4_defconfig Removing arch/powerpc/platforms/40x/hcu4.c Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c Merge made by recursive. arch/powerpc/Kconfig | 2 +- arch/powerpc/boot/dts/hcu4.dts | 168 ------------------------------ arch/powerpc/boot/dts/yosemite.dts | 36 +++++++ arch/powerpc/configs/40x/hcu4_defconfig | 80 -------------- arch/powerpc/configs/ppc40x_defconfig | 1 - arch/powerpc/include/asm/kexec.h | 2 +- arch/powerpc/kernel/misc_32.S | 171 +++++++++++++++++++++++++++++++ arch/powerpc/platforms/40x/Kconfig | 8 -- arch/powerpc/platforms/40x/Makefile | 1 - arch/powerpc/platforms/40x/hcu4.c | 61 ----------- arch/powerpc/sysdev/ppc4xx_pci.c | 89 +++++++++++++--- arch/powerpc/sysdev/ppc4xx_pci.h | 12 ++ drivers/edac/ppc4xx_edac.c | 2 +- 13 files changed, 294 insertions(+), 339 deletions(-) delete mode 100644 arch/powerpc/boot/dts/hcu4.dts delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig delete mode 100644 arch/powerpc/platforms/40x/hcu4.c Merging 52xx-and-virtex/powerpc/next $ git merge 52xx-and-virtex/powerpc/next Merge made by recursive. arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++ arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++- arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + 3 files changed, 249 insertions(+), 8 deletions(-) create mode 100644 arch/powerpc/boot/dts/charon.dts Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. Documentation/kernel-parameters.txt | 6 +- arch/s390/Kconfig | 10 ++ arch/s390/include/asm/ipl.h | 1 + arch/s390/include/asm/kexec.h | 3 + arch/s390/include/asm/setup.h | 9 ++ arch/s390/include/asm/smp.h | 5 + arch/s390/include/asm/system.h | 2 + arch/s390/include/asm/thread_info.h | 2 +- arch/s390/kernel/Makefile | 1 + arch/s390/kernel/crash_dump.c | 39 ++++++ arch/s390/kernel/head.S | 16 +++ arch/s390/kernel/head_kdump.S | 116 +++++++++++++++++ arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/machine_kexec.c | 245 +++++++++++++++++++++++++++++++++++ arch/s390/kernel/mem_detect.c | 69 ++++++++++ arch/s390/kernel/setup.c | 203 +++++++++++++++++++++++++++++ arch/s390/kernel/smp.c | 23 ++++ arch/s390/mm/maccess.c | 57 ++++++++ arch/s390/mm/vmem.c | 6 + drivers/s390/char/zcore.c | 20 +--- drivers/s390/cio/ccwreq.c | 23 +++- include/linux/crash_dump.h | 1 + include/linux/kexec.h | 4 + kernel/crash_dump.c | 11 ++ kernel/kexec.c | 2 +- 25 files changed, 853 insertions(+), 26 deletions(-) create mode 100644 arch/s390/kernel/crash_dump.c create mode 100644 arch/s390/kernel/head_kdump.S Merging sh/sh-latest $ git merge sh/sh-latest Merge made by recursive. arch/sh/boards/mach-ecovec24/setup.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Merging rmobile/rmobile-latest $ git merge rmobile/rmobile-latest Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging tile/master $ git merge tile/master Merge made by recursive. arch/tile/kernel/intvec_32.S | 2 +- arch/tile/lib/atomic_asm_32.S | 2 +- fs/nfs/nfs4filelayout.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) Merging unicore32/unicore32 $ git merge unicore32/unicore32 Merge made by recursive. arch/unicore32/boot/compressed/Makefile | 4 ++-- arch/unicore32/include/asm/bitops.h | 12 ++++++------ arch/unicore32/kernel/ksyms.c | 4 ++-- arch/unicore32/lib/findbit.S | 14 ++++++++------ 4 files changed, 18 insertions(+), 16 deletions(-) Merging xtensa/master $ git merge xtensa/master Already up-to-date. Merging ceph/for-next $ git merge ceph/for-next Auto-merging fs/ceph/caps.c Auto-merging fs/ceph/super.h Auto-merging include/linux/ceph/libceph.h Merge made by recursive. drivers/block/rbd.c | 2 +- fs/ceph/addr.c | 192 +++++++++++++++++++++++++--------------- fs/ceph/caps.c | 2 +- fs/ceph/ioctl.h | 55 +++++++++++- fs/ceph/mds_client.c | 11 ++- fs/ceph/super.c | 23 ++++-- fs/ceph/super.h | 8 +- include/linux/ceph/libceph.h | 4 +- include/linux/ceph/messenger.h | 3 +- net/ceph/ceph_common.c | 47 +++++----- net/ceph/messenger.c | 16 +++- net/ceph/mon_client.c | 71 ++++++++------- net/ceph/msgpool.c | 42 ++++++--- net/ceph/osd_client.c | 8 +- 14 files changed, 318 insertions(+), 166 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/cifsfs.c | 10 ++++++---- fs/cifs/cifssmb.c | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next $ git merge ext3/for_next Already up-to-date. Merging ext4/dev $ git merge ext4/dev Merge made by recursive. Documentation/filesystems/ext4.txt | 8 +- fs/ext4/ext4.h | 17 +++- fs/ext4/extents.c | 90 +++++++++++++----- fs/ext4/inode.c | 181 ++++++++++++++++++++++++++++++++++++ fs/ext4/namei.c | 8 +- fs/ext4/super.c | 46 ++++++---- fs/jbd2/transaction.c | 46 ++++++++- include/linux/ext2_fs.h | 4 +- include/linux/ext3_fs.h | 4 +- 9 files changed, 343 insertions(+), 61 deletions(-) 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 Auto-merging fs/gfs2/acl.c Merge made by recursive. fs/gfs2/acl.c | 5 +- fs/gfs2/aops.c | 6 --- fs/gfs2/dir.c | 42 +++++--------------- fs/gfs2/file.c | 50 ++++++++++++++++++------ fs/gfs2/glops.c | 29 +++++++++++--- fs/gfs2/incore.h | 1 + fs/gfs2/inode.c | 85 +++++++++++++++-------------------------- fs/gfs2/inode.h | 2 +- fs/gfs2/quota.c | 13 +----- fs/gfs2/super.c | 111 +++++++++++++++++++++++++++++++++++------------------- fs/gfs2/xattr.c | 5 +- 11 files changed, 182 insertions(+), 167 deletions(-) Merging hfsplus/for-next $ git merge hfsplus/for-next Already up-to-date. Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Auto-merging fs/logfs/logfs.h Merge made by recursive. fs/logfs/dev_mtd.c | 26 ++++++++++++-------------- fs/logfs/logfs.h | 1 + fs/logfs/readwrite.c | 4 ++++ fs/logfs/segment.c | 14 ++++++++++---- fs/logfs/super.c | 1 + 5 files changed, 28 insertions(+), 18 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/nfs/nfs4_fs.h | 8 +++++--- fs/nfs/nfs4proc.c | 20 ++++++++++++++------ fs/nfs/nfs4renewd.c | 12 +++++++++--- fs/nfs/nfs4state.c | 6 ++++++ 4 files changed, 34 insertions(+), 12 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging include/linux/fs.h Removing include/linux/nfsd/const.h Merge made by recursive. arch/alpha/include/asm/fcntl.h | 2 - fs/lockd/svc.c | 2 +- fs/locks.c | 125 +++++++++++++++++++++++++--------------- fs/nfs/callback.c | 4 +- fs/nfsd/nfs4proc.c | 38 +++++++----- fs/nfsd/nfs4state.c | 6 +-- fs/nfsd/nfs4xdr.c | 37 ++++++++---- fs/nfsd/nfsd.h | 26 ++++++++ fs/nfsd/nfsfh.c | 39 ++++++------- fs/nfsd/state.h | 6 -- fs/nfsd/vfs.c | 8 ++- include/asm-generic/fcntl.h | 5 -- include/linux/fs.h | 8 ++- include/linux/nfsd/Kbuild | 1 - include/linux/nfsd/const.h | 55 ----------------- include/linux/nfsd/nfsfh.h | 7 ++- include/linux/sunrpc/svc.h | 2 +- net/sunrpc/svc.c | 33 ++++++++--- 18 files changed, 216 insertions(+), 188 deletions(-) delete mode 100644 include/linux/nfsd/const.h Merging nilfs2/for-next $ git merge nilfs2/for-next Already up-to-date. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merging fs/ocfs2/file.c Auto-merging fs/ocfs2/move_extents.c Merge made by recursive. fs/ocfs2/aops.c | 69 +++++++++++++-- fs/ocfs2/aops.h | 14 +++ fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++---------------- fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++------- fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++-------------- fs/ocfs2/cluster/tcp.h | 2 + fs/ocfs2/dir.c | 3 +- fs/ocfs2/dlm/dlmcommon.h | 56 +++---------- fs/ocfs2/dlm/dlmdomain.c | 44 +++++----- fs/ocfs2/dlm/dlmlock.c | 54 ++++++------ fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++------------------- fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------ fs/ocfs2/dlm/dlmthread.c | 16 ++-- fs/ocfs2/dlmglue.c | 21 +++-- fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++ fs/ocfs2/extent_map.h | 2 + fs/ocfs2/file.c | 93 ++++++++++++++++++++- fs/ocfs2/inode.h | 3 + fs/ocfs2/ioctl.c | 8 +- fs/ocfs2/journal.c | 23 +++++- fs/ocfs2/mmap.c | 53 +++++------ fs/ocfs2/move_extents.c | 2 +- fs/ocfs2/ocfs2.h | 4 +- fs/ocfs2/quota_local.c | 13 ++- fs/ocfs2/slot_map.c | 4 +- fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++-- fs/ocfs2/super.c | 23 +++-- fs/ocfs2/xattr.c | 9 ++- 28 files changed, 932 insertions(+), 524 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/v9fs_vfs.h | 6 +- fs/9p/vfs_dir.c | 14 +- fs/9p/vfs_file.c | 36 +++- fs/9p/vfs_inode.c | 139 +++++++++----- fs/9p/vfs_inode_dotl.c | 86 +++++++-- fs/9p/vfs_super.c | 2 +- include/net/9p/9p.h | 43 +++- include/net/9p/client.h | 6 +- include/net/9p/transport.h | 10 +- include/trace/events/9p.h | 186 ++++++++++++++++++ net/9p/client.c | 456 +++++++++++++++++++++++++++++++------------- net/9p/protocol.c | 99 ++--------- net/9p/protocol.h | 4 +- net/9p/trans_common.c | 53 ++---- net/9p/trans_common.h | 21 +-- net/9p/trans_virtio.c | 326 +++++++++++++++++++------------- 16 files changed, 977 insertions(+), 510 deletions(-) create mode 100644 include/trace/events/9p.h Merging ubifs/linux-next $ git merge ubifs/linux-next Merge made by recursive. fs/ubifs/debug.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Merging xfs/master $ git merge xfs/master Merge made by recursive. Documentation/feature-removal-schedule.txt | 8 +++ fs/xfs/xfs_file.c | 85 +++++++++++++++++++++------ fs/xfs/xfs_super.c | 2 + 3 files changed, 76 insertions(+), 19 deletions(-) Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging vfs-scale/vfs-scale-working $ git merge vfs-scale/vfs-scale-working Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging hid/for-next $ git merge hid/for-next Resolved 'drivers/hid/hid-core.c' using previous resolution. Resolved 'drivers/hid/hid-ids.h' using previous resolution. Auto-merging drivers/hid/Kconfig Auto-merging drivers/hid/hid-apple.c Auto-merging drivers/hid/hid-core.c CONFLICT (content): Merge conflict in drivers/hid/hid-core.c Auto-merging drivers/hid/hid-ids.h CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h Auto-merging drivers/hid/usbhid/hid-quirks.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 16106e4] Merge remote-tracking branch 'hid/for-next' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 7 + drivers/hid/Kconfig | 19 +- drivers/hid/Makefile | 2 +- drivers/hid/hid-apple.c | 9 + drivers/hid/hid-axff.c | 36 ++- drivers/hid/hid-core.c | 56 +++- drivers/hid/hid-debug.c | 5 + drivers/hid/hid-ids.h | 7 + drivers/hid/hid-lg.c | 29 +- drivers/hid/hid-lg.h | 4 +- drivers/hid/hid-lg4ff.c | 403 ++++++++++++++++++-- drivers/hid/hid-lgff.c | 13 - drivers/hid/hid-magicmouse.c | 66 +++- drivers/hid/hid-multitouch.c | 15 + drivers/hid/hid-prodikeys.c | 8 +- drivers/hid/hid-sjoy.c | 68 ++-- drivers/hid/hid-zydacron.c | 4 +- drivers/hid/usbhid/hid-quirks.c | 1 - include/linux/hid.h | 2 + 19 files changed, 628 insertions(+), 126 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/busses/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Auto-merging drivers/i2c/busses/i2c-omap.c Merge made by recursive. arch/arm/plat-omap/i2c.c | 27 +++++++++++ drivers/i2c/busses/i2c-omap.c | 99 ++++++++++++++++++++++------------------ include/linux/i2c-omap.h | 2 + 3 files changed, 83 insertions(+), 45 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. drivers/hwmon/Kconfig | 15 ++++++++++- drivers/hwmon/ibmaem.c | 60 +++++++++++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 28 deletions(-) Merging hwmon-staging/hwmon-next $ git merge hwmon-staging/hwmon-next Merge made by recursive. drivers/hwmon/w83627ehf.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Merge made by recursive. Documentation/cgroups/cgroups.txt | 4 ++-- Documentation/laptops/thinkpad-acpi.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Merging docs/docs-move $ git merge docs/docs-move Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Already up-to-date. Merging kbuild/for-next $ git merge kbuild/for-next Merge made by recursive. scripts/kconfig/Makefile | 28 ++-------------------------- scripts/kconfig/menu.c | 13 +++++-------- scripts/kconfig/nconf.c | 2 -- scripts/kconfig/streamline_config.pl | 22 +++++++++++++++++++--- 4 files changed, 26 insertions(+), 39 deletions(-) Merging kconfig/for-next $ git merge kconfig/for-next Already up-to-date! 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. drivers/ata/libata-eh.c | 5 ++--- drivers/ata/sata_sil24.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Auto-merging Documentation/kernel-parameters.txt Merge made by recursive. Documentation/kernel-parameters.txt | 9 ++++++--- drivers/acpi/acpica/hwxface.c | 3 +-- drivers/acpi/apei/Kconfig | 1 + drivers/acpi/apei/apei-base.c | 2 +- drivers/acpi/reboot.c | 3 +-- drivers/acpi/scan.c | 3 +-- 6 files changed, 11 insertions(+), 10 deletions(-) Merging idle-test/idle-test $ git merge idle-test/idle-test Already up-to-date. Merging powertools/tools-test $ git merge powertools/tools-test Already up-to-date. Merging cpupowerutils/master $ git merge cpupowerutils/master 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 Already up-to-date. Merging dlm/next $ git merge dlm/next Already up-to-date. Merging swiotlb/master $ git merge swiotlb/master Merge made by recursive. Merging ibft/master $ git merge ibft/master Merge made by recursive. Merging scsi/master $ git merge scsi/master Merge made by recursive. arch/s390/include/asm/qdio.h | 5 + drivers/infiniband/ulp/iser/iscsi_iser.c | 80 +- drivers/message/fusion/mptbase.c | 92 ++- drivers/message/fusion/mptbase.h | 72 +- drivers/message/fusion/mptsas.c | 47 +- drivers/message/fusion/mptscsih.c | 15 +- drivers/message/fusion/mptscsih.h | 1 + drivers/s390/cio/qdio_main.c | 11 +- drivers/s390/cio/qdio_setup.c | 1 + drivers/s390/scsi/zfcp_dbf.c | 36 + drivers/s390/scsi/zfcp_def.h | 7 + drivers/s390/scsi/zfcp_ext.h | 1 + drivers/s390/scsi/zfcp_fsf.c | 80 +- drivers/s390/scsi/zfcp_qdio.c | 58 +- drivers/s390/scsi/zfcp_qdio.h | 66 +- drivers/s390/scsi/zfcp_scsi.c | 15 +- drivers/scsi/Kconfig | 14 +- drivers/scsi/Makefile | 1 + drivers/scsi/be2iscsi/be_iscsi.c | 60 +- drivers/scsi/be2iscsi/be_iscsi.h | 2 + drivers/scsi/be2iscsi/be_main.c | 27 +- drivers/scsi/bnx2fc/bnx2fc.h | 2 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 191 ++- drivers/scsi/bnx2fc/bnx2fc_hwi.c | 10 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 7 - drivers/scsi/bnx2fc/bnx2fc_tgt.c | 27 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 80 +- drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 20 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 20 +- drivers/scsi/cxgbi/libcxgbi.c | 56 + drivers/scsi/cxgbi/libcxgbi.h | 1 + drivers/scsi/fcoe/fcoe.c | 66 +- drivers/scsi/fcoe/fcoe.h | 10 - drivers/scsi/fcoe/fcoe_transport.c | 72 + drivers/scsi/ipr.c | 2 +- drivers/scsi/isci/task.c | 29 +- drivers/scsi/iscsi_tcp.c | 83 +- drivers/scsi/libiscsi.c | 9 - drivers/scsi/libsas/sas_init.c | 30 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 + drivers/scsi/mvsas/mv_sas.c | 29 +- drivers/scsi/mvumi.c | 2018 +++++++++++++++++++++++++++ drivers/scsi/mvumi.h | 505 +++++++ drivers/scsi/pm8001/pm8001_sas.c | 38 +- drivers/scsi/qla2xxx/qla_attr.c | 111 +- drivers/scsi/qla2xxx/qla_bsg.c | 152 ++ drivers/scsi/qla2xxx/qla_bsg.h | 42 + drivers/scsi/qla2xxx/qla_dbg.c | 6 +- drivers/scsi/qla2xxx/qla_def.h | 9 +- drivers/scsi/qla2xxx/qla_gbl.h | 18 + drivers/scsi/qla2xxx/qla_init.c | 36 +- drivers/scsi/qla2xxx/qla_isr.c | 5 + drivers/scsi/qla2xxx/qla_mbx.c | 127 ++ drivers/scsi/qla2xxx/qla_nx.c | 969 +++++++++++++- drivers/scsi/qla2xxx/qla_nx.h | 255 ++++- drivers/scsi/qla2xxx/qla_os.c | 46 +- drivers/scsi/qla4xxx/Makefile | 2 +- drivers/scsi/qla4xxx/ql4_attr.c | 76 + drivers/scsi/qla4xxx/ql4_bsg.c | 513 +++++++ drivers/scsi/qla4xxx/ql4_bsg.h | 19 + drivers/scsi/qla4xxx/ql4_def.h | 201 ++- drivers/scsi/qla4xxx/ql4_fw.h | 192 +++- drivers/scsi/qla4xxx/ql4_glbl.h | 71 +- drivers/scsi/qla4xxx/ql4_init.c | 786 ++---------- drivers/scsi/qla4xxx/ql4_iocb.c | 68 +- drivers/scsi/qla4xxx/ql4_isr.c | 83 +- drivers/scsi/qla4xxx/ql4_mbx.c | 752 +++++++++-- drivers/scsi/qla4xxx/ql4_nvram.c | 21 + drivers/scsi/qla4xxx/ql4_nx.c | 9 + drivers/scsi/qla4xxx/ql4_os.c | 2199 +++++++++++++++++++++++++----- drivers/scsi/scsi_error.c | 12 +- drivers/scsi/scsi_sysfs.c | 38 + drivers/scsi/scsi_transport_iscsi.c | 683 ++++++++-- include/scsi/iscsi_if.h | 134 ++- include/scsi/libfcoe.h | 3 + include/scsi/libsas.h | 26 +- include/scsi/scsi_bsg_iscsi.h | 110 ++ include/scsi/scsi_host.h | 13 + include/scsi/scsi_transport_iscsi.h | 45 +- 79 files changed, 9821 insertions(+), 2008 deletions(-) create mode 100644 drivers/scsi/mvumi.c create mode 100644 drivers/scsi/mvumi.h create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.c create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.h create mode 100644 include/scsi/scsi_bsg_iscsi.h $ git reset --hard HEAD^ HEAD is now at 616c43d Merge remote-tracking branch 'ibft/master' Merging refs/next/20110826/scsi $ git merge refs/next/20110826/scsi Merge made by recursive. drivers/infiniband/ulp/iser/iscsi_iser.c | 80 +- drivers/message/fusion/mptbase.c | 92 ++- drivers/message/fusion/mptbase.h | 72 +- drivers/message/fusion/mptsas.c | 47 +- drivers/message/fusion/mptscsih.c | 15 +- drivers/message/fusion/mptscsih.h | 1 + drivers/scsi/Kconfig | 1 + drivers/scsi/be2iscsi/be_iscsi.c | 60 +- drivers/scsi/be2iscsi/be_iscsi.h | 2 + drivers/scsi/be2iscsi/be_main.c | 27 +- drivers/scsi/bnx2fc/bnx2fc.h | 2 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 191 ++- drivers/scsi/bnx2fc/bnx2fc_hwi.c | 10 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 7 - drivers/scsi/bnx2fc/bnx2fc_tgt.c | 27 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 80 +- drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 20 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 20 +- drivers/scsi/cxgbi/libcxgbi.c | 56 + drivers/scsi/cxgbi/libcxgbi.h | 1 + drivers/scsi/fcoe/fcoe.c | 66 +- drivers/scsi/fcoe/fcoe.h | 10 - drivers/scsi/fcoe/fcoe_transport.c | 72 + drivers/scsi/ipr.c | 2 +- drivers/scsi/isci/task.c | 29 +- drivers/scsi/iscsi_tcp.c | 83 +- drivers/scsi/libiscsi.c | 9 - drivers/scsi/libsas/sas_init.c | 30 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 + drivers/scsi/mvsas/mv_sas.c | 29 +- drivers/scsi/pm8001/pm8001_sas.c | 38 +- drivers/scsi/qla4xxx/Makefile | 2 +- drivers/scsi/qla4xxx/ql4_bsg.c | 209 +++ drivers/scsi/qla4xxx/ql4_bsg.h | 14 + drivers/scsi/qla4xxx/ql4_def.h | 182 ++- drivers/scsi/qla4xxx/ql4_fw.h | 184 +++- drivers/scsi/qla4xxx/ql4_glbl.h | 62 +- drivers/scsi/qla4xxx/ql4_init.c | 777 ++---------- drivers/scsi/qla4xxx/ql4_iocb.c | 68 +- drivers/scsi/qla4xxx/ql4_isr.c | 81 +- drivers/scsi/qla4xxx/ql4_mbx.c | 644 ++++++++-- drivers/scsi/qla4xxx/ql4_nvram.c | 21 + drivers/scsi/qla4xxx/ql4_nx.c | 4 + drivers/scsi/qla4xxx/ql4_os.c | 2066 +++++++++++++++++++++++++----- drivers/scsi/scsi_transport_iscsi.c | 675 +++++++++-- include/scsi/iscsi_if.h | 132 ++- include/scsi/libfcoe.h | 3 + include/scsi/libsas.h | 26 +- include/scsi/scsi_bsg_iscsi.h | 110 ++ include/scsi/scsi_transport_iscsi.h | 45 +- 50 files changed, 4648 insertions(+), 1837 deletions(-) create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.c create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.h create mode 100644 include/scsi/scsi_bsg_iscsi.h Merging iscsi-target/for-next $ git merge iscsi-target/for-next Already up-to-date. Merging slave-dma/next $ git merge slave-dma/next Resolved 'drivers/dma/amba-pl08x.c' using previous resolution. Auto-merging drivers/dma/amba-pl08x.c CONFLICT (content): Merge conflict in drivers/dma/amba-pl08x.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f7888ed] Merge remote-tracking branch 'slave-dma/next' $ git diff -M --stat --summary HEAD^.. arch/arm/include/asm/hardware/pl080.h | 4 + drivers/dma/amba-pl08x.c | 445 ++++++++++++++------------------- drivers/dma/at_hdmac.c | 159 +++++++++--- drivers/dma/at_hdmac_regs.h | 24 ++ drivers/dma/dmatest.c | 6 + drivers/dma/mxs-dma.c | 45 ++-- include/linux/amba/pl08x.h | 14 +- include/linux/dmaengine.h | 13 +- 8 files changed, 394 insertions(+), 316 deletions(-) Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging net/master $ git merge net/master Auto-merging MAINTAINERS Auto-merging arch/mips/Kconfig Auto-merging arch/powerpc/Kconfig CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree. Auto-merging arch/powerpc/configs/ppc40x_defconfig Auto-merging arch/powerpc/platforms/40x/Kconfig Auto-merging drivers/bcma/main.c Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c Removing drivers/net/arm/Kconfig Removing drivers/net/arm/Makefile Removing drivers/net/benet/Kconfig Removing drivers/net/bna/bfi_ctreg.h Removing drivers/net/bna/bfi_ll.h Removing drivers/net/bna/bna_ctrl.c Removing drivers/net/bna/bna_hw.h Removing drivers/net/bna/bna_txrx.c Auto-merging drivers/net/cris/eth_v10.c Auto-merging drivers/net/ethernet/3com/3c501.c Auto-merging drivers/net/ethernet/3com/3c509.c Auto-merging drivers/net/ethernet/3com/3c515.c Auto-merging drivers/net/ethernet/3com/3c574_cs.c Auto-merging drivers/net/ethernet/3com/3c589_cs.c Auto-merging drivers/net/ethernet/3com/3c59x.c Auto-merging drivers/net/ethernet/3com/typhoon.c Auto-merging drivers/net/ethernet/8390/3c503.c Auto-merging drivers/net/ethernet/8390/8390.c Auto-merging drivers/net/ethernet/8390/8390p.c Auto-merging drivers/net/ethernet/8390/ac3200.c Auto-merging drivers/net/ethernet/8390/ax88796.c Auto-merging drivers/net/ethernet/8390/axnet_cs.c Auto-merging drivers/net/ethernet/8390/e2100.c Auto-merging drivers/net/ethernet/8390/etherh.c Auto-merging drivers/net/ethernet/8390/hp-plus.c Auto-merging drivers/net/ethernet/8390/hydra.c Auto-merging drivers/net/ethernet/8390/mac8390.c Auto-merging drivers/net/ethernet/8390/ne-h8300.c Auto-merging drivers/net/ethernet/8390/ne2k-pci.c Auto-merging drivers/net/ethernet/8390/pcnet_cs.c Auto-merging drivers/net/ethernet/8390/smc-mca.c Auto-merging drivers/net/ethernet/8390/smc-ultra.c Auto-merging drivers/net/ethernet/8390/smc-ultra32.c Auto-merging drivers/net/ethernet/8390/wd.c Auto-merging drivers/net/ethernet/8390/zorro8390.c Auto-merging drivers/net/ethernet/adaptec/starfire.c Auto-merging drivers/net/ethernet/adi/bfin_mac.c Auto-merging drivers/net/ethernet/aeroflex/greth.c Auto-merging drivers/net/ethernet/alteon/acenic.c Auto-merging drivers/net/ethernet/amd/a2065.c Auto-merging drivers/net/ethernet/amd/am79c961a.c Auto-merging drivers/net/ethernet/amd/amd8111e.c Auto-merging drivers/net/ethernet/amd/ariadne.c Auto-merging drivers/net/ethernet/amd/atarilance.c Auto-merging drivers/net/ethernet/amd/au1000_eth.c Auto-merging drivers/net/ethernet/amd/declance.c Auto-merging drivers/net/ethernet/amd/depca.c Auto-merging drivers/net/ethernet/amd/hplance.c Auto-merging drivers/net/ethernet/amd/lance.c Auto-merging drivers/net/ethernet/amd/mvme147.c Auto-merging drivers/net/ethernet/amd/ni65.c Auto-merging drivers/net/ethernet/amd/nmclan_cs.c Auto-merging drivers/net/ethernet/amd/pcnet32.c Auto-merging drivers/net/ethernet/amd/sun3lance.c Auto-merging drivers/net/ethernet/amd/sunlance.c Auto-merging drivers/net/ethernet/apple/bmac.c Auto-merging drivers/net/ethernet/apple/cs89x0.c Auto-merging drivers/net/ethernet/apple/mac89x0.c Auto-merging drivers/net/ethernet/apple/mace.c Auto-merging drivers/net/ethernet/apple/macmace.c Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c Auto-merging drivers/net/ethernet/broadcom/b44.c Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c Auto-merging drivers/net/ethernet/broadcom/bnx2.c Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c Auto-merging drivers/net/ethernet/broadcom/cnic.c Auto-merging drivers/net/ethernet/broadcom/cnic.h Auto-merging drivers/net/ethernet/broadcom/cnic_defs.h Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c Auto-merging drivers/net/ethernet/broadcom/tg3.c Auto-merging drivers/net/ethernet/broadcom/tg3.h Auto-merging drivers/net/ethernet/brocade/bna/Makefile Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c Auto-merging drivers/net/ethernet/brocade/bna/bfi.h Auto-merging drivers/net/ethernet/brocade/bna/bna.h Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h Auto-merging drivers/net/ethernet/brocade/bna/bnad.c Auto-merging drivers/net/ethernet/brocade/bna/bnad.h Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c Auto-merging drivers/net/ethernet/brocade/bna/cna.h Auto-merging drivers/net/ethernet/cadence/at91_ether.c Auto-merging drivers/net/ethernet/cadence/macb.c Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c Auto-merging drivers/net/ethernet/davicom/dm9000.c Auto-merging drivers/net/ethernet/dec/ewrk3.c Auto-merging drivers/net/ethernet/dec/tulip/Kconfig Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c Auto-merging drivers/net/ethernet/dlink/de620.c Auto-merging drivers/net/ethernet/dlink/dl2k.c Auto-merging drivers/net/ethernet/dlink/dl2k.h Auto-merging drivers/net/ethernet/dlink/sundance.c Auto-merging drivers/net/ethernet/emulex/benet/be.h Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h Auto-merging drivers/net/ethernet/emulex/benet/be_main.c Auto-merging drivers/net/ethernet/ethoc.c Auto-merging drivers/net/ethernet/fealnx.c Auto-merging drivers/net/ethernet/freescale/fec.c Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c Auto-merging drivers/net/ethernet/freescale/gianfar.c Auto-merging drivers/net/ethernet/freescale/ucc_geth.c Auto-merging drivers/net/ethernet/fujitsu/at1700.c Auto-merging drivers/net/ethernet/fujitsu/eth16i.c Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c Auto-merging drivers/net/ethernet/hp/hp100.c Auto-merging drivers/net/ethernet/i825xx/3c505.c Auto-merging drivers/net/ethernet/i825xx/3c523.c Auto-merging drivers/net/ethernet/i825xx/3c527.c Auto-merging drivers/net/ethernet/i825xx/82596.c Auto-merging drivers/net/ethernet/i825xx/eepro.c Auto-merging drivers/net/ethernet/i825xx/eexpress.c Auto-merging drivers/net/ethernet/i825xx/ether1.c Auto-merging drivers/net/ethernet/i825xx/lib82596.c Auto-merging drivers/net/ethernet/i825xx/lp486e.c Auto-merging drivers/net/ethernet/i825xx/ni52.c Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c Auto-merging drivers/net/ethernet/i825xx/znet.c Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c Auto-merging drivers/net/ethernet/ibm/emac/Kconfig Auto-merging drivers/net/ethernet/ibm/emac/core.c Auto-merging drivers/net/ethernet/ibm/emac/core.h Auto-merging drivers/net/ethernet/ibm/emac/debug.h Auto-merging drivers/net/ethernet/ibm/emac/mal.c Auto-merging drivers/net/ethernet/ibm/emac/mal.h Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h Auto-merging drivers/net/ethernet/ibm/emac/tah.h Auto-merging drivers/net/ethernet/ibm/emac/zmii.h Auto-merging drivers/net/ethernet/ibm/ibmveth.c Auto-merging drivers/net/ethernet/ibm/iseries_veth.c Auto-merging drivers/net/ethernet/icplus/ipg.c Auto-merging drivers/net/ethernet/intel/e100.c Auto-merging drivers/net/ethernet/intel/e1000/e1000.h Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c Auto-merging drivers/net/ethernet/intel/e1000e/80003es2lan.c Auto-merging drivers/net/ethernet/intel/e1000e/82571.c Auto-merging drivers/net/ethernet/intel/e1000e/Makefile Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c Auto-merging drivers/net/ethernet/intel/e1000e/ich8lan.c Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c Auto-merging drivers/net/ethernet/intel/igb/igb_main.c Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c Auto-merging drivers/net/ethernet/intel/ixgbevf/ethtool.c Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf.h Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c Auto-merging drivers/net/ethernet/jme.c Auto-merging drivers/net/ethernet/korina.c Auto-merging drivers/net/ethernet/lantiq_etop.c Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c Auto-merging drivers/net/ethernet/marvell/skge.c Auto-merging drivers/net/ethernet/marvell/sky2.c Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c Auto-merging drivers/net/ethernet/micrel/ks8695net.c Auto-merging drivers/net/ethernet/microchip/enc28j60.c Auto-merging drivers/net/ethernet/mipsnet.c Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c Auto-merging drivers/net/ethernet/natsemi/ibmlana.c Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c Auto-merging drivers/net/ethernet/natsemi/macsonic.c Auto-merging drivers/net/ethernet/natsemi/natsemi.c Auto-merging drivers/net/ethernet/natsemi/ns83820.c Auto-merging drivers/net/ethernet/natsemi/xtsonic.c Auto-merging drivers/net/ethernet/neterion/s2io.c Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c Auto-merging drivers/net/ethernet/netx-eth.c Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c Auto-merging drivers/net/ethernet/nvidia/forcedeth.c Auto-merging drivers/net/ethernet/octeon/Kconfig Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c Auto-merging drivers/net/ethernet/packetengines/hamachi.c Auto-merging drivers/net/ethernet/packetengines/yellowfin.c Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c Auto-merging drivers/net/ethernet/racal/ni5010.c Auto-merging drivers/net/ethernet/rdc/r6040.c Auto-merging drivers/net/ethernet/realtek/8139cp.c Auto-merging drivers/net/ethernet/realtek/8139too.c Auto-merging drivers/net/ethernet/realtek/atp.c Auto-merging drivers/net/ethernet/realtek/r8169.c Auto-merging drivers/net/ethernet/realtek/sc92031.c Auto-merging drivers/net/ethernet/renesas/sh_eth.c Auto-merging drivers/net/ethernet/seeq/ether3.c Auto-merging drivers/net/ethernet/seeq/seeq8005.c Auto-merging drivers/net/ethernet/seeq/sgiseeq.c Auto-merging drivers/net/ethernet/sfc/Kconfig Auto-merging drivers/net/ethernet/sfc/efx.c Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c Auto-merging drivers/net/ethernet/sis/sis190.c Auto-merging drivers/net/ethernet/sis/sis900.c Auto-merging drivers/net/ethernet/smsc/epic100.c Auto-merging drivers/net/ethernet/smsc/smc911x.c Auto-merging drivers/net/ethernet/smsc/smc9194.c Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c Auto-merging drivers/net/ethernet/smsc/smc91x.c Auto-merging drivers/net/ethernet/smsc/smsc911x.c Auto-merging drivers/net/ethernet/smsc/smsc9420.c Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c Auto-merging drivers/net/ethernet/sun/cassini.c Auto-merging drivers/net/ethernet/sun/niu.c Auto-merging drivers/net/ethernet/sun/sunbmac.c Auto-merging drivers/net/ethernet/sun/sunbmac.h Auto-merging drivers/net/ethernet/sun/sungem.c Auto-merging drivers/net/ethernet/sun/sunhme.c Auto-merging drivers/net/ethernet/sun/sunqe.c Auto-merging drivers/net/ethernet/sun/sunvnet.c Auto-merging drivers/net/ethernet/tehuti/tehuti.c Auto-merging drivers/net/ethernet/ti/cpmac.c Auto-merging drivers/net/ethernet/ti/davinci_emac.c Auto-merging drivers/net/ethernet/ti/tlan.c Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c Auto-merging drivers/net/ethernet/toshiba/spider_net.c Auto-merging drivers/net/ethernet/toshiba/spider_net.h Auto-merging drivers/net/ethernet/toshiba/tc35815.c Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c Auto-merging drivers/net/ethernet/via/via-rhine.c Auto-merging drivers/net/ethernet/via/via-velocity.c Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c Auto-merging drivers/net/fddi/defxx.c Auto-merging drivers/net/fddi/skfp/h/cmtdef.h Auto-merging drivers/net/fddi/skfp/h/hwmtm.h Auto-merging drivers/net/fddi/skfp/h/sba.h Auto-merging drivers/net/fddi/skfp/h/skfbiinc.h Auto-merging drivers/net/fddi/skfp/h/smc.h Auto-merging drivers/net/fddi/skfp/h/targethw.h Auto-merging drivers/net/fddi/skfp/h/targetos.h Auto-merging drivers/net/fddi/skfp/skfddi.c Removing drivers/net/ibm_newemac/Makefile Removing drivers/net/octeon/Makefile Removing drivers/net/pci-skeleton.c Removing drivers/net/pcmcia/Kconfig Removing drivers/net/pcmcia/Makefile Auto-merging drivers/net/slip/slip.c Auto-merging drivers/net/slip/slip.h Auto-merging drivers/net/tokenring/ibmtr_cs.c Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c Auto-merging drivers/net/wireless/ath/ath9k/main.c Auto-merging drivers/net/wireless/wl12xx/main.c Auto-merging drivers/scsi/bnx2fc/bnx2fc.h Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c Auto-merging drivers/scsi/fcoe/fcoe.c Auto-merging drivers/scsi/fcoe/fcoe_transport.c Removing drivers/staging/ath6kl/Kconfig Removing drivers/staging/ath6kl/Makefile Removing drivers/staging/ath6kl/TODO Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h Removing drivers/staging/ath6kl/bmi/src/bmi.c Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c Removing drivers/staging/ath6kl/htc2/htc.c Removing drivers/staging/ath6kl/htc2/htc_debug.h Removing drivers/staging/ath6kl/htc2/htc_internal.h Removing drivers/staging/ath6kl/htc2/htc_recv.c Removing drivers/staging/ath6kl/htc2/htc_send.c Removing drivers/staging/ath6kl/htc2/htc_services.c Removing drivers/staging/ath6kl/include/a_config.h Removing drivers/staging/ath6kl/include/a_debug.h Removing drivers/staging/ath6kl/include/a_drv.h Removing drivers/staging/ath6kl/include/a_drv_api.h Removing drivers/staging/ath6kl/include/a_osapi.h Removing drivers/staging/ath6kl/include/aggr_recv_api.h Removing drivers/staging/ath6kl/include/ar3kconfig.h Removing drivers/staging/ath6kl/include/ar6000_api.h Removing drivers/staging/ath6kl/include/ar6000_diag.h Removing drivers/staging/ath6kl/include/ar6kap_common.h Removing drivers/staging/ath6kl/include/athbtfilter.h Removing drivers/staging/ath6kl/include/bmi.h Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h Removing drivers/staging/ath6kl/include/common/athdefs.h Removing drivers/staging/ath6kl/include/common/bmi_msg.h Removing drivers/staging/ath6kl/include/common/cnxmgmt.h Removing drivers/staging/ath6kl/include/common/dbglog.h Removing drivers/staging/ath6kl/include/common/dbglog_id.h Removing drivers/staging/ath6kl/include/common/discovery.h Removing drivers/staging/ath6kl/include/common/epping_test.h Removing drivers/staging/ath6kl/include/common/gmboxif.h Removing drivers/staging/ath6kl/include/common/gpio_reg.h Removing drivers/staging/ath6kl/include/common/htc.h Removing drivers/staging/ath6kl/include/common/htc_services.h Removing drivers/staging/ath6kl/include/common/pkt_log.h Removing drivers/staging/ath6kl/include/common/roaming.h Removing drivers/staging/ath6kl/include/common/targaddrs.h Removing drivers/staging/ath6kl/include/common/testcmd.h Removing drivers/staging/ath6kl/include/common/tlpm.h Removing drivers/staging/ath6kl/include/common/wlan_defs.h Removing drivers/staging/ath6kl/include/common/wmi.h Removing drivers/staging/ath6kl/include/common/wmix.h Removing drivers/staging/ath6kl/include/common_drv.h Removing drivers/staging/ath6kl/include/dbglog_api.h Removing drivers/staging/ath6kl/include/dl_list.h Removing drivers/staging/ath6kl/include/dset_api.h Removing drivers/staging/ath6kl/include/hci_transport_api.h Removing drivers/staging/ath6kl/include/hif.h Removing drivers/staging/ath6kl/include/host_version.h Removing drivers/staging/ath6kl/include/htc_api.h Removing drivers/staging/ath6kl/include/htc_packet.h Removing drivers/staging/ath6kl/include/wlan_api.h Removing drivers/staging/ath6kl/include/wmi_api.h Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h Removing drivers/staging/ath6kl/miscdrv/common_drv.c Removing drivers/staging/ath6kl/miscdrv/credit_dist.c Removing drivers/staging/ath6kl/miscdrv/miscdrv.h Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c Removing drivers/staging/ath6kl/os/linux/cfg80211.c Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c Removing drivers/staging/ath6kl/os/linux/hci_bridge.c Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h Removing drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h Removing drivers/staging/ath6kl/os/linux/include/config_linux.h Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h Removing drivers/staging/ath6kl/os/linux/netbuf.c Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h Removing drivers/staging/ath6kl/reorder/rcv_aggr.c Removing drivers/staging/ath6kl/wlan/include/ieee80211.h Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h Removing drivers/staging/ath6kl/wlan/src/wlan_node.c Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c Removing drivers/staging/ath6kl/wmi/wmi.c Removing drivers/staging/ath6kl/wmi/wmi_host.h Auto-merging include/linux/sungem_phy.h Auto-merging include/net/cfg80211.h Auto-merging net/core/neighbour.c Auto-merging net/core/netpoll.c Auto-merging net/ipv4/igmp.c Auto-merging net/mac80211/main.c Auto-merging net/socket.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig arch/powerpc/configs/40x/hcu4_defconfig: needs merge rm 'arch/powerpc/configs/40x/hcu4_defconfig' $ git commit -v -a [master 448a794] Merge remote-tracking branch 'net/master' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-class-net-mesh | 8 + .../devicetree/bindings/net/can/fsl-flexcan.txt | 63 +- Documentation/devicetree/bindings/net/smsc911x.txt | 38 + Documentation/networking/netdevices.txt | 4 +- MAINTAINERS | 175 +- arch/ia64/hp/sim/simeth.c | 2 +- arch/mips/Kconfig | 8 +- arch/mips/bcm47xx/Kconfig | 31 + arch/mips/bcm47xx/Makefile | 3 +- arch/mips/bcm47xx/gpio.c | 82 +- arch/mips/bcm47xx/irq.c | 12 + arch/mips/bcm47xx/nvram.c | 29 +- arch/mips/bcm47xx/serial.c | 46 +- arch/mips/bcm47xx/setup.c | 90 +- arch/mips/bcm47xx/time.c | 16 +- arch/mips/bcm47xx/wgt634u.c | 14 +- arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 26 +- arch/mips/include/asm/mach-bcm47xx/gpio.h | 108 +- arch/mips/pci/pci-bcm47xx.c | 6 + arch/powerpc/Kconfig | 2 + arch/powerpc/boot/dts/p1010rdb.dts | 10 +- arch/powerpc/boot/dts/p1010si.dtsi | 10 +- arch/powerpc/configs/40x/acadia_defconfig | 11 +- arch/powerpc/configs/40x/ep405_defconfig | 5 +- arch/powerpc/configs/40x/kilauea_defconfig | 9 +- arch/powerpc/configs/40x/makalu_defconfig | 9 +- arch/powerpc/configs/40x/walnut_defconfig | 5 +- arch/powerpc/configs/44x/arches_defconfig | 9 +- arch/powerpc/configs/44x/bamboo_defconfig | 5 +- arch/powerpc/configs/44x/bluestone_defconfig | 9 +- arch/powerpc/configs/44x/canyonlands_defconfig | 9 +- arch/powerpc/configs/44x/ebony_defconfig | 5 +- arch/powerpc/configs/44x/eiger_defconfig | 9 +- arch/powerpc/configs/44x/icon_defconfig | 5 +- arch/powerpc/configs/44x/katmai_defconfig | 5 +- arch/powerpc/configs/44x/redwood_defconfig | 11 +- arch/powerpc/configs/44x/sam440ep_defconfig | 5 +- arch/powerpc/configs/44x/sequoia_defconfig | 5 +- arch/powerpc/configs/44x/taishan_defconfig | 5 +- arch/powerpc/configs/44x/warp_defconfig | 5 +- arch/powerpc/configs/ppc40x_defconfig | 5 +- arch/powerpc/configs/ppc44x_defconfig | 5 +- arch/powerpc/platforms/40x/Kconfig | 12 +- arch/powerpc/platforms/44x/Kconfig | 54 +- arch/powerpc/platforms/cell/Kconfig | 8 +- arch/s390/include/asm/qdio.h | 78 +- arch/um/drivers/net_kern.c | 2 +- arch/xtensa/platforms/iss/network.c | 2 +- drivers/atm/eni.c | 3 +- drivers/bcma/Kconfig | 13 + drivers/bcma/Makefile | 2 + drivers/bcma/bcma_private.h | 16 + drivers/bcma/core.c | 2 + drivers/bcma/driver_chipcommon.c | 53 + drivers/bcma/driver_chipcommon_pmu.c | 133 + drivers/bcma/driver_mips.c | 256 + drivers/bcma/driver_pci.c | 16 +- drivers/bcma/host_soc.c | 183 + drivers/bcma/main.c | 70 +- drivers/bcma/scan.c | 348 +- drivers/infiniband/hw/amso1100/c2.c | 8 +- drivers/infiniband/hw/cxgb3/Makefile | 2 +- drivers/infiniband/hw/cxgb4/Makefile | 2 +- drivers/infiniband/hw/mlx4/Kconfig | 3 +- drivers/infiniband/hw/nes/nes_nic.c | 23 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 5 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 5 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/net/Kconfig | 3447 +---------- drivers/net/Makefile | 327 +- drivers/net/appletalk/cops.c | 2 +- drivers/net/appletalk/ltpc.c | 2 +- drivers/net/arcnet/Kconfig | 14 +- drivers/net/arcnet/Makefile | 1 + drivers/net/arcnet/com20020.c | 2 +- drivers/net/{pcmcia => arcnet}/com20020_cs.c | 0 drivers/net/arm/Kconfig | 74 - drivers/net/arm/Makefile | 14 - drivers/net/benet/Kconfig | 6 - drivers/net/bna/bfi_ctreg.h | 646 -- drivers/net/bna/bfi_ll.h | 438 -- drivers/net/bna/bna_ctrl.c | 3076 ---------- drivers/net/bna/bna_hw.h | 1490 ----- drivers/net/bna/bna_txrx.c | 4185 ------------- drivers/net/bonding/bond_main.c | 55 +- drivers/net/bonding/bonding.h | 1 - drivers/net/caif/caif_hsi.c | 9 +- drivers/net/caif/caif_spi.c | 4 - drivers/net/can/flexcan.c | 189 +- drivers/net/can/mscan/mscan.c | 26 +- drivers/net/cris/eth_v10.c | 2 +- drivers/net/dummy.c | 2 +- drivers/net/{ => ethernet/3com}/3c501.c | 2 +- drivers/net/{ => ethernet/3com}/3c501.h | 0 drivers/net/{ => ethernet/3com}/3c509.c | 2 +- drivers/net/{ => ethernet/3com}/3c515.c | 2 +- drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c | 2 +- drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c | 2 +- drivers/net/{ => ethernet/3com}/3c59x.c | 4 +- drivers/net/ethernet/3com/Kconfig | 121 + drivers/net/ethernet/3com/Makefile | 11 + drivers/net/{ => ethernet/3com}/typhoon.c | 2 +- drivers/net/{ => ethernet/3com}/typhoon.h | 0 drivers/net/{ => ethernet/8390}/3c503.c | 2 +- drivers/net/{ => ethernet/8390}/3c503.h | 0 drivers/net/{ => ethernet/8390}/8390.c | 2 +- drivers/net/{ => ethernet/8390}/8390.h | 0 drivers/net/{ => ethernet/8390}/8390p.c | 2 +- drivers/net/ethernet/8390/Kconfig | 337 + drivers/net/ethernet/8390/Makefile | 29 + drivers/net/{ => ethernet/8390}/ac3200.c | 2 +- drivers/net/{ => ethernet/8390}/apne.c | 0 drivers/net/{ => ethernet/8390}/ax88796.c | 2 +- drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c | 4 +- drivers/net/{ => ethernet/8390}/e2100.c | 2 +- drivers/net/{ => ethernet/8390}/es3210.c | 0 drivers/net/{arm => ethernet/8390}/etherh.c | 4 +- drivers/net/{ => ethernet/8390}/hp-plus.c | 2 +- drivers/net/{ => ethernet/8390}/hp.c | 0 drivers/net/{ => ethernet/8390}/hydra.c | 2 +- drivers/net/{ => ethernet/8390}/lib8390.c | 0 drivers/net/{ => ethernet/8390}/lne390.c | 0 drivers/net/{ => ethernet/8390}/mac8390.c | 2 +- drivers/net/{ => ethernet/8390}/ne-h8300.c | 2 +- drivers/net/{ => ethernet/8390}/ne.c | 0 drivers/net/{ => ethernet/8390}/ne2.c | 0 drivers/net/{ => ethernet/8390}/ne2k-pci.c | 2 +- drivers/net/{ => ethernet/8390}/ne3210.c | 0 drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c | 4 +- drivers/net/{ => ethernet/8390}/smc-mca.c | 2 +- drivers/net/{ => ethernet/8390}/smc-ultra.c | 2 +- drivers/net/{ => ethernet/8390}/smc-ultra32.c | 2 +- drivers/net/{ => ethernet/8390}/stnic.c | 0 drivers/net/{ => ethernet/8390}/wd.c | 2 +- drivers/net/{ => ethernet/8390}/zorro8390.c | 2 +- drivers/net/ethernet/Kconfig | 173 + drivers/net/ethernet/Makefile | 74 + drivers/net/ethernet/adaptec/Kconfig | 35 + drivers/net/ethernet/adaptec/Makefile | 5 + drivers/net/{ => ethernet/adaptec}/starfire.c | 2 +- drivers/net/ethernet/adi/Kconfig | 68 + drivers/net/ethernet/adi/Makefile | 5 + drivers/net/{ => ethernet/adi}/bfin_mac.c | 2 +- drivers/net/{ => ethernet/adi}/bfin_mac.h | 0 drivers/net/ethernet/aeroflex/Kconfig | 11 + drivers/net/ethernet/aeroflex/Makefile | 5 + drivers/net/{ => ethernet/aeroflex}/greth.c | 2 +- drivers/net/{ => ethernet/aeroflex}/greth.h | 0 drivers/net/ethernet/alteon/Kconfig | 48 + drivers/net/ethernet/alteon/Makefile | 5 + drivers/net/{ => ethernet/alteon}/acenic.c | 2 +- drivers/net/{ => ethernet/alteon}/acenic.h | 0 drivers/net/{ => ethernet/amd}/7990.c | 0 drivers/net/{ => ethernet/amd}/7990.h | 0 drivers/net/ethernet/amd/Kconfig | 193 + drivers/net/ethernet/amd/Makefile | 20 + drivers/net/{ => ethernet/amd}/a2065.c | 2 +- drivers/net/{ => ethernet/amd}/a2065.h | 0 drivers/net/{arm => ethernet/amd}/am79c961a.c | 2 +- drivers/net/{arm => ethernet/amd}/am79c961a.h | 0 drivers/net/{ => ethernet/amd}/amd8111e.c | 2 +- drivers/net/{ => ethernet/amd}/amd8111e.h | 0 drivers/net/{ => ethernet/amd}/ariadne.c | 2 +- drivers/net/{ => ethernet/amd}/ariadne.h | 0 drivers/net/{ => ethernet/amd}/atarilance.c | 2 +- drivers/net/{ => ethernet/amd}/au1000_eth.c | 2 +- drivers/net/{ => ethernet/amd}/au1000_eth.h | 0 drivers/net/{ => ethernet/amd}/declance.c | 2 +- drivers/net/{ => ethernet/amd}/depca.c | 2 +- drivers/net/{ => ethernet/amd}/depca.h | 0 drivers/net/{ => ethernet/amd}/hplance.c | 2 +- drivers/net/{ => ethernet/amd}/hplance.h | 0 drivers/net/{ => ethernet/amd}/lance.c | 2 +- drivers/net/{ => ethernet/amd}/mvme147.c | 2 +- drivers/net/{ => ethernet/amd}/ni65.c | 2 +- drivers/net/{ => ethernet/amd}/ni65.h | 0 drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c | 2 +- drivers/net/{ => ethernet/amd}/pcnet32.c | 2 +- drivers/net/{ => ethernet/amd}/sun3lance.c | 2 +- drivers/net/{ => ethernet/amd}/sunlance.c | 2 +- drivers/net/ethernet/apple/Kconfig | 97 + drivers/net/ethernet/apple/Makefile | 9 + drivers/net/{ => ethernet/apple}/bmac.c | 2 +- drivers/net/{ => ethernet/apple}/bmac.h | 0 drivers/net/{ => ethernet/apple}/cs89x0.c | 2 +- drivers/net/{ => ethernet/apple}/cs89x0.h | 0 drivers/net/{ => ethernet/apple}/mac89x0.c | 2 +- drivers/net/{ => ethernet/apple}/mace.c | 2 +- drivers/net/{ => ethernet/apple}/mace.h | 0 drivers/net/{ => ethernet/apple}/macmace.c | 2 +- drivers/net/ethernet/atheros/Kconfig | 66 + drivers/net/ethernet/atheros/Makefile | 8 + drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0 drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0 .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0 .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0 .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 2 +- drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0 drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0 .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0 .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0 .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 2 +- .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0 drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0 drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 2 +- drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0 drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 2 +- drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0 drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0 drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0 drivers/net/ethernet/broadcom/Kconfig | 120 + drivers/net/ethernet/broadcom/Makefile | 11 + drivers/net/{ => ethernet/broadcom}/b44.c | 2 +- drivers/net/{ => ethernet/broadcom}/b44.h | 0 drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 2 +- drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0 drivers/net/{ => ethernet/broadcom}/bnx2.c | 10 +- drivers/net/{ => ethernet/broadcom}/bnx2.h | 0 drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0 drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0 drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 67 +- .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 53 +- .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 8 +- .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 5 +- .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 23 +- .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0 .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 2 + .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 154 +- .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 79 +- .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0 .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c | 67 +- .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h | 0 .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 46 +- .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0 drivers/net/{ => ethernet/broadcom}/cnic.c | 35 +- drivers/net/{ => ethernet/broadcom}/cnic.h | 4 +- drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 1 + drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0 drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 2 +- drivers/net/{ => ethernet/broadcom}/tg3.c | 420 +- drivers/net/{ => ethernet/broadcom}/tg3.h | 3 + drivers/net/ethernet/brocade/Kconfig | 23 + drivers/net/ethernet/brocade/Makefile | 5 + drivers/net/ethernet/brocade/bna/Kconfig | 17 + drivers/net/{ => ethernet/brocade}/bna/Makefile | 5 +- drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 3 - drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0 drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0 drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 25 +- .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 0 .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 28 +- .../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0 drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 405 +- drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 45 +- .../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c | 157 +- drivers/net/ethernet/brocade/bna/bfa_msgq.c | 669 ++ drivers/net/ethernet/brocade/bna/bfa_msgq.h | 130 + drivers/net/{ => ethernet/brocade}/bna/bfi.h | 195 +- drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0 drivers/net/ethernet/brocade/bna/bfi_enet.h | 901 +++ drivers/net/ethernet/brocade/bna/bfi_reg.h | 452 ++ drivers/net/{ => ethernet/brocade}/bna/bna.h | 337 +- drivers/net/ethernet/brocade/bna/bna_enet.c | 2129 +++++++ drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 413 ++ drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 3787 ++++++++++++ drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 654 +-- drivers/net/{ => ethernet/brocade}/bna/bnad.c | 648 ++- drivers/net/{ => ethernet/brocade}/bna/bnad.h | 38 +- .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 384 +-- drivers/net/{ => ethernet/brocade}/bna/cna.h | 31 +- drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 0 drivers/net/ethernet/cadence/Kconfig | 44 + drivers/net/ethernet/cadence/Makefile | 6 + drivers/net/{arm => ethernet/cadence}/at91_ether.c | 2 +- drivers/net/{arm => ethernet/cadence}/at91_ether.h | 0 drivers/net/{ => ethernet/cadence}/macb.c | 2 +- drivers/net/{ => ethernet/cadence}/macb.h | 0 drivers/net/ethernet/chelsio/Kconfig | 107 + drivers/net/ethernet/chelsio/Makefile | 8 + .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0 .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 2 +- .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0 .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0 .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0 .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0 .../chelsio/cxgb}/suni1x10gexp_regs.h | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0 .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0 .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0 .../chelsio/cxgb}/vsc7326_reg.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0 .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0 .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 2 +- .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0 .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0 .../chelsio}/cxgb3/firmware_exports.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0 .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0 .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 3 + .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0 drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0 .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0 .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0 .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0 .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 2 + drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0 .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0 .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0 drivers/net/ethernet/cirrus/Kconfig | 29 + drivers/net/ethernet/cirrus/Makefile | 5 + drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c | 0 drivers/net/ethernet/cisco/Kconfig | 23 + drivers/net/ethernet/cisco/Makefile | 5 + drivers/net/ethernet/cisco/enic/Kconfig | 9 + drivers/net/{ => ethernet/cisco}/enic/Makefile | 0 drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0 .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0 drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 5 +- drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 0 drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0 drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0 .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 0 .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0 .../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0 .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0 drivers/net/ethernet/davicom/Kconfig | 23 + drivers/net/ethernet/davicom/Makefile | 5 + drivers/net/{ => ethernet/davicom}/dm9000.c | 13 +- drivers/net/{ => ethernet/davicom}/dm9000.h | 0 drivers/net/ethernet/dec/Kconfig | 37 + drivers/net/ethernet/dec/Makefile | 6 + drivers/net/{ => ethernet/dec}/ewrk3.c | 2 +- drivers/net/{ => ethernet/dec}/ewrk3.h | 0 drivers/net/{ => ethernet/dec}/tulip/21142.c | 0 drivers/net/{ => ethernet/dec}/tulip/Kconfig | 20 +- drivers/net/{ => ethernet/dec}/tulip/Makefile | 0 drivers/net/{ => ethernet/dec}/tulip/de2104x.c | 2 +- drivers/net/{ => ethernet/dec}/tulip/de4x5.c | 2 +- drivers/net/{ => ethernet/dec}/tulip/de4x5.h | 0 drivers/net/{ => ethernet/dec}/tulip/dmfe.c | 2 +- drivers/net/{ => ethernet/dec}/tulip/eeprom.c | 0 drivers/net/{ => ethernet/dec}/tulip/interrupt.c | 0 drivers/net/{ => ethernet/dec}/tulip/media.c | 0 drivers/net/{ => ethernet/dec}/tulip/pnic.c | 0 drivers/net/{ => ethernet/dec}/tulip/pnic2.c | 0 drivers/net/{ => ethernet/dec}/tulip/timer.c | 0 drivers/net/{ => ethernet/dec}/tulip/tulip.h | 0 drivers/net/{ => ethernet/dec}/tulip/tulip_core.c | 2 +- drivers/net/{ => ethernet/dec}/tulip/uli526x.c | 2 +- drivers/net/{ => ethernet/dec}/tulip/winbond-840.c | 2 +- drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c | 0 drivers/net/ethernet/dlink/Kconfig | 85 + drivers/net/ethernet/dlink/Makefile | 8 + drivers/net/{ => ethernet/dlink}/de600.c | 0 drivers/net/{ => ethernet/dlink}/de600.h | 0 drivers/net/{ => ethernet/dlink}/de620.c | 2 +- drivers/net/{ => ethernet/dlink}/de620.h | 0 drivers/net/{ => ethernet/dlink}/dl2k.c | 107 +- drivers/net/{ => ethernet/dlink}/dl2k.h | 110 +- drivers/net/{ => ethernet/dlink}/sundance.c | 2 +- drivers/net/{ => ethernet}/dnet.c | 0 drivers/net/{ => ethernet}/dnet.h | 0 drivers/net/ethernet/emulex/Kconfig | 23 + drivers/net/ethernet/emulex/Makefile | 5 + drivers/net/ethernet/emulex/benet/Kconfig | 6 + drivers/net/{ => ethernet/emulex}/benet/Makefile | 0 drivers/net/{ => ethernet/emulex}/benet/be.h | 125 +- drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 164 +- drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 91 +- .../net/{ => ethernet/emulex}/benet/be_ethtool.c | 154 +- drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 21 +- drivers/net/{ => ethernet/emulex}/benet/be_main.c | 533 +- drivers/net/{ => ethernet}/ethoc.c | 2 +- drivers/net/ethernet/faraday/Kconfig | 39 + drivers/net/ethernet/faraday/Makefile | 6 + drivers/net/{ => ethernet/faraday}/ftgmac100.c | 0 drivers/net/{ => ethernet/faraday}/ftgmac100.h | 0 drivers/net/{ => ethernet/faraday}/ftmac100.c | 0 drivers/net/{ => ethernet/faraday}/ftmac100.h | 0 drivers/net/{ => ethernet}/fealnx.c | 2 +- drivers/net/ethernet/freescale/Kconfig | 89 + drivers/net/ethernet/freescale/Makefile | 18 + drivers/net/{ => ethernet/freescale}/fec.c | 2 +- drivers/net/{ => ethernet/freescale}/fec.h | 0 drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c | 2 +- drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h | 0 .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c | 0 .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +- .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0 drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0 .../freescale}/fs_enet/fs_enet-main.c | 2 +- .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0 .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0 .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0 .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0 .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0 .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0 drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0 drivers/net/{ => ethernet/freescale}/gianfar.c | 2 +- drivers/net/{ => ethernet/freescale}/gianfar.h | 0 .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0 drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0 .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0 drivers/net/{ => ethernet/freescale}/ucc_geth.c | 12 +- drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0 .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0 drivers/net/ethernet/fujitsu/Kconfig | 54 + drivers/net/ethernet/fujitsu/Makefile | 7 + drivers/net/{ => ethernet/fujitsu}/at1700.c | 2 +- drivers/net/{ => ethernet/fujitsu}/eth16i.c | 2 +- .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c | 2 +- drivers/net/ethernet/hp/Kconfig | 32 + drivers/net/ethernet/hp/Makefile | 5 + drivers/net/{ => ethernet/hp}/hp100.c | 4 +- drivers/net/{ => ethernet/hp}/hp100.h | 0 drivers/net/{ => ethernet/i825xx}/3c505.c | 2 +- drivers/net/{ => ethernet/i825xx}/3c505.h | 0 drivers/net/{ => ethernet/i825xx}/3c507.c | 0 drivers/net/{ => ethernet/i825xx}/3c523.c | 2 +- drivers/net/{ => ethernet/i825xx}/3c523.h | 0 drivers/net/{ => ethernet/i825xx}/3c527.c | 2 +- drivers/net/{ => ethernet/i825xx}/3c527.h | 0 drivers/net/{ => ethernet/i825xx}/82596.c | 2 +- drivers/net/ethernet/i825xx/Kconfig | 183 + drivers/net/ethernet/i825xx/Makefile | 20 + drivers/net/{ => ethernet/i825xx}/eepro.c | 2 +- drivers/net/{ => ethernet/i825xx}/eexpress.c | 2 +- drivers/net/{ => ethernet/i825xx}/eexpress.h | 0 drivers/net/{arm => ethernet/i825xx}/ether1.c | 2 +- drivers/net/{arm => ethernet/i825xx}/ether1.h | 0 drivers/net/{ => ethernet/i825xx}/lasi_82596.c | 0 drivers/net/{ => ethernet/i825xx}/lib82596.c | 2 +- drivers/net/{ => ethernet/i825xx}/lp486e.c | 2 +- drivers/net/{ => ethernet/i825xx}/ni52.c | 2 +- drivers/net/{ => ethernet/i825xx}/ni52.h | 0 drivers/net/{ => ethernet/i825xx}/sni_82596.c | 0 drivers/net/{ => ethernet/i825xx}/sun3_82586.c | 2 +- drivers/net/{ => ethernet/i825xx}/sun3_82586.h | 0 drivers/net/{ => ethernet/i825xx}/znet.c | 2 +- drivers/net/ethernet/ibm/Kconfig | 48 + drivers/net/ethernet/ibm/Makefile | 8 + drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0 drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0 drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0 drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0 drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 2 +- drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0 drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0 drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig | 40 +- drivers/net/ethernet/ibm/emac/Makefile | 11 + .../net/{ibm_newemac => ethernet/ibm/emac}/core.c | 16 +- .../net/{ibm_newemac => ethernet/ibm/emac}/core.h | 16 +- .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h | 2 +- .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c | 6 +- .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h | 4 +- .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h | 4 +- .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h | 4 +- .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c | 0 .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h | 4 +- drivers/net/{ => ethernet/ibm}/ibmveth.c | 2 +- drivers/net/{ => ethernet/ibm}/ibmveth.h | 0 drivers/net/{ => ethernet/ibm}/iseries_veth.c | 2 +- drivers/net/ethernet/icplus/Kconfig | 13 + drivers/net/ethernet/icplus/Makefile | 5 + drivers/net/{ => ethernet/icplus}/ipg.c | 199 +- drivers/net/{ => ethernet/icplus}/ipg.h | 0 drivers/net/ethernet/intel/Kconfig | 221 + drivers/net/ethernet/intel/Makefile | 12 + drivers/net/{ => ethernet/intel}/e100.c | 2 +- drivers/net/{ => ethernet/intel}/e1000/Makefile | 0 drivers/net/{ => ethernet/intel}/e1000/e1000.h | 2 + .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0 drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0 .../net/{ => ethernet/intel}/e1000/e1000_main.c | 20 +- .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0 .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0 .../intel/e1000e/80003es2lan.c} | 1 - drivers/net/{ => ethernet/intel}/e1000e/82571.c | 5 - drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +- drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0 drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 6 +- drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 97 +- drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0 drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 5 - drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0 drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 250 +- drivers/net/{ => ethernet/intel}/e1000e/param.c | 0 drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0 drivers/net/{ => ethernet/intel}/igb/Makefile | 0 drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0 drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0 .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0 drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0 drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0 drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0 drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0 drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0 drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0 drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0 drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0 drivers/net/{ => ethernet/intel}/igb/igb.h | 0 drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0 drivers/net/{ => ethernet/intel}/igb/igb_main.c | 4 +- drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0 drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0 drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0 drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0 drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0 drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0 drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 2 +- drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0 drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0 drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0 drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0 .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 2 +- drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0 drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0 drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 34 +- .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 0 .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 2 +- .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 10 +- .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 756 ++-- drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0 drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0 .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0 drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0 drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0 drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 46 - drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 8 +- .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 85 +- drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0 drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0 drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0 drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0 drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0 drivers/net/{ => ethernet}/jme.c | 2 +- drivers/net/{ => ethernet}/jme.h | 0 drivers/net/{ => ethernet}/korina.c | 3 +- drivers/net/{ => ethernet}/lantiq_etop.c | 2 +- drivers/net/ethernet/marvell/Kconfig | 111 + drivers/net/ethernet/marvell/Makefile | 8 + drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 2 + drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0 drivers/net/{ => ethernet/marvell}/skge.c | 2 +- drivers/net/{ => ethernet/marvell}/skge.h | 0 drivers/net/{ => ethernet/marvell}/sky2.c | 4 +- drivers/net/{ => ethernet/marvell}/sky2.h | 0 drivers/net/ethernet/mellanox/Kconfig | 23 + drivers/net/ethernet/mellanox/Makefile | 5 + drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 + drivers/net/{ => ethernet/mellanox}/mlx4/Makefile | 0 drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/catas.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/cq.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c | 0 .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c | 0 .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c | 2 +- drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h | 0 .../{ => ethernet/mellanox}/mlx4/en_resources.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c | 0 .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/eq.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/fw.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/fw.h | 0 drivers/net/{ => ethernet/mellanox}/mlx4/icm.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/icm.h | 0 drivers/net/{ => ethernet/mellanox}/mlx4/intf.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/main.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h | 0 drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h | 0 drivers/net/{ => ethernet/mellanox}/mlx4/mr.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/pd.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/port.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/profile.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/qp.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/reset.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/sense.c | 0 drivers/net/{ => ethernet/mellanox}/mlx4/srq.c | 0 drivers/net/ethernet/micrel/Kconfig | 65 + drivers/net/ethernet/micrel/Makefile | 9 + drivers/net/{arm => ethernet/micrel}/ks8695net.c | 2 +- drivers/net/{arm => ethernet/micrel}/ks8695net.h | 0 drivers/net/{ => ethernet/micrel}/ks8842.c | 0 drivers/net/{ => ethernet/micrel}/ks8851.c | 0 drivers/net/{ => ethernet/micrel}/ks8851.h | 0 drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0 drivers/net/{ => ethernet/micrel}/ksz884x.c | 0 drivers/net/ethernet/microchip/Kconfig | 38 + drivers/net/ethernet/microchip/Makefile | 5 + drivers/net/{ => ethernet/microchip}/enc28j60.c | 2 +- drivers/net/{ => ethernet/microchip}/enc28j60_hw.h | 0 drivers/net/{ => ethernet}/mipsnet.c | 2 +- drivers/net/ethernet/myricom/Kconfig | 47 + drivers/net/ethernet/myricom/Makefile | 5 + .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0 .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 2 +- .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0 .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0 drivers/net/ethernet/natsemi/Kconfig | 83 + drivers/net/ethernet/natsemi/Makefile | 10 + drivers/net/{ => ethernet/natsemi}/ibmlana.c | 2 +- drivers/net/{ => ethernet/natsemi}/ibmlana.h | 0 drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 2 +- drivers/net/{ => ethernet/natsemi}/macsonic.c | 2 +- drivers/net/{ => ethernet/natsemi}/natsemi.c | 2 +- drivers/net/{ => ethernet/natsemi}/ns83820.c | 2 +- drivers/net/{ => ethernet/natsemi}/sonic.c | 0 drivers/net/{ => ethernet/natsemi}/sonic.h | 0 drivers/net/{ => ethernet/natsemi}/xtsonic.c | 2 +- drivers/net/ethernet/neterion/Kconfig | 55 + drivers/net/ethernet/neterion/Makefile | 6 + drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0 drivers/net/{ => ethernet/neterion}/s2io.c | 2 +- drivers/net/{ => ethernet/neterion}/s2io.h | 0 drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0 .../net/{ => ethernet/neterion}/vxge/vxge-config.c | 0 .../net/{ => ethernet/neterion}/vxge/vxge-config.h | 0 .../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0 .../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0 .../net/{ => ethernet/neterion}/vxge/vxge-main.c | 2 +- .../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0 .../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0 .../{ => ethernet/neterion}/vxge/vxge-traffic.c | 0 .../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0 .../{ => ethernet/neterion}/vxge/vxge-version.h | 0 drivers/net/{ => ethernet}/netx-eth.c | 2 +- drivers/net/ethernet/nuvoton/Kconfig | 30 + drivers/net/ethernet/nuvoton/Makefile | 5 + .../net/{arm => ethernet/nuvoton}/w90p910_ether.c | 2 +- drivers/net/ethernet/nvidia/Kconfig | 32 + drivers/net/ethernet/nvidia/Makefile | 5 + drivers/net/{ => ethernet/nvidia}/forcedeth.c | 4 +- drivers/net/{ => ethernet}/octeon/Kconfig | 6 +- drivers/net/ethernet/octeon/Makefile | 5 + drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 4 +- drivers/net/ethernet/oki-semi/Kconfig | 23 + drivers/net/ethernet/oki-semi/Makefile | 5 + drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 20 + .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile | 0 .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h | 0 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c | 0 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h | 0 .../oki-semi}/pch_gbe/pch_gbe_ethtool.c | 0 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c | 2 +- .../oki-semi}/pch_gbe/pch_gbe_param.c | 0 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c | 0 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h | 0 drivers/net/ethernet/packetengines/Kconfig | 46 + drivers/net/ethernet/packetengines/Makefile | 6 + drivers/net/{ => ethernet/packetengines}/hamachi.c | 2 +- .../net/{ => ethernet/packetengines}/yellowfin.c | 2 +- drivers/net/ethernet/pasemi/Kconfig | 30 + drivers/net/ethernet/pasemi/Makefile | 5 + drivers/net/{ => ethernet/pasemi}/pasemi_mac.c | 2 +- drivers/net/{ => ethernet/pasemi}/pasemi_mac.h | 0 .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c | 0 drivers/net/ethernet/qlogic/Kconfig | 54 + drivers/net/ethernet/qlogic/Makefile | 8 + drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0 .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 6 + .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0 .../qlogic}/netxen/netxen_nic_ethtool.c | 0 .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0 .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0 .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 8 +- .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 105 +- drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 3 +- drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0 drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0 drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 6 +- .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0 .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 22 +- .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0 .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 4 +- .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 3 +- .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 42 +- drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0 drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0 drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0 .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0 drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 2 +- drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0 drivers/net/ethernet/racal/Kconfig | 33 + drivers/net/ethernet/racal/Makefile | 5 + drivers/net/{ => ethernet/racal}/ni5010.c | 2 +- drivers/net/{ => ethernet/racal}/ni5010.h | 0 drivers/net/ethernet/rdc/Kconfig | 34 + drivers/net/ethernet/rdc/Makefile | 5 + drivers/net/{ => ethernet/rdc}/r6040.c | 2 +- drivers/net/{ => ethernet/realtek}/8139cp.c | 2 +- drivers/net/{ => ethernet/realtek}/8139too.c | 2 +- drivers/net/ethernet/realtek/Kconfig | 127 + drivers/net/ethernet/realtek/Makefile | 9 + drivers/net/{ => ethernet/realtek}/atp.c | 2 +- drivers/net/{ => ethernet/realtek}/atp.h | 0 drivers/net/{ => ethernet/realtek}/r8169.c | 2 +- drivers/net/{ => ethernet/realtek}/sc92031.c | 2 +- drivers/net/ethernet/renesas/Kconfig | 18 + drivers/net/ethernet/renesas/Makefile | 5 + drivers/net/{ => ethernet/renesas}/sh_eth.c | 2 +- drivers/net/{ => ethernet/renesas}/sh_eth.h | 0 drivers/net/{ => ethernet}/s6gmac.c | 0 drivers/net/ethernet/seeq/Kconfig | 46 + drivers/net/ethernet/seeq/Makefile | 7 + drivers/net/{arm => ethernet/seeq}/ether3.c | 2 +- drivers/net/{arm => ethernet/seeq}/ether3.h | 0 drivers/net/{ => ethernet/seeq}/seeq8005.c | 2 +- drivers/net/{ => ethernet/seeq}/seeq8005.h | 0 drivers/net/{ => ethernet/seeq}/sgiseeq.c | 2 +- drivers/net/{ => ethernet/seeq}/sgiseeq.h | 0 drivers/net/{ => ethernet}/sfc/Kconfig | 4 +- drivers/net/{ => ethernet}/sfc/Makefile | 0 drivers/net/{ => ethernet}/sfc/bitfield.h | 0 drivers/net/{ => ethernet}/sfc/efx.c | 2 +- drivers/net/{ => ethernet}/sfc/efx.h | 0 drivers/net/{ => ethernet}/sfc/enum.h | 0 drivers/net/{ => ethernet}/sfc/ethtool.c | 0 drivers/net/{ => ethernet}/sfc/falcon.c | 0 drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0 drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0 drivers/net/{ => ethernet}/sfc/filter.c | 0 drivers/net/{ => ethernet}/sfc/filter.h | 0 drivers/net/{ => ethernet}/sfc/io.h | 0 drivers/net/{ => ethernet}/sfc/mac.h | 0 drivers/net/{ => ethernet}/sfc/mcdi.c | 0 drivers/net/{ => ethernet}/sfc/mcdi.h | 0 drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0 drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0 drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0 drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0 drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0 drivers/net/{ => ethernet}/sfc/mtd.c | 0 drivers/net/{ => ethernet}/sfc/net_driver.h | 0 drivers/net/{ => ethernet}/sfc/nic.c | 0 drivers/net/{ => ethernet}/sfc/nic.h | 0 drivers/net/{ => ethernet}/sfc/phy.h | 0 drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0 drivers/net/{ => ethernet}/sfc/regs.h | 0 drivers/net/{ => ethernet}/sfc/rx.c | 0 drivers/net/{ => ethernet}/sfc/selftest.c | 0 drivers/net/{ => ethernet}/sfc/selftest.h | 0 drivers/net/{ => ethernet}/sfc/siena.c | 0 drivers/net/{ => ethernet}/sfc/spi.h | 0 drivers/net/{ => ethernet}/sfc/tenxpress.c | 0 drivers/net/{ => ethernet}/sfc/tx.c | 0 drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0 drivers/net/{ => ethernet}/sfc/workarounds.h | 0 drivers/net/ethernet/sgi/Kconfig | 35 + drivers/net/ethernet/sgi/Makefile | 6 + drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 2 +- drivers/net/{ => ethernet/sgi}/meth.c | 0 drivers/net/{ => ethernet/sgi}/meth.h | 0 drivers/net/ethernet/sis/Kconfig | 51 + drivers/net/ethernet/sis/Makefile | 6 + drivers/net/{ => ethernet/sis}/sis190.c | 2 +- drivers/net/{ => ethernet/sis}/sis900.c | 2 +- drivers/net/{ => ethernet/sis}/sis900.h | 0 drivers/net/ethernet/smsc/Kconfig | 132 + drivers/net/ethernet/smsc/Makefile | 11 + drivers/net/{ => ethernet/smsc}/epic100.c | 2 +- drivers/net/{ => ethernet/smsc}/smc911x.c | 2 +- drivers/net/{ => ethernet/smsc}/smc911x.h | 0 drivers/net/{ => ethernet/smsc}/smc9194.c | 2 +- drivers/net/{ => ethernet/smsc}/smc9194.h | 0 .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c | 2 +- drivers/net/{ => ethernet/smsc}/smc91x.c | 2 +- drivers/net/{ => ethernet/smsc}/smc91x.h | 0 drivers/net/{ => ethernet/smsc}/smsc911x.c | 87 +- drivers/net/{ => ethernet/smsc}/smsc911x.h | 0 drivers/net/{ => ethernet/smsc}/smsc9420.c | 2 +- drivers/net/{ => ethernet/smsc}/smsc9420.h | 0 drivers/net/ethernet/stmicro/Kconfig | 23 + drivers/net/ethernet/stmicro/Makefile | 5 + drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig | 14 +- drivers/net/{ => ethernet/stmicro}/stmmac/Makefile | 0 drivers/net/{ => ethernet/stmicro}/stmmac/common.h | 0 drivers/net/{ => ethernet/stmicro}/stmmac/descs.h | 0 .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h | 0 .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0 .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c | 0 .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c | 0 .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c | 0 .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c | 0 .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 0 .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0 .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c | 0 .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c | 0 drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h | 0 .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c | 0 .../{ => ethernet/stmicro}/stmmac/stmmac_main.c | 13 +- .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c | 0 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c | 0 .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h | 0 drivers/net/ethernet/sun/Kconfig | 88 + drivers/net/ethernet/sun/Makefile | 11 + drivers/net/{ => ethernet/sun}/cassini.c | 2 +- drivers/net/{ => ethernet/sun}/cassini.h | 0 drivers/net/{ => ethernet/sun}/niu.c | 5 +- drivers/net/{ => ethernet/sun}/niu.h | 0 drivers/net/{ => ethernet/sun}/sunbmac.c | 33 +- drivers/net/{ => ethernet/sun}/sunbmac.h | 17 - drivers/net/{ => ethernet/sun}/sungem.c | 6 +- drivers/net/{ => ethernet/sun}/sungem.h | 0 drivers/net/{ => ethernet/sun}/sunhme.c | 2 +- drivers/net/{ => ethernet/sun}/sunhme.h | 0 drivers/net/{ => ethernet/sun}/sunqe.c | 2 +- drivers/net/{ => ethernet/sun}/sunqe.h | 0 drivers/net/{ => ethernet/sun}/sunvnet.c | 2 +- drivers/net/{ => ethernet/sun}/sunvnet.h | 0 drivers/net/ethernet/tehuti/Kconfig | 27 + drivers/net/ethernet/tehuti/Makefile | 5 + drivers/net/{ => ethernet/tehuti}/tehuti.c | 2 +- drivers/net/{ => ethernet/tehuti}/tehuti.h | 0 drivers/net/ethernet/ti/Kconfig | 77 + drivers/net/ethernet/ti/Makefile | 9 + drivers/net/{ => ethernet/ti}/cpmac.c | 2 +- drivers/net/{ => ethernet/ti}/davinci_cpdma.c | 0 drivers/net/{ => ethernet/ti}/davinci_cpdma.h | 0 drivers/net/{ => ethernet/ti}/davinci_emac.c | 2 +- drivers/net/{ => ethernet/ti}/davinci_mdio.c | 0 drivers/net/{ => ethernet/ti}/tlan.c | 2 +- drivers/net/{ => ethernet/ti}/tlan.h | 0 drivers/net/ethernet/tile/Kconfig | 15 + drivers/net/{ => ethernet}/tile/Makefile | 0 drivers/net/{ => ethernet}/tile/tilepro.c | 0 drivers/net/ethernet/toshiba/Kconfig | 57 + drivers/net/ethernet/toshiba/Makefile | 10 + drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c | 2 +- drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h | 0 .../{ => ethernet/toshiba}/ps3_gelic_wireless.c | 2 +- .../{ => ethernet/toshiba}/ps3_gelic_wireless.h | 0 drivers/net/{ => ethernet/toshiba}/spider_net.c | 6 +- drivers/net/{ => ethernet/toshiba}/spider_net.h | 2 +- .../{ => ethernet/toshiba}/spider_net_ethtool.c | 0 drivers/net/{ => ethernet/toshiba}/tc35815.c | 2 +- drivers/net/ethernet/tundra/Kconfig | 29 + drivers/net/ethernet/tundra/Makefile | 5 + drivers/net/{ => ethernet/tundra}/tsi108_eth.c | 2 +- drivers/net/{ => ethernet/tundra}/tsi108_eth.h | 0 drivers/net/ethernet/via/Kconfig | 57 + drivers/net/ethernet/via/Makefile | 6 + drivers/net/{ => ethernet/via}/via-rhine.c | 2 +- drivers/net/{ => ethernet/via}/via-velocity.c | 148 +- drivers/net/{ => ethernet/via}/via-velocity.h | 0 drivers/net/ethernet/xilinx/Kconfig | 36 + drivers/net/ethernet/xilinx/Makefile | 7 + drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0 drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 1 - drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0 .../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0 drivers/net/ethernet/xircom/Kconfig | 31 + drivers/net/ethernet/xircom/Makefile | 5 + .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c | 2 +- drivers/net/ethernet/xscale/Kconfig | 32 + drivers/net/ethernet/xscale/Makefile | 6 + drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig | 2 +- drivers/net/{ => ethernet/xscale}/ixp2000/Makefile | 0 drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c | 0 drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h | 0 .../net/{ => ethernet/xscale}/ixp2000/enp2611.c | 0 .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c | 0 .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h | 0 .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc | 0 .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode | 0 .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc | 0 .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode | 0 drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c | 0 drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h | 0 .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h | 0 drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c | 0 drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h | 0 drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c | 2 +- drivers/net/fddi/Kconfig | 77 + drivers/net/fddi/Makefile | 6 + drivers/net/{ => fddi}/defxx.c | 2 +- drivers/net/{ => fddi}/defxx.h | 0 drivers/net/{ => fddi}/skfp/Makefile | 0 drivers/net/{ => fddi}/skfp/cfm.c | 0 drivers/net/{ => fddi}/skfp/drvfbi.c | 0 drivers/net/{ => fddi}/skfp/ecm.c | 0 drivers/net/{ => fddi}/skfp/ess.c | 0 drivers/net/{ => fddi}/skfp/fplustm.c | 0 drivers/net/{ => fddi}/skfp/h/cmtdef.h | 4 +- drivers/net/{ => fddi}/skfp/h/fddi.h | 0 drivers/net/{ => fddi}/skfp/h/fddimib.h | 0 drivers/net/{ => fddi}/skfp/h/fplustm.h | 0 drivers/net/{ => fddi}/skfp/h/hwmtm.h | 2 +- drivers/net/{ => fddi}/skfp/h/mbuf.h | 0 drivers/net/{ => fddi}/skfp/h/osdef1st.h | 0 drivers/net/{ => fddi}/skfp/h/sba.h | 4 +- drivers/net/{ => fddi}/skfp/h/sba_def.h | 0 drivers/net/{ => fddi}/skfp/h/skfbi.h | 0 drivers/net/{ => fddi}/skfp/h/skfbiinc.h | 2 +- drivers/net/{ => fddi}/skfp/h/smc.h | 14 +- drivers/net/{ => fddi}/skfp/h/smt.h | 0 drivers/net/{ => fddi}/skfp/h/smt_p.h | 0 drivers/net/{ => fddi}/skfp/h/smtstate.h | 0 drivers/net/{ => fddi}/skfp/h/supern_2.h | 0 drivers/net/{ => fddi}/skfp/h/targethw.h | 6 +- drivers/net/{ => fddi}/skfp/h/targetos.h | 2 +- drivers/net/{ => fddi}/skfp/h/types.h | 0 drivers/net/{ => fddi}/skfp/hwmtm.c | 0 drivers/net/{ => fddi}/skfp/hwt.c | 0 drivers/net/{ => fddi}/skfp/pcmplc.c | 0 drivers/net/{ => fddi}/skfp/pmf.c | 0 drivers/net/{ => fddi}/skfp/queue.c | 0 drivers/net/{ => fddi}/skfp/rmt.c | 0 drivers/net/{ => fddi}/skfp/skfddi.c | 2 +- drivers/net/{ => fddi}/skfp/smt.c | 0 drivers/net/{ => fddi}/skfp/smtdef.c | 0 drivers/net/{ => fddi}/skfp/smtinit.c | 0 drivers/net/{ => fddi}/skfp/smttimer.c | 0 drivers/net/{ => fddi}/skfp/srf.c | 0 drivers/net/hippi/Kconfig | 39 + drivers/net/hippi/Makefile | 5 + drivers/net/{ => hippi}/rrunner.c | 0 drivers/net/{ => hippi}/rrunner.h | 0 drivers/net/ibm_newemac/Makefile | 11 - drivers/net/macvlan.c | 2 +- drivers/net/octeon/Makefile | 2 - drivers/net/pci-skeleton.c | 1923 ------ drivers/net/pcmcia/Kconfig | 123 - drivers/net/pcmcia/Makefile | 16 - drivers/net/phy/Kconfig | 2 +- drivers/net/plip/Kconfig | 38 + drivers/net/plip/Makefile | 5 + drivers/net/{ => plip}/plip.c | 0 drivers/net/ppp/Kconfig | 175 + drivers/net/ppp/Makefile | 13 + drivers/net/{ => ppp}/bsd_comp.c | 0 drivers/net/{ => ppp}/ppp_async.c | 0 drivers/net/{ => ppp}/ppp_deflate.c | 0 drivers/net/{ => ppp}/ppp_generic.c | 0 drivers/net/{ => ppp}/ppp_mppe.c | 0 drivers/net/{ => ppp}/ppp_mppe.h | 0 drivers/net/{ => ppp}/ppp_synctty.c | 0 drivers/net/{ => ppp}/pppoe.c | 0 drivers/net/{ => ppp}/pppox.c | 0 drivers/net/{ => ppp}/pptp.c | 0 drivers/net/slip/Kconfig | 79 + drivers/net/slip/Makefile | 6 + drivers/net/{ => slip}/slhc.c | 0 drivers/net/{ => slip}/slip.c | 29 +- drivers/net/{ => slip}/slip.h | 9 - drivers/net/sungem_phy.c | 7 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/Kconfig | 15 +- drivers/net/tokenring/Makefile | 21 +- drivers/net/tokenring/ibmtr.c | 2 +- drivers/net/{pcmcia => tokenring}/ibmtr_cs.c | 2 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/tokenring/smctr.c | 2 +- drivers/net/tokenring/tms380tr.c | 2 +- drivers/net/tun.c | 2 +- drivers/net/usb/asix.c | 6 +- drivers/net/usb/catc.c | 2 +- drivers/net/usb/dm9601.c | 2 +- drivers/net/usb/int51x1.c | 2 +- drivers/net/usb/kaweth.c | 2 +- drivers/net/usb/lg-vl600.c | 19 + drivers/net/usb/mcs7830.c | 2 +- drivers/net/usb/pegasus.c | 2 +- drivers/net/usb/rtl8150.c | 2 +- drivers/net/usb/smsc75xx.c | 2 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/virtio_net.c | 1 + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/net/wan/hdlc_ppp.c | 14 +- drivers/net/wan/sbni.c | 2 +- drivers/net/wireless/airo.c | 4 +- drivers/net/wireless/ath/Kconfig | 1 + drivers/net/wireless/ath/Makefile | 1 + drivers/net/wireless/ath/ath5k/ahb.c | 4 +- drivers/net/wireless/ath/ath5k/ani.c | 1 - drivers/net/wireless/ath/ath5k/ani.h | 4 + drivers/net/wireless/ath/ath5k/ath5k.h | 98 +- drivers/net/wireless/ath/ath5k/attach.c | 18 +- drivers/net/wireless/ath/ath5k/base.c | 31 +- drivers/net/wireless/ath/ath5k/base.h | 55 +- drivers/net/wireless/ath/ath5k/caps.c | 2 +- drivers/net/wireless/ath/ath5k/debug.c | 15 +- drivers/net/wireless/ath/ath5k/desc.c | 1 - drivers/net/wireless/ath/ath5k/dma.c | 1 - drivers/net/wireless/ath/ath5k/eeprom.c | 10 +- drivers/net/wireless/ath/ath5k/gpio.c | 1 - drivers/net/wireless/ath/ath5k/initvals.c | 1 - drivers/net/wireless/ath/ath5k/led.c | 1 - drivers/net/wireless/ath/ath5k/mac80211-ops.c | 5 +- drivers/net/wireless/ath/ath5k/pci.c | 4 +- drivers/net/wireless/ath/ath5k/pcu.c | 5 +- drivers/net/wireless/ath/ath5k/phy.c | 91 +- drivers/net/wireless/ath/ath5k/qcu.c | 10 +- drivers/net/wireless/ath/ath5k/reset.c | 79 +- drivers/net/wireless/ath/ath5k/rfkill.c | 2 +- drivers/net/wireless/ath/ath5k/sysfs.c | 1 - drivers/net/wireless/ath/ath5k/trace.h | 3 +- drivers/net/wireless/ath/ath6kl/Kconfig | 15 + drivers/net/wireless/ath/ath6kl/Makefile | 35 + drivers/net/wireless/ath/ath6kl/bmi.c | 692 +++ drivers/net/wireless/ath/ath6kl/bmi.h | 250 + drivers/net/wireless/ath/ath6kl/cfg80211.c | 1538 +++++ drivers/net/wireless/ath/ath6kl/cfg80211.h | 39 + drivers/net/wireless/ath/ath6kl/common.h | 180 + drivers/net/wireless/ath/ath6kl/core.h | 544 ++ drivers/net/wireless/ath/ath6kl/debug.c | 150 + drivers/net/wireless/ath/ath6kl/debug.h | 105 + drivers/net/wireless/ath/ath6kl/hif-ops.h | 72 + drivers/net/wireless/ath/ath6kl/hif.h | 207 + drivers/net/wireless/ath/ath6kl/htc.c | 2457 ++++++++ drivers/net/wireless/ath/ath6kl/htc.h | 607 ++ drivers/net/wireless/ath/ath6kl/htc_hif.c | 641 ++ drivers/net/wireless/ath/ath6kl/htc_hif.h | 92 + drivers/net/wireless/ath/ath6kl/init.c | 1303 ++++ drivers/net/wireless/ath/ath6kl/main.c | 1337 ++++ drivers/net/wireless/ath/ath6kl/node.c | 234 + drivers/net/wireless/ath/ath6kl/sdio.c | 912 +++ drivers/net/wireless/ath/ath6kl/target.h | 331 + drivers/net/wireless/ath/ath6kl/txrx.c | 1457 +++++ drivers/net/wireless/ath/ath6kl/wmi.c | 2743 +++++++++ drivers/net/wireless/ath/ath6kl/wmi.h | 2018 ++++++ drivers/net/wireless/ath/ath9k/ahb.c | 2 +- .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 190 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 150 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 15 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 +- drivers/net/wireless/ath/ath9k/ath9k.h | 6 +- drivers/net/wireless/ath/ath9k/beacon.c | 18 +- drivers/net/wireless/ath/ath9k/calib.c | 15 + drivers/net/wireless/ath/ath9k/calib.h | 1 + drivers/net/wireless/ath/ath9k/debug.c | 60 + drivers/net/wireless/ath/ath9k/eeprom.h | 2 + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 135 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 122 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 150 +- drivers/net/wireless/ath/ath9k/gpio.c | 2 + drivers/net/wireless/ath/ath9k/htc.h | 3 - drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 - drivers/net/wireless/ath/ath9k/hw.c | 10 +- drivers/net/wireless/ath/ath9k/hw.h | 9 +- drivers/net/wireless/ath/ath9k/init.c | 8 +- drivers/net/wireless/ath/ath9k/mac.c | 16 +- drivers/net/wireless/ath/ath9k/main.c | 10 +- drivers/net/wireless/ath/ath9k/pci.c | 4 +- drivers/net/wireless/ath/ath9k/rc.c | 4 +- drivers/net/wireless/ath/ath9k/rc.h | 6 - drivers/net/wireless/ath/ath9k/recv.c | 10 +- drivers/net/wireless/ath/ath9k/xmit.c | 12 +- drivers/net/wireless/ath/regd.h | 2 +- drivers/net/wireless/ath/regd_common.h | 2 +- drivers/net/wireless/b43/Kconfig | 6 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/b43legacy.h | 1 - drivers/net/wireless/b43legacy/dma.c | 374 +- drivers/net/wireless/b43legacy/dma.h | 107 - drivers/net/wireless/b43legacy/main.c | 4 +- drivers/net/wireless/hostap/hostap_main.c | 6 +- drivers/net/wireless/ipw2x00/ipw2200.c | 3 +- drivers/net/wireless/iwlegacy/iwl-3945-led.c | 1 - drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 1 - drivers/net/wireless/iwlegacy/iwl-3945.c | 1 - drivers/net/wireless/iwlegacy/iwl-4965-led.c | 1 - drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 - drivers/net/wireless/iwlegacy/iwl-4965.c | 1 - drivers/net/wireless/iwlegacy/iwl-led.c | 1 - drivers/net/wireless/iwlegacy/iwl3945-base.c | 1 - drivers/net/wireless/iwlegacy/iwl4965-base.c | 1 - drivers/net/wireless/iwlwifi/Kconfig | 17 - drivers/net/wireless/iwlwifi/iwl-1000.c | 16 +- drivers/net/wireless/iwlwifi/iwl-2000.c | 24 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 13 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 20 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 69 +- drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 47 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 - drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 23 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 30 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 388 +- drivers/net/wireless/iwlwifi/iwl-agn.h | 1 + drivers/net/wireless/iwlwifi/iwl-commands.h | 34 +- drivers/net/wireless/iwlwifi/iwl-core.c | 5 + drivers/net/wireless/iwlwifi/iwl-core.h | 5 + drivers/net/wireless/iwlwifi/iwl-dev.h | 29 +- drivers/net/wireless/iwlwifi/iwl-led.c | 1 - drivers/net/wireless/iwlwifi/iwl-scan.c | 19 +- drivers/net/wireless/iwlwifi/iwl-trans.c | 10 +- drivers/net/wireless/libertas/cfg.c | 69 +- drivers/net/wireless/libertas/cfg.h | 1 + drivers/net/wireless/libertas/cmd.c | 6 +- drivers/net/wireless/libertas/decl.h | 4 + drivers/net/wireless/libertas/dev.h | 28 +- drivers/net/wireless/libertas/ethtool.c | 1 + drivers/net/wireless/libertas/if_sdio.c | 277 +- drivers/net/wireless/libertas/if_spi.c | 4 - drivers/net/wireless/libertas/if_usb.c | 13 +- drivers/net/wireless/libertas/main.c | 182 +- drivers/net/wireless/libertas/mesh.c | 79 +- drivers/net/wireless/libertas/mesh.h | 27 +- drivers/net/wireless/libertas/rx.c | 1 + drivers/net/wireless/libertas/tx.c | 1 + drivers/net/wireless/mac80211_hwsim.c | 6 + drivers/net/wireless/mwifiex/cfg80211.c | 209 +- drivers/net/wireless/mwifiex/fw.h | 15 +- drivers/net/wireless/mwifiex/init.c | 21 - drivers/net/wireless/mwifiex/ioctl.h | 5 +- drivers/net/wireless/mwifiex/join.c | 32 - drivers/net/wireless/mwifiex/main.c | 6 +- drivers/net/wireless/mwifiex/main.h | 55 +- drivers/net/wireless/mwifiex/scan.c | 1578 +---- drivers/net/wireless/mwifiex/sta_event.c | 9 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 230 +- drivers/net/wireless/orinoco/main.c | 2 +- drivers/net/wireless/orinoco/orinoco_usb.c | 2 +- drivers/net/wireless/orinoco/wext.c | 1 + drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rndis_wlan.c | 4 +- drivers/net/wireless/rt2x00/rt2400pci.c | 39 +- drivers/net/wireless/rt2x00/rt2500pci.c | 39 +- drivers/net/wireless/rt2x00/rt2800pci.c | 46 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 1 - drivers/net/wireless/rt2x00/rt61pci.c | 34 +- drivers/net/wireless/rtlwifi/pci.c | 37 +- drivers/net/wireless/rtlwifi/pci.h | 26 - drivers/net/wireless/wl1251/cmd.h | 2 +- drivers/net/wireless/wl1251/wl12xx_80211.h | 2 +- drivers/net/wireless/wl12xx/cmd.h | 4 +- drivers/net/wireless/wl12xx/main.c | 2 +- drivers/net/wireless/wl12xx/scan.h | 6 +- drivers/net/wireless/wl12xx/wl12xx.h | 4 +- drivers/net/wireless/wl12xx/wl12xx_80211.h | 2 +- drivers/net/wireless/zd1201.c | 2 +- drivers/s390/cio/qdio.h | 38 +- drivers/s390/cio/qdio_debug.c | 3 + drivers/s390/cio/qdio_main.c | 208 +- drivers/s390/cio/qdio_setup.c | 83 +- drivers/s390/cio/qdio_thinint.c | 88 +- drivers/s390/net/lcs.c | 2 +- drivers/s390/net/qeth_core.h | 50 +- drivers/s390/net/qeth_core_main.c | 777 ++- drivers/s390/net/qeth_l2_main.c | 4 +- drivers/s390/net/qeth_l3.h | 4 + drivers/s390/net/qeth_l3_main.c | 92 +- drivers/s390/net/qeth_l3_sys.c | 110 +- drivers/scsi/bnx2fc/Kconfig | 3 +- drivers/scsi/bnx2fc/bnx2fc.h | 4 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/bnx2i/Kconfig | 3 +- drivers/scsi/bnx2i/bnx2i.h | 2 +- drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +- drivers/scsi/cxgbi/cxgb3i/Kconfig | 3 +- drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +- drivers/scsi/cxgbi/cxgb4i/Kconfig | 3 +- drivers/scsi/fcoe/fcoe.c | 2 +- drivers/scsi/fcoe/fcoe_transport.c | 5 +- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/ath6kl/Kconfig | 158 - drivers/staging/ath6kl/Makefile | 122 - drivers/staging/ath6kl/TODO | 25 - drivers/staging/ath6kl/bmi/include/bmi_internal.h | 54 - 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 | 131 - .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 1273 ---- .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 393 -- drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 1479 ----- drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 401 -- drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 783 --- drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 755 --- .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 1284 ---- drivers/staging/ath6kl/htc2/htc.c | 575 -- drivers/staging/ath6kl/htc2/htc_debug.h | 38 - drivers/staging/ath6kl/htc2/htc_internal.h | 211 - drivers/staging/ath6kl/htc2/htc_recv.c | 1572 ----- drivers/staging/ath6kl/htc2/htc_send.c | 1018 --- drivers/staging/ath6kl/htc2/htc_services.c | 450 -- drivers/staging/ath6kl/include/a_config.h | 31 - drivers/staging/ath6kl/include/a_debug.h | 195 - drivers/staging/ath6kl/include/a_drv.h | 32 - drivers/staging/ath6kl/include/a_drv_api.h | 204 - drivers/staging/ath6kl/include/a_osapi.h | 32 - drivers/staging/ath6kl/include/aggr_recv_api.h | 140 - drivers/staging/ath6kl/include/ar3kconfig.h | 65 - drivers/staging/ath6kl/include/ar6000_api.h | 32 - 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/bmi.h | 134 - .../ath6kl/include/common/AR6002/AR6K_version.h | 52 - .../staging/ath6kl/include/common/AR6002/addrs.h | 90 - .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h | 40 - .../include/common/AR6002/hw4.0/hw/apb_map.h | 40 - .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 24 - .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 552 -- .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 471 -- .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 589 -- .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 187 - .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 162 - .../include/common/AR6002/hw4.0/hw/uart_reg.h | 40 - drivers/staging/ath6kl/include/common/athdefs.h | 75 - drivers/staging/ath6kl/include/common/bmi_msg.h | 233 - drivers/staging/ath6kl/include/common/cnxmgmt.h | 36 - drivers/staging/ath6kl/include/common/dbglog.h | 126 - drivers/staging/ath6kl/include/common/dbglog_id.h | 558 -- drivers/staging/ath6kl/include/common/discovery.h | 75 - .../staging/ath6kl/include/common/epping_test.h | 111 - drivers/staging/ath6kl/include/common/gmboxif.h | 70 - drivers/staging/ath6kl/include/common/gpio_reg.h | 9 - drivers/staging/ath6kl/include/common/htc.h | 227 - .../staging/ath6kl/include/common/htc_services.h | 52 - drivers/staging/ath6kl/include/common/pkt_log.h | 45 - drivers/staging/ath6kl/include/common/roaming.h | 41 - drivers/staging/ath6kl/include/common/targaddrs.h | 395 -- 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/wmi.h | 3220 ---------- drivers/staging/ath6kl/include/common/wmix.h | 271 - drivers/staging/ath6kl/include/common_drv.h | 104 - 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/hci_transport_api.h | 259 - drivers/staging/ath6kl/include/hif.h | 456 -- 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/wlan_api.h | 128 - drivers/staging/ath6kl/include/wmi_api.h | 441 -- drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 565 -- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 572 -- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 75 - .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 969 --- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 113 - drivers/staging/ath6kl/miscdrv/common_drv.c | 910 --- drivers/staging/ath6kl/miscdrv/credit_dist.c | 417 -- drivers/staging/ath6kl/miscdrv/miscdrv.h | 42 - drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6267 ------------------- drivers/staging/ath6kl/os/linux/ar6000_pm.c | 626 -- drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 455 -- drivers/staging/ath6kl/os/linux/cfg80211.c | 1892 ------ .../staging/ath6kl/os/linux/export_hci_transport.c | 124 - drivers/staging/ath6kl/os/linux/hci_bridge.c | 1141 ---- .../staging/ath6kl/os/linux/include/ar6000_drv.h | 776 --- drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 36 - .../ath6kl/os/linux/include/ar6xapi_linux.h | 190 - .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ---- drivers/staging/ath6kl/os/linux/include/cfg80211.h | 61 - .../staging/ath6kl/os/linux/include/config_linux.h | 51 - .../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 | 177 - .../staging/ath6kl/os/linux/include/osapi_linux.h | 339 - .../staging/ath6kl/os/linux/include/wlan_config.h | 108 - .../ath6kl/os/linux/include/wmi_filter_linux.h | 300 - drivers/staging/ath6kl/os/linux/netbuf.c | 231 - drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 117 - drivers/staging/ath6kl/reorder/rcv_aggr.c | 661 -- drivers/staging/ath6kl/wlan/include/ieee80211.h | 397 -- .../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 | 199 - drivers/staging/ath6kl/wlan/src/wlan_utils.c | 58 - drivers/staging/ath6kl/wmi/wmi.c | 6444 -------------------- drivers/staging/ath6kl/wmi/wmi_host.h | 102 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +- drivers/staging/et131x/et131x_netdev.c | 2 +- drivers/staging/hv/netvsc_drv.c | 2 +- drivers/staging/octeon/ethernet.c | 12 +- drivers/staging/rtl8187se/r8180_core.c | 2 +- drivers/staging/rtl8192e/r8192E_core.c | 2 +- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/slicoss/slicoss.c | 2 +- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6656/main_usb.c | 2 +- drivers/staging/wlags49_h2/wl_netdev.c | 2 +- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/watchdog/bcm47xx_wdt.c | 27 +- include/linux/atalk.h | 3 +- include/linux/ax25.h | 2 +- include/linux/bcma/bcma.h | 9 +- include/linux/bcma/bcma_driver_chipcommon.h | 67 + include/linux/bcma/bcma_driver_mips.h | 51 + include/linux/bcma/bcma_soc.h | 16 + include/linux/caif/caif_socket.h | 7 +- include/linux/can.h | 2 +- include/linux/can/bcm.h | 1 + include/linux/ethtool.h | 144 +- include/linux/if.h | 1 + include/linux/if_ether.h | 1 + include/linux/if_packet.h | 119 + include/linux/if_pppol2tp.h | 2 +- include/linux/if_pppox.h | 9 +- include/linux/in.h | 2 +- include/linux/ipx.h | 2 +- include/linux/irda.h | 9 +- include/linux/l2tp.h | 7 +- include/linux/llc.h | 10 +- include/linux/netdevice.h | 10 +- include/linux/netfilter/xt_connlimit.h | 1 + include/linux/netfilter/xt_conntrack.h | 1 + include/linux/netfilter/xt_iprange.h | 1 + include/linux/netfilter_arp/arp_tables.h | 14 +- include/linux/netfilter_decnet.h | 3 + include/linux/netfilter_ipv4.h | 3 + include/linux/netfilter_ipv4/ip_tables.h | 20 +- include/linux/netfilter_ipv6.h | 3 + include/linux/netfilter_ipv6/ip6_tables.h | 22 +- include/linux/netlink.h | 2 +- include/linux/netrom.h | 2 + include/linux/nl80211.h | 61 +- include/linux/phonet.h | 5 +- include/linux/rose.h | 7 +- include/linux/skbuff.h | 181 +- include/linux/ssb/ssb_regs.h | 40 + {drivers/net => include/linux}/sungem_phy.h | 2 +- include/linux/tcp.h | 4 + include/linux/tipc_config.h | 4 + include/linux/un.h | 4 +- include/linux/x25.h | 3 +- include/net/addrconf.h | 2 +- include/net/cfg80211-wext.h | 55 + include/net/cfg80211.h | 279 +- include/net/dst.h | 9 +- include/net/if_inet6.h | 1 + include/net/iucv/af_iucv.h | 52 + include/net/iucv/iucv.h | 36 +- include/net/lib80211.h | 3 - include/net/mac80211.h | 11 - include/net/scm.h | 22 +- include/net/sctp/structs.h | 1 + include/net/sock.h | 15 +- net/802/garp.c | 4 +- net/802/stp.c | 4 +- net/8021q/vlan.c | 2 +- net/8021q/vlan_dev.c | 1 - net/atm/lec.c | 2 +- net/batman-adv/aggregation.h | 3 +- net/batman-adv/bat_sysfs.c | 2 + net/batman-adv/bitarray.c | 6 +- net/batman-adv/gateway_client.c | 10 +- net/batman-adv/hard-interface.c | 34 +- net/batman-adv/hard-interface.h | 1 + net/batman-adv/hash.h | 25 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 6 +- net/batman-adv/originator.c | 2 +- net/batman-adv/packet.h | 1 + net/batman-adv/routing.c | 77 +- net/batman-adv/send.c | 10 +- net/batman-adv/soft-interface.c | 13 +- net/batman-adv/translation-table.c | 199 +- net/batman-adv/translation-table.h | 21 +- net/batman-adv/types.h | 5 +- net/batman-adv/unicast.c | 6 +- net/batman-adv/unicast.h | 2 +- net/batman-adv/vis.c | 6 +- net/bluetooth/bnep/netdev.c | 2 +- net/bridge/br_device.c | 2 +- net/bridge/netfilter/ebtable_broute.c | 4 +- net/caif/cfcnfg.c | 15 +- net/caif/cfctrl.c | 23 +- net/caif/cfdbgl.c | 7 +- net/caif/cfdgml.c | 7 +- net/caif/cffrml.c | 7 +- net/caif/cfmuxl.c | 6 +- net/caif/cfrfml.c | 7 +- net/caif/cfserl.c | 7 +- net/caif/cfsrvl.c | 8 +- net/caif/cfutill.c | 7 +- net/caif/cfveil.c | 7 +- net/caif/cfvidl.c | 7 +- net/can/af_can.c | 4 +- net/core/datagram.c | 8 +- net/core/dev.c | 120 +- net/core/dev_addr_lists.c | 4 +- net/core/dst.c | 15 +- net/core/fib_rules.c | 4 +- net/core/filter.c | 2 +- net/core/kmap_skb.h | 2 +- net/core/neighbour.c | 40 +- net/core/net-sysfs.c | 8 +- net/core/netpoll.c | 4 +- net/core/pktgen.c | 3 +- net/core/rtnetlink.c | 1 - net/core/skbuff.c | 31 +- net/core/sock.c | 16 +- net/core/user_dma.c | 2 +- net/dccp/ccids/ccid2.c | 84 +- net/dccp/ccids/ccid2.h | 6 + net/dccp/dccp.h | 1 + net/dccp/feat.c | 202 +- net/dccp/feat.h | 1 + net/dccp/proto.c | 1 - net/decnet/dn_dev.c | 6 +- net/dsa/slave.c | 3 - net/ieee802154/6lowpan.c | 885 +++ net/ieee802154/6lowpan.h | 212 + net/ieee802154/Kconfig | 6 + net/ieee802154/Makefile | 8 +- net/ipv4/devinet.c | 6 +- net/ipv4/fib_trie.c | 12 +- net/ipv4/gre.c | 4 +- net/ipv4/igmp.c | 12 +- net/ipv4/inet_lro.c | 2 +- net/ipv4/ip_output.c | 7 +- net/ipv4/ipip.c | 10 +- net/ipv4/ipmr.c | 8 +- net/ipv4/netfilter/nf_nat_amanda.c | 4 +- net/ipv4/netfilter/nf_nat_core.c | 24 +- net/ipv4/netfilter/nf_nat_ftp.c | 4 +- net/ipv4/netfilter/nf_nat_h323.c | 36 +- net/ipv4/netfilter/nf_nat_irc.c | 4 +- net/ipv4/netfilter/nf_nat_pptp.c | 16 +- net/ipv4/netfilter/nf_nat_sip.c | 28 +- net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 +- net/ipv4/netfilter/nf_nat_standalone.c | 6 +- net/ipv4/netfilter/nf_nat_tftp.c | 4 +- net/ipv4/route.c | 6 +- net/ipv4/tcp.c | 3 +- net/ipv4/tcp_input.c | 58 +- net/ipv4/tcp_ipv4.c | 6 +- net/ipv4/tcp_output.c | 9 +- net/ipv4/udp.c | 11 +- net/ipv6/addrconf.c | 73 +- net/ipv6/exthdrs.c | 7 +- net/ipv6/icmp.c | 25 +- net/ipv6/inet6_connection_sock.c | 9 +- net/ipv6/ip6_output.c | 7 +- net/ipv6/ip6_tunnel.c | 37 +- net/ipv6/ndisc.c | 31 +- net/ipv6/raw.c | 8 +- net/ipv6/sit.c | 12 +- net/ipv6/tcp_ipv6.c | 6 +- net/ipv6/udp.c | 4 +- net/irda/irlan/irlan_eth.c | 2 +- net/iucv/Kconfig | 14 +- net/iucv/af_iucv.c | 868 +++- net/iucv/iucv.c | 23 + net/mac80211/agg-rx.c | 4 +- net/mac80211/agg-tx.c | 18 +- net/mac80211/cfg.c | 47 +- net/mac80211/driver-ops.h | 31 - net/mac80211/ibss.c | 6 +- net/mac80211/ieee80211_i.h | 64 - net/mac80211/iface.c | 6 +- net/mac80211/main.c | 1 + net/mac80211/mesh_hwmp.c | 7 +- net/mac80211/mesh_pathtbl.c | 4 +- net/mac80211/rc80211_minstrel_ht.c | 8 +- net/mac80211/sta_info.c | 9 +- net/mac80211/status.c | 3 - net/mac80211/tx.c | 20 + net/mac80211/util.c | 168 +- net/netfilter/core.c | 4 +- net/netfilter/nf_conntrack_core.c | 12 +- net/netfilter/nf_conntrack_ecache.c | 8 +- net/netfilter/nf_conntrack_extend.c | 4 +- net/netfilter/nf_conntrack_helper.c | 6 +- net/netfilter/nf_conntrack_netlink.c | 6 +- net/netfilter/nf_log.c | 10 +- net/netfilter/nf_queue.c | 6 +- net/netfilter/nfnetlink.c | 6 +- net/netlabel/netlabel_domainhash.c | 6 +- net/netlabel/netlabel_unlabeled.c | 6 +- net/netlink/af_netlink.c | 2 +- net/packet/af_packet.c | 944 +++- net/phonet/af_phonet.c | 4 +- net/phonet/pn_dev.c | 6 +- net/phonet/socket.c | 6 +- net/sched/sch_sfb.c | 13 +- net/sctp/associola.c | 1 + net/sctp/outqueue.c | 4 + net/sctp/sm_make_chunk.c | 1 + net/sctp/sm_statefuns.c | 5 + net/socket.c | 4 +- net/sunrpc/auth_gss/auth_gss.c | 4 +- net/unix/af_unix.c | 45 +- net/wireless/lib80211.c | 15 +- net/wireless/nl80211.c | 86 +- net/wireless/reg.c | 14 +- net/wireless/scan.c | 1 + net/wireless/util.c | 168 + net/wireless/wext-compat.c | 137 +- net/wireless/wext-compat.h | 8 + net/wireless/wext-sme.c | 3 +- net/xfrm/xfrm_ipcomp.c | 11 +- net/xfrm/xfrm_user.c | 4 +- 1598 files changed, 46671 insertions(+), 75380 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt create mode 100644 arch/mips/bcm47xx/Kconfig create mode 100644 drivers/bcma/driver_mips.c create mode 100644 drivers/bcma/host_soc.c rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%) delete mode 100644 drivers/net/arm/Kconfig delete mode 100644 drivers/net/arm/Makefile delete mode 100644 drivers/net/benet/Kconfig delete mode 100644 drivers/net/bna/bfi_ctreg.h delete mode 100644 drivers/net/bna/bfi_ll.h delete mode 100644 drivers/net/bna/bna_ctrl.c delete mode 100644 drivers/net/bna/bna_hw.h delete mode 100644 drivers/net/bna/bna_txrx.c rename drivers/net/{ => ethernet/3com}/3c501.c (99%) rename drivers/net/{ => ethernet/3com}/3c501.h (100%) rename drivers/net/{ => ethernet/3com}/3c509.c (99%) rename drivers/net/{ => ethernet/3com}/3c515.c (99%) rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%) rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%) rename drivers/net/{ => ethernet/3com}/3c59x.c (99%) create mode 100644 drivers/net/ethernet/3com/Kconfig create mode 100644 drivers/net/ethernet/3com/Makefile rename drivers/net/{ => ethernet/3com}/typhoon.c (99%) rename drivers/net/{ => ethernet/3com}/typhoon.h (100%) rename drivers/net/{ => ethernet/8390}/3c503.c (99%) rename drivers/net/{ => ethernet/8390}/3c503.h (100%) rename drivers/net/{ => ethernet/8390}/8390.c (97%) rename drivers/net/{ => ethernet/8390}/8390.h (100%) rename drivers/net/{ => ethernet/8390}/8390p.c (97%) create mode 100644 drivers/net/ethernet/8390/Kconfig create mode 100644 drivers/net/ethernet/8390/Makefile rename drivers/net/{ => ethernet/8390}/ac3200.c (99%) rename drivers/net/{ => ethernet/8390}/apne.c (100%) rename drivers/net/{ => ethernet/8390}/ax88796.c (99%) rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%) rename drivers/net/{ => ethernet/8390}/e2100.c (99%) rename drivers/net/{ => ethernet/8390}/es3210.c (100%) rename drivers/net/{arm => ethernet/8390}/etherh.c (99%) rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%) rename drivers/net/{ => ethernet/8390}/hp.c (100%) rename drivers/net/{ => ethernet/8390}/hydra.c (99%) rename drivers/net/{ => ethernet/8390}/lib8390.c (100%) rename drivers/net/{ => ethernet/8390}/lne390.c (100%) rename drivers/net/{ => ethernet/8390}/mac8390.c (99%) rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%) rename drivers/net/{ => ethernet/8390}/ne.c (100%) rename drivers/net/{ => ethernet/8390}/ne2.c (100%) rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%) rename drivers/net/{ => ethernet/8390}/ne3210.c (100%) rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%) rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%) rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%) rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%) rename drivers/net/{ => ethernet/8390}/stnic.c (100%) rename drivers/net/{ => ethernet/8390}/wd.c (99%) rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%) create mode 100644 drivers/net/ethernet/Kconfig create mode 100644 drivers/net/ethernet/Makefile create mode 100644 drivers/net/ethernet/adaptec/Kconfig create mode 100644 drivers/net/ethernet/adaptec/Makefile rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%) create mode 100644 drivers/net/ethernet/adi/Kconfig create mode 100644 drivers/net/ethernet/adi/Makefile rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%) rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%) create mode 100644 drivers/net/ethernet/aeroflex/Kconfig create mode 100644 drivers/net/ethernet/aeroflex/Makefile rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%) rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%) create mode 100644 drivers/net/ethernet/alteon/Kconfig create mode 100644 drivers/net/ethernet/alteon/Makefile rename drivers/net/{ => ethernet/alteon}/acenic.c (99%) rename drivers/net/{ => ethernet/alteon}/acenic.h (100%) rename drivers/net/{ => ethernet/amd}/7990.c (100%) rename drivers/net/{ => ethernet/amd}/7990.h (100%) create mode 100644 drivers/net/ethernet/amd/Kconfig create mode 100644 drivers/net/ethernet/amd/Makefile rename drivers/net/{ => ethernet/amd}/a2065.c (99%) rename drivers/net/{ => ethernet/amd}/a2065.h (100%) rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%) rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%) rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%) rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%) rename drivers/net/{ => ethernet/amd}/ariadne.c (99%) rename drivers/net/{ => ethernet/amd}/ariadne.h (100%) rename drivers/net/{ => ethernet/amd}/atarilance.c (99%) rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%) rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%) rename drivers/net/{ => ethernet/amd}/declance.c (99%) rename drivers/net/{ => ethernet/amd}/depca.c (99%) rename drivers/net/{ => ethernet/amd}/depca.h (100%) rename drivers/net/{ => ethernet/amd}/hplance.c (99%) rename drivers/net/{ => ethernet/amd}/hplance.h (100%) rename drivers/net/{ => ethernet/amd}/lance.c (99%) rename drivers/net/{ => ethernet/amd}/mvme147.c (99%) rename drivers/net/{ => ethernet/amd}/ni65.c (99%) rename drivers/net/{ => ethernet/amd}/ni65.h (100%) rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%) rename drivers/net/{ => ethernet/amd}/pcnet32.c (99%) rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%) rename drivers/net/{ => ethernet/amd}/sunlance.c (99%) create mode 100644 drivers/net/ethernet/apple/Kconfig create mode 100644 drivers/net/ethernet/apple/Makefile rename drivers/net/{ => ethernet/apple}/bmac.c (99%) rename drivers/net/{ => ethernet/apple}/bmac.h (100%) rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%) rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%) rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%) rename drivers/net/{ => ethernet/apple}/mace.c (99%) rename drivers/net/{ => ethernet/apple}/mace.h (100%) rename drivers/net/{ => ethernet/apple}/macmace.c (99%) create mode 100644 drivers/net/ethernet/atheros/Kconfig create mode 100644 drivers/net/ethernet/atheros/Makefile rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%) rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%) rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%) rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%) rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%) rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%) rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%) rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%) rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%) rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%) rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%) rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%) rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%) rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%) rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%) rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%) rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%) rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%) rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%) rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%) create mode 100644 drivers/net/ethernet/broadcom/Kconfig create mode 100644 drivers/net/ethernet/broadcom/Makefile rename drivers/net/{ => ethernet/broadcom}/b44.c (99%) rename drivers/net/{ => ethernet/broadcom}/b44.h (100%) rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%) rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%) rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (99%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (99%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%) rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%) rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%) rename drivers/net/{ => ethernet/broadcom}/cnic.h (99%) rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (99%) rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%) rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%) rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%) rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%) create mode 100644 drivers/net/ethernet/brocade/Kconfig create mode 100644 drivers/net/ethernet/brocade/Makefile create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (98%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (92%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (89%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (87%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (88%) rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (76%) create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (70%) rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%) create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h rename drivers/net/{ => ethernet/brocade}/bna/bna.h (67%) create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%) rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (85%) rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (89%) rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (67%) rename drivers/net/{ => ethernet/brocade}/bna/cna.h (68%) rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%) create mode 100644 drivers/net/ethernet/cadence/Kconfig create mode 100644 drivers/net/ethernet/cadence/Makefile rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%) rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%) rename drivers/net/{ => ethernet/cadence}/macb.c (99%) rename drivers/net/{ => ethernet/cadence}/macb.h (100%) create mode 100644 drivers/net/ethernet/chelsio/Kconfig create mode 100644 drivers/net/ethernet/chelsio/Makefile rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%) rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%) rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%) create mode 100644 drivers/net/ethernet/cirrus/Kconfig create mode 100644 drivers/net/ethernet/cirrus/Makefile rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%) create mode 100644 drivers/net/ethernet/cisco/Kconfig create mode 100644 drivers/net/ethernet/cisco/Makefile create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%) rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (99%) rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%) create mode 100644 drivers/net/ethernet/davicom/Kconfig create mode 100644 drivers/net/ethernet/davicom/Makefile rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%) rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%) create mode 100644 drivers/net/ethernet/dec/Kconfig create mode 100644 drivers/net/ethernet/dec/Makefile rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%) rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%) rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%) rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%) rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%) rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%) rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%) rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (100%) rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%) rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%) rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%) rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%) rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%) rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%) rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%) rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%) rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%) rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%) rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%) rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%) create mode 100644 drivers/net/ethernet/dlink/Kconfig create mode 100644 drivers/net/ethernet/dlink/Makefile rename drivers/net/{ => ethernet/dlink}/de600.c (100%) rename drivers/net/{ => ethernet/dlink}/de600.h (100%) rename drivers/net/{ => ethernet/dlink}/de620.c (99%) rename drivers/net/{ => ethernet/dlink}/de620.h (100%) rename drivers/net/{ => ethernet/dlink}/dl2k.c (95%) rename drivers/net/{ => ethernet/dlink}/dl2k.h (81%) rename drivers/net/{ => ethernet/dlink}/sundance.c (99%) rename drivers/net/{ => ethernet}/dnet.c (100%) rename drivers/net/{ => ethernet}/dnet.h (100%) create mode 100644 drivers/net/ethernet/emulex/Kconfig create mode 100644 drivers/net/ethernet/emulex/Makefile create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%) rename drivers/net/{ => ethernet/emulex}/benet/be.h (84%) rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (94%) rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%) rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (85%) rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%) rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (90%) rename drivers/net/{ => ethernet}/ethoc.c (99%) create mode 100644 drivers/net/ethernet/faraday/Kconfig create mode 100644 drivers/net/ethernet/faraday/Makefile rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%) rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%) rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%) rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%) rename drivers/net/{ => ethernet}/fealnx.c (99%) create mode 100644 drivers/net/ethernet/freescale/Kconfig create mode 100644 drivers/net/ethernet/freescale/Makefile rename drivers/net/{ => ethernet/freescale}/fec.c (99%) rename drivers/net/{ => ethernet/freescale}/fec.h (100%) rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%) rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%) rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%) rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%) rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%) rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%) rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%) rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%) rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%) rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%) rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%) rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%) rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%) rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%) rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%) rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%) create mode 100644 drivers/net/ethernet/fujitsu/Kconfig create mode 100644 drivers/net/ethernet/fujitsu/Makefile rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%) rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%) rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%) create mode 100644 drivers/net/ethernet/hp/Kconfig create mode 100644 drivers/net/ethernet/hp/Makefile rename drivers/net/{ => ethernet/hp}/hp100.c (99%) rename drivers/net/{ => ethernet/hp}/hp100.h (100%) rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%) rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%) rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%) rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%) rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%) rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%) rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%) rename drivers/net/{ => ethernet/i825xx}/82596.c (99%) create mode 100644 drivers/net/ethernet/i825xx/Kconfig create mode 100644 drivers/net/ethernet/i825xx/Makefile rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%) rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%) rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%) rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%) rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%) rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%) rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%) rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%) rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%) rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%) rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%) rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%) rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%) rename drivers/net/{ => ethernet/i825xx}/znet.c (99%) create mode 100644 drivers/net/ethernet/ibm/Kconfig create mode 100644 drivers/net/ethernet/ibm/Makefile rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%) rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%) create mode 100644 drivers/net/ethernet/ibm/emac/Makefile rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%) rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%) rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%) rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%) rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%) create mode 100644 drivers/net/ethernet/icplus/Kconfig create mode 100644 drivers/net/ethernet/icplus/Makefile rename drivers/net/{ => ethernet/icplus}/ipg.c (92%) rename drivers/net/{ => ethernet/icplus}/ipg.h (100%) create mode 100644 drivers/net/ethernet/intel/Kconfig create mode 100644 drivers/net/ethernet/intel/Makefile rename drivers/net/{ => ethernet/intel}/e100.c (99%) rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (99%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%) rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%) rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%) rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (99%) rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%) rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%) rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (99%) rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (96%) rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%) rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%) rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (96%) rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%) rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%) rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%) rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%) rename drivers/net/{ => ethernet/intel}/igb/igb.h (100%) rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (99%) rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%) rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%) rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%) rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%) rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (99%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (100%) rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (96%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (99%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (99%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (94%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (94%) rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (98%) rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (98%) rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%) rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%) rename drivers/net/{ => ethernet}/jme.c (99%) rename drivers/net/{ => ethernet}/jme.h (100%) rename drivers/net/{ => ethernet}/korina.c (99%) rename drivers/net/{ => ethernet}/lantiq_etop.c (99%) create mode 100644 drivers/net/ethernet/marvell/Kconfig create mode 100644 drivers/net/ethernet/marvell/Makefile rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%) rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%) rename drivers/net/{ => ethernet/marvell}/skge.c (99%) rename drivers/net/{ => ethernet/marvell}/skge.h (100%) rename drivers/net/{ => ethernet/marvell}/sky2.c (99%) rename drivers/net/{ => ethernet/marvell}/sky2.h (100%) create mode 100644 drivers/net/ethernet/mellanox/Kconfig create mode 100644 drivers/net/ethernet/mellanox/Makefile create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%) rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%) create mode 100644 drivers/net/ethernet/micrel/Kconfig create mode 100644 drivers/net/ethernet/micrel/Makefile rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%) rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%) rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%) rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%) rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%) rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%) rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%) create mode 100644 drivers/net/ethernet/microchip/Kconfig create mode 100644 drivers/net/ethernet/microchip/Makefile rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%) rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%) rename drivers/net/{ => ethernet}/mipsnet.c (99%) create mode 100644 drivers/net/ethernet/myricom/Kconfig create mode 100644 drivers/net/ethernet/myricom/Makefile rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%) rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%) rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%) rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%) create mode 100644 drivers/net/ethernet/natsemi/Kconfig create mode 100644 drivers/net/ethernet/natsemi/Makefile rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%) rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%) rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%) rename drivers/net/{ => ethernet/natsemi}/macsonic.c (99%) rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%) rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%) rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%) rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%) rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%) create mode 100644 drivers/net/ethernet/neterion/Kconfig create mode 100644 drivers/net/ethernet/neterion/Makefile rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%) rename drivers/net/{ => ethernet/neterion}/s2io.c (99%) rename drivers/net/{ => ethernet/neterion}/s2io.h (100%) rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%) rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%) rename drivers/net/{ => ethernet}/netx-eth.c (99%) create mode 100644 drivers/net/ethernet/nuvoton/Kconfig create mode 100644 drivers/net/ethernet/nuvoton/Makefile rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%) create mode 100644 drivers/net/ethernet/nvidia/Kconfig create mode 100644 drivers/net/ethernet/nvidia/Makefile rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%) rename drivers/net/{ => ethernet}/octeon/Kconfig (85%) create mode 100644 drivers/net/ethernet/octeon/Makefile rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%) create mode 100644 drivers/net/ethernet/oki-semi/Kconfig create mode 100644 drivers/net/ethernet/oki-semi/Makefile create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%) rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%) create mode 100644 drivers/net/ethernet/packetengines/Kconfig create mode 100644 drivers/net/ethernet/packetengines/Makefile rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%) rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%) create mode 100644 drivers/net/ethernet/pasemi/Kconfig create mode 100644 drivers/net/ethernet/pasemi/Makefile rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%) rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%) rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%) create mode 100644 drivers/net/ethernet/qlogic/Kconfig create mode 100644 drivers/net/ethernet/qlogic/Makefile rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%) rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (96%) rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%) rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (99%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (98%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (100%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (99%) rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (98%) rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%) rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%) create mode 100644 drivers/net/ethernet/racal/Kconfig create mode 100644 drivers/net/ethernet/racal/Makefile rename drivers/net/{ => ethernet/racal}/ni5010.c (99%) rename drivers/net/{ => ethernet/racal}/ni5010.h (100%) create mode 100644 drivers/net/ethernet/rdc/Kconfig create mode 100644 drivers/net/ethernet/rdc/Makefile rename drivers/net/{ => ethernet/rdc}/r6040.c (99%) rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%) rename drivers/net/{ => ethernet/realtek}/8139too.c (99%) create mode 100644 drivers/net/ethernet/realtek/Kconfig create mode 100644 drivers/net/ethernet/realtek/Makefile rename drivers/net/{ => ethernet/realtek}/atp.c (99%) rename drivers/net/{ => ethernet/realtek}/atp.h (100%) rename drivers/net/{ => ethernet/realtek}/r8169.c (99%) rename drivers/net/{ => ethernet/realtek}/sc92031.c (99%) create mode 100644 drivers/net/ethernet/renesas/Kconfig create mode 100644 drivers/net/ethernet/renesas/Makefile rename drivers/net/{ => ethernet/renesas}/sh_eth.c (99%) rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%) rename drivers/net/{ => ethernet}/s6gmac.c (100%) create mode 100644 drivers/net/ethernet/seeq/Kconfig create mode 100644 drivers/net/ethernet/seeq/Makefile rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%) rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%) rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%) rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%) rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%) rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%) rename drivers/net/{ => ethernet}/sfc/Kconfig (96%) rename drivers/net/{ => ethernet}/sfc/Makefile (100%) rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%) rename drivers/net/{ => ethernet}/sfc/efx.c (99%) rename drivers/net/{ => ethernet}/sfc/efx.h (100%) rename drivers/net/{ => ethernet}/sfc/enum.h (100%) rename drivers/net/{ => ethernet}/sfc/ethtool.c (100%) rename drivers/net/{ => ethernet}/sfc/falcon.c (100%) rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%) rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%) rename drivers/net/{ => ethernet}/sfc/filter.c (100%) rename drivers/net/{ => ethernet}/sfc/filter.h (100%) rename drivers/net/{ => ethernet}/sfc/io.h (100%) rename drivers/net/{ => ethernet}/sfc/mac.h (100%) rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%) rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%) rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%) rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%) rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%) rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%) rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%) rename drivers/net/{ => ethernet}/sfc/mtd.c (100%) rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%) rename drivers/net/{ => ethernet}/sfc/nic.c (100%) rename drivers/net/{ => ethernet}/sfc/nic.h (100%) rename drivers/net/{ => ethernet}/sfc/phy.h (100%) rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%) rename drivers/net/{ => ethernet}/sfc/regs.h (100%) rename drivers/net/{ => ethernet}/sfc/rx.c (100%) rename drivers/net/{ => ethernet}/sfc/selftest.c (100%) rename drivers/net/{ => ethernet}/sfc/selftest.h (100%) rename drivers/net/{ => ethernet}/sfc/siena.c (100%) rename drivers/net/{ => ethernet}/sfc/spi.h (100%) rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%) rename drivers/net/{ => ethernet}/sfc/tx.c (100%) rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%) rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%) create mode 100644 drivers/net/ethernet/sgi/Kconfig create mode 100644 drivers/net/ethernet/sgi/Makefile rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%) rename drivers/net/{ => ethernet/sgi}/meth.c (100%) rename drivers/net/{ => ethernet/sgi}/meth.h (100%) create mode 100644 drivers/net/ethernet/sis/Kconfig create mode 100644 drivers/net/ethernet/sis/Makefile rename drivers/net/{ => ethernet/sis}/sis190.c (99%) rename drivers/net/{ => ethernet/sis}/sis900.c (99%) rename drivers/net/{ => ethernet/sis}/sis900.h (100%) create mode 100644 drivers/net/ethernet/smsc/Kconfig create mode 100644 drivers/net/ethernet/smsc/Makefile rename drivers/net/{ => ethernet/smsc}/epic100.c (99%) rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%) rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%) rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%) rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%) rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%) rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%) rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%) rename drivers/net/{ => ethernet/smsc}/smsc911x.c (97%) rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%) rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%) rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%) create mode 100644 drivers/net/ethernet/stmicro/Kconfig create mode 100644 drivers/net/ethernet/stmicro/Makefile rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%) rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (99%) rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%) rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%) create mode 100644 drivers/net/ethernet/sun/Kconfig create mode 100644 drivers/net/ethernet/sun/Makefile rename drivers/net/{ => ethernet/sun}/cassini.c (99%) rename drivers/net/{ => ethernet/sun}/cassini.h (100%) rename drivers/net/{ => ethernet/sun}/niu.c (99%) rename drivers/net/{ => ethernet/sun}/niu.h (100%) rename drivers/net/{ => ethernet/sun}/sunbmac.c (97%) rename drivers/net/{ => ethernet/sun}/sunbmac.h (95%) rename drivers/net/{ => ethernet/sun}/sungem.c (99%) rename drivers/net/{ => ethernet/sun}/sungem.h (100%) rename drivers/net/{ => ethernet/sun}/sunhme.c (99%) rename drivers/net/{ => ethernet/sun}/sunhme.h (100%) rename drivers/net/{ => ethernet/sun}/sunqe.c (99%) rename drivers/net/{ => ethernet/sun}/sunqe.h (100%) rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%) rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%) create mode 100644 drivers/net/ethernet/tehuti/Kconfig create mode 100644 drivers/net/ethernet/tehuti/Makefile rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%) rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%) create mode 100644 drivers/net/ethernet/ti/Kconfig create mode 100644 drivers/net/ethernet/ti/Makefile rename drivers/net/{ => ethernet/ti}/cpmac.c (99%) rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%) rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%) rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%) rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%) rename drivers/net/{ => ethernet/ti}/tlan.c (99%) rename drivers/net/{ => ethernet/ti}/tlan.h (100%) create mode 100644 drivers/net/ethernet/tile/Kconfig rename drivers/net/{ => ethernet}/tile/Makefile (100%) rename drivers/net/{ => ethernet}/tile/tilepro.c (100%) create mode 100644 drivers/net/ethernet/toshiba/Kconfig create mode 100644 drivers/net/ethernet/toshiba/Makefile rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%) rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%) rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%) rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%) rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%) rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%) rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%) rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%) create mode 100644 drivers/net/ethernet/tundra/Kconfig create mode 100644 drivers/net/ethernet/tundra/Makefile rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%) rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%) create mode 100644 drivers/net/ethernet/via/Kconfig create mode 100644 drivers/net/ethernet/via/Makefile rename drivers/net/{ => ethernet/via}/via-rhine.c (99%) rename drivers/net/{ => ethernet/via}/via-velocity.c (97%) rename drivers/net/{ => ethernet/via}/via-velocity.h (100%) create mode 100644 drivers/net/ethernet/xilinx/Kconfig create mode 100644 drivers/net/ethernet/xilinx/Makefile rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%) rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%) rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%) rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%) create mode 100644 drivers/net/ethernet/xircom/Kconfig create mode 100644 drivers/net/ethernet/xircom/Makefile rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%) create mode 100644 drivers/net/ethernet/xscale/Kconfig create mode 100644 drivers/net/ethernet/xscale/Makefile rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%) rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%) rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%) rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%) create mode 100644 drivers/net/fddi/Kconfig create mode 100644 drivers/net/fddi/Makefile rename drivers/net/{ => fddi}/defxx.c (99%) rename drivers/net/{ => fddi}/defxx.h (100%) rename drivers/net/{ => fddi}/skfp/Makefile (100%) rename drivers/net/{ => fddi}/skfp/cfm.c (100%) rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%) rename drivers/net/{ => fddi}/skfp/ecm.c (100%) rename drivers/net/{ => fddi}/skfp/ess.c (100%) rename drivers/net/{ => fddi}/skfp/fplustm.c (100%) rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (99%) rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%) rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%) rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%) rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (99%) rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%) rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%) rename drivers/net/{ => fddi}/skfp/h/sba.h (98%) rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%) rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%) rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (99%) rename drivers/net/{ => fddi}/skfp/h/smc.h (98%) rename drivers/net/{ => fddi}/skfp/h/smt.h (100%) rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%) rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%) rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%) rename drivers/net/{ => fddi}/skfp/h/targethw.h (98%) rename drivers/net/{ => fddi}/skfp/h/targetos.h (99%) rename drivers/net/{ => fddi}/skfp/h/types.h (100%) rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%) rename drivers/net/{ => fddi}/skfp/hwt.c (100%) rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%) rename drivers/net/{ => fddi}/skfp/pmf.c (100%) rename drivers/net/{ => fddi}/skfp/queue.c (100%) rename drivers/net/{ => fddi}/skfp/rmt.c (100%) rename drivers/net/{ => fddi}/skfp/skfddi.c (99%) rename drivers/net/{ => fddi}/skfp/smt.c (100%) rename drivers/net/{ => fddi}/skfp/smtdef.c (100%) rename drivers/net/{ => fddi}/skfp/smtinit.c (100%) rename drivers/net/{ => fddi}/skfp/smttimer.c (100%) rename drivers/net/{ => fddi}/skfp/srf.c (100%) create mode 100644 drivers/net/hippi/Kconfig create mode 100644 drivers/net/hippi/Makefile rename drivers/net/{ => hippi}/rrunner.c (100%) rename drivers/net/{ => hippi}/rrunner.h (100%) delete mode 100644 drivers/net/ibm_newemac/Makefile delete mode 100644 drivers/net/octeon/Makefile delete mode 100644 drivers/net/pci-skeleton.c delete mode 100644 drivers/net/pcmcia/Kconfig delete mode 100644 drivers/net/pcmcia/Makefile create mode 100644 drivers/net/plip/Kconfig create mode 100644 drivers/net/plip/Makefile rename drivers/net/{ => plip}/plip.c (100%) create mode 100644 drivers/net/ppp/Kconfig create mode 100644 drivers/net/ppp/Makefile rename drivers/net/{ => ppp}/bsd_comp.c (100%) rename drivers/net/{ => ppp}/ppp_async.c (100%) rename drivers/net/{ => ppp}/ppp_deflate.c (100%) rename drivers/net/{ => ppp}/ppp_generic.c (100%) rename drivers/net/{ => ppp}/ppp_mppe.c (100%) rename drivers/net/{ => ppp}/ppp_mppe.h (100%) rename drivers/net/{ => ppp}/ppp_synctty.c (100%) rename drivers/net/{ => ppp}/pppoe.c (100%) rename drivers/net/{ => ppp}/pppox.c (100%) rename drivers/net/{ => ppp}/pptp.c (100%) create mode 100644 drivers/net/slip/Kconfig create mode 100644 drivers/net/slip/Makefile rename drivers/net/{ => slip}/slhc.c (100%) rename drivers/net/{ => slip}/slip.c (98%) rename drivers/net/{ => slip}/slip.h (94%) rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%) create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h create mode 100644 drivers/net/wireless/ath/ath6kl/common.h create mode 100644 drivers/net/wireless/ath/ath6kl/core.h create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h create mode 100644 drivers/net/wireless/ath/ath6kl/init.c create mode 100644 drivers/net/wireless/ath/ath6kl/main.c create mode 100644 drivers/net/wireless/ath/ath6kl/node.c create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c create mode 100644 drivers/net/wireless/ath/ath6kl/target.h create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h delete mode 100644 drivers/staging/ath6kl/Kconfig delete mode 100644 drivers/staging/ath6kl/Makefile delete mode 100644 drivers/staging/ath6kl/TODO delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c delete mode 100644 drivers/staging/ath6kl/htc2/htc.c delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c delete mode 100644 drivers/staging/ath6kl/include/a_config.h delete mode 100644 drivers/staging/ath6kl/include/a_debug.h delete mode 100644 drivers/staging/ath6kl/include/a_drv.h delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h delete mode 100644 drivers/staging/ath6kl/include/bmi.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h delete mode 100644 drivers/staging/ath6kl/include/common/htc.h delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h delete mode 100644 drivers/staging/ath6kl/include/common_drv.h delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h delete mode 100644 drivers/staging/ath6kl/include/dl_list.h delete mode 100644 drivers/staging/ath6kl/include/dset_api.h delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h delete mode 100644 drivers/staging/ath6kl/include/hif.h delete mode 100644 drivers/staging/ath6kl/include/host_version.h delete mode 100644 drivers/staging/ath6kl/include/htc_api.h delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h create mode 100644 include/linux/bcma/bcma_driver_mips.h create mode 100644 include/linux/bcma/bcma_soc.h rename {drivers/net => include/linux}/sungem_phy.h (98%) create mode 100644 include/net/cfg80211-wext.h create mode 100644 net/ieee802154/6lowpan.c create mode 100644 net/ieee802154/6lowpan.h Merging wireless/master $ git merge wireless/master Auto-merging MAINTAINERS Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.h Auto-merging drivers/net/wireless/ath/ath9k/main.c Auto-merging drivers/net/wireless/ath/carl9170/main.c Auto-merging drivers/net/wireless/b43/dma.c Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c Auto-merging include/net/cfg80211.h Auto-merging net/mac80211/cfg.c Auto-merging net/mac80211/mesh_pathtbl.c Auto-merging net/mac80211/sta_info.c Merge made by recursive. MAINTAINERS | 25 +- drivers/bcma/driver_chipcommon_pmu.c | 20 +- drivers/bcma/scan.c | 2 +- drivers/bcma/sprom.c | 6 + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 8 +- .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 15 - drivers/net/wireless/ath/ath9k/ar9003_hw.c | 89 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 32 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 +- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 - .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 1673 ++++++++++++++++++++ drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- drivers/net/wireless/ath/ath9k/calib.c | 3 +- drivers/net/wireless/ath/ath9k/common.c | 26 + drivers/net/wireless/ath/ath9k/common.h | 1 + drivers/net/wireless/ath/ath9k/debug.c | 55 + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 21 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 17 + drivers/net/wireless/ath/ath9k/hw-ops.h | 8 +- drivers/net/wireless/ath/ath9k/hw.c | 11 +- drivers/net/wireless/ath/ath9k/hw.h | 8 +- drivers/net/wireless/ath/ath9k/init.c | 27 +- drivers/net/wireless/ath/ath9k/mac.c | 19 +- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/main.c | 54 +- drivers/net/wireless/ath/ath9k/pci.c | 48 +- drivers/net/wireless/ath/ath9k/rc.c | 34 +- drivers/net/wireless/ath/ath9k/recv.c | 12 +- drivers/net/wireless/ath/ath9k/reg.h | 14 + drivers/net/wireless/ath/ath9k/xmit.c | 44 +- drivers/net/wireless/ath/carl9170/Kconfig | 14 + drivers/net/wireless/ath/carl9170/carl9170.h | 24 + drivers/net/wireless/ath/carl9170/cmd.c | 34 + drivers/net/wireless/ath/carl9170/cmd.h | 1 + drivers/net/wireless/ath/carl9170/fw.c | 3 + drivers/net/wireless/ath/carl9170/fwcmd.h | 11 + drivers/net/wireless/ath/carl9170/main.c | 229 +++- drivers/net/wireless/ath/carl9170/phy.c | 16 +- drivers/net/wireless/ath/carl9170/version.h | 4 +- drivers/net/wireless/b43/Kconfig | 10 - drivers/net/wireless/b43/b43.h | 23 +- drivers/net/wireless/b43/dma.c | 126 +- drivers/net/wireless/b43/dma.h | 13 +- drivers/net/wireless/b43/main.c | 66 +- drivers/net/wireless/b43/phy_common.c | 32 + drivers/net/wireless/b43/phy_common.h | 2 + drivers/net/wireless/b43/phy_ht.c | 203 +++ drivers/net/wireless/b43/phy_ht.h | 19 + drivers/net/wireless/b43/phy_lcn.c | 211 +++- drivers/net/wireless/b43/phy_lcn.h | 16 +- drivers/net/wireless/b43/phy_n.c | 40 +- drivers/net/wireless/b43/pio.c | 12 +- drivers/net/wireless/b43/tables_phy_ht.c | 84 + drivers/net/wireless/b43/tables_phy_ht.h | 4 + drivers/net/wireless/b43/tables_phy_lcn.c | 432 +++++ drivers/net/wireless/b43/tables_phy_lcn.h | 16 + drivers/net/wireless/b43/xmit.c | 120 +- drivers/net/wireless/b43/xmit.h | 62 +- drivers/net/wireless/b43legacy/b43legacy.h | 4 - drivers/net/wireless/b43legacy/main.c | 4 +- drivers/net/wireless/libertas/README | 25 - drivers/net/wireless/libertas/dev.h | 4 +- drivers/net/wireless/mwifiex/scan.c | 4 +- drivers/net/wireless/mwl8k.c | 3 - drivers/net/wireless/p54/eeprom.c | 26 +- drivers/net/wireless/p54/fwio.c | 2 + drivers/net/wireless/p54/main.c | 113 ++- drivers/net/wireless/p54/p54.h | 18 + drivers/net/wireless/p54/txrx.c | 66 + drivers/net/wireless/rtlwifi/base.c | 161 ++ drivers/net/wireless/rtlwifi/base.h | 2 + drivers/net/wireless/rtlwifi/debug.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 139 -- drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 30 +- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 116 +-- drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 8 +- drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 8 +- drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 23 +- drivers/net/wireless/rtlwifi/rtl8192de/def.h | 35 - drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 30 +- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 121 +-- drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 8 +- drivers/net/wireless/rtlwifi/rtl8192se/def.h | 39 +- drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 30 +- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 124 +-- drivers/net/wireless/rtlwifi/wifi.h | 35 + drivers/nfc/pn533.c | 17 +- drivers/ssb/main.c | 24 +- include/linux/bcma/bcma_driver_chipcommon.h | 18 + include/linux/ieee80211.h | 59 +- include/linux/nfc.h | 2 + include/linux/nl80211.h | 32 + include/net/cfg80211.h | 12 +- include/net/mac80211.h | 2 + include/net/nfc.h | 7 +- include/net/regulatory.h | 16 +- net/mac80211/Kconfig | 13 + net/mac80211/agg-tx.c | 2 +- net/mac80211/cfg.c | 19 + net/mac80211/debugfs_netdev.c | 8 +- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mesh.c | 259 +++- net/mac80211/mesh.h | 36 +- net/mac80211/mesh_hwmp.c | 130 +- net/mac80211/mesh_pathtbl.c | 305 ++++- net/mac80211/mesh_plink.c | 241 ++-- net/mac80211/mlme.c | 59 +- net/mac80211/rx.c | 48 +- net/mac80211/sta_info.c | 330 +++-- net/mac80211/sta_info.h | 30 +- net/mac80211/status.c | 18 + net/mac80211/tx.c | 14 +- net/nfc/core.c | 6 +- net/nfc/rawsock.c | 13 +- net/wireless/mesh.c | 3 + net/wireless/nl80211.c | 42 + net/wireless/util.c | 6 +- 121 files changed, 5613 insertions(+), 1490 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. drivers/bluetooth/btusb.c | 3 +- include/net/bluetooth/hci_core.h | 23 +++- include/net/bluetooth/l2cap.h | 3 +- include/net/bluetooth/mgmt.h | 11 ++ net/bluetooth/af_bluetooth.c | 30 ++++- net/bluetooth/bnep/core.c | 5 +- net/bluetooth/cmtp/core.c | 5 +- net/bluetooth/hci_conn.c | 14 +- net/bluetooth/hci_core.c | 43 +++--- net/bluetooth/hci_event.c | 4 +- net/bluetooth/hci_sock.c | 18 +++- net/bluetooth/hidp/core.c | 10 +- net/bluetooth/l2cap_core.c | 271 ++++++++++++++------------------------ net/bluetooth/mgmt.c | 80 ++++++++++-- net/bluetooth/rfcomm/core.c | 5 +- net/bluetooth/smp.c | 59 +++++--- 16 files changed, 334 insertions(+), 250 deletions(-) Merging mtd/master $ git merge mtd/master Already up-to-date. Merging l2-mtd/master $ git merge l2-mtd/master Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution. Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c Auto-merging arch/arm/mach-at91/board-cam60.c Auto-merging arch/arm/mach-at91/board-cap9adk.c Auto-merging arch/arm/mach-at91/board-kb9202.c Auto-merging arch/arm/mach-at91/board-neocore926.c Auto-merging arch/arm/mach-at91/board-qil-a9260.c Auto-merging arch/arm/mach-at91/board-rm9200dk.c Auto-merging arch/arm/mach-at91/board-sam9-l9260.c Auto-merging arch/arm/mach-at91/board-sam9260ek.c Auto-merging arch/arm/mach-at91/board-sam9261ek.c Auto-merging arch/arm/mach-at91/board-sam9263ek.c Auto-merging arch/arm/mach-at91/board-sam9g20ek.c Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c Auto-merging arch/arm/mach-at91/board-sam9rlek.c Auto-merging arch/arm/mach-at91/board-usb-a9260.c Auto-merging arch/arm/mach-at91/board-usb-a9263.c Auto-merging arch/arm/mach-at91/board-yl-9200.c Auto-merging arch/arm/mach-davinci/board-da830-evm.c Auto-merging arch/arm/mach-davinci/board-da850-evm.c Auto-merging arch/arm/mach-davinci/board-dm355-evm.c Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c Auto-merging arch/arm/mach-davinci/board-dm365-evm.c Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c Auto-merging arch/arm/mach-davinci/board-mityomapl138.c Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c Auto-merging arch/arm/mach-ep93xx/ts72xx.c Auto-merging arch/arm/mach-mmp/aspenite.c Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c Auto-merging arch/arm/mach-pxa/cm-x300.c Auto-merging arch/arm/mach-pxa/littleton.c Auto-merging arch/arm/mach-pxa/raumfeld.c Auto-merging arch/arm/mach-pxa/zylonite.c Removing drivers/mtd/maps/ceiva.c Removing drivers/mtd/maps/edb7312.c Auto-merging drivers/mtd/maps/lantiq-flash.c CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c Removing drivers/mtd/nand/edb7312.c Auto-merging drivers/mtd/onenand/omap2.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 56eae2d] Merge remote-tracking branch 'l2-mtd/master' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/mtdnand.tmpl | 19 +- .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 + arch/arm/mach-at91/board-afeb-9260v1.c | 9 +- arch/arm/mach-at91/board-cam60.c | 9 +- arch/arm/mach-at91/board-cap9adk.c | 9 +- arch/arm/mach-at91/board-kb9202.c | 9 +- arch/arm/mach-at91/board-neocore926.c | 9 +- arch/arm/mach-at91/board-qil-a9260.c | 9 +- arch/arm/mach-at91/board-rm9200dk.c | 9 +- arch/arm/mach-at91/board-sam9-l9260.c | 9 +- arch/arm/mach-at91/board-sam9260ek.c | 9 +- arch/arm/mach-at91/board-sam9261ek.c | 9 +- arch/arm/mach-at91/board-sam9263ek.c | 9 +- arch/arm/mach-at91/board-sam9g20ek.c | 9 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +- arch/arm/mach-at91/board-sam9rlek.c | 9 +- arch/arm/mach-at91/board-snapper9260.c | 10 +- arch/arm/mach-at91/board-usb-a9260.c | 9 +- arch/arm/mach-at91/board-usb-a9263.c | 9 +- arch/arm/mach-at91/board-yl-9200.c | 9 +- arch/arm/mach-at91/include/mach/board.h | 3 +- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- arch/arm/mach-davinci/board-dm365-evm.c | 2 +- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- arch/arm/mach-davinci/board-mityomapl138.c | 3 +- arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +- arch/arm/mach-davinci/include/mach/nand.h | 4 +- arch/arm/mach-ep93xx/ts72xx.c | 23 +- arch/arm/mach-mmp/aspenite.c | 5 +- arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- arch/arm/mach-pxa/cm-x300.c | 5 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +- arch/arm/mach-pxa/littleton.c | 5 +- arch/arm/mach-pxa/mxm8x10.c | 9 +- arch/arm/mach-pxa/raumfeld.c | 5 +- arch/arm/mach-pxa/zylonite.c | 5 +- arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +- arch/avr32/boards/atngw100/setup.c | 8 +- arch/avr32/boards/atstk1000/atstk1002.c | 9 +- arch/avr32/mach-at32ap/include/mach/board.h | 3 +- arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- drivers/mtd/Kconfig | 16 +- drivers/mtd/Makefile | 2 +- drivers/mtd/afs.c | 4 +- drivers/mtd/ar7part.c | 2 +- drivers/mtd/chips/cfi_cmdset_0002.c | 31 +- drivers/mtd/chips/fwh_lock.h | 3 +- drivers/mtd/chips/jedec_probe.c | 34 +- drivers/mtd/cmdlinepart.c | 7 +- drivers/mtd/devices/doc2000.c | 13 +- drivers/mtd/devices/doc2001.c | 7 +- drivers/mtd/devices/doc2001plus.c | 7 +- drivers/mtd/devices/docecc.c | 2 +- drivers/mtd/devices/lart.c | 18 +- drivers/mtd/devices/m25p80.c | 84 +- drivers/mtd/devices/mtd_dataflash.c | 91 +- drivers/mtd/devices/sst25l.c | 42 +- drivers/mtd/ftl.c | 40 +- drivers/mtd/inftlcore.c | 59 +- drivers/mtd/inftlmount.c | 116 +- drivers/mtd/maps/Kconfig | 22 - drivers/mtd/maps/Makefile | 2 - drivers/mtd/maps/bfin-async-flash.c | 16 +- drivers/mtd/maps/ceiva.c | 341 ---- drivers/mtd/maps/dc21285.c | 9 +- drivers/mtd/maps/edb7312.c | 134 -- drivers/mtd/maps/gpio-addr-flash.c | 16 +- drivers/mtd/maps/h720x-flash.c | 23 +- drivers/mtd/maps/impa7.c | 28 +- drivers/mtd/maps/intel_vr_nor.c | 7 +- drivers/mtd/maps/ixp2000.c | 11 +- drivers/mtd/maps/ixp4xx.c | 29 +- drivers/mtd/maps/lantiq-flash.c | 17 +- drivers/mtd/maps/latch-addr-flash.c | 24 +- drivers/mtd/maps/pcmciamtd.c | 124 +- drivers/mtd/maps/physmap.c | 38 +- drivers/mtd/maps/physmap_of.c | 80 +- drivers/mtd/maps/plat-ram.c | 23 +- drivers/mtd/maps/pxa2xx-flash.c | 20 +- drivers/mtd/maps/rbtx4939-flash.c | 24 +- drivers/mtd/maps/sa1100-flash.c | 30 +- drivers/mtd/maps/solutionengine.c | 30 +- drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +- drivers/mtd/mtdblock.c | 18 +- drivers/mtd/mtdchar.c | 45 +- drivers/mtd/mtdconcat.c | 2 +- drivers/mtd/mtdcore.c | 69 +- drivers/mtd/mtdcore.h | 3 + drivers/mtd/mtdpart.c | 52 +- drivers/mtd/mtdsuper.c | 20 +- drivers/mtd/mtdswap.c | 5 +- drivers/mtd/nand/Kconfig | 27 +- drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/atmel_nand.c | 74 +- drivers/mtd/nand/au1550nd.c | 29 +- drivers/mtd/nand/autcpu12.c | 4 +- drivers/mtd/nand/bcm_umi_nand.c | 57 +- drivers/mtd/nand/cafe_nand.c | 21 +- drivers/mtd/nand/cmx270_nand.c | 23 +- drivers/mtd/nand/cs553x_nand.c | 15 +- drivers/mtd/nand/davinci_nand.c | 39 +- drivers/mtd/nand/denali.c | 6 +- drivers/mtd/nand/diskonchip.c | 6 +- drivers/mtd/nand/edb7312.c | 203 --- drivers/mtd/nand/fsl_elbc_nand.c | 75 +- drivers/mtd/nand/fsl_upm.c | 16 +- drivers/mtd/nand/fsmc_nand.c | 77 +- drivers/mtd/nand/gpmi-nand/Makefile | 3 + drivers/mtd/nand/gpmi-nand/bch-regs.h | 84 + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 1056 ++++++++++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 1674 ++++++++++++++++++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 274 ++++ drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 168 ++ drivers/mtd/nand/h1910.c | 19 +- drivers/mtd/nand/jz4740_nand.c | 18 +- drivers/mtd/nand/mpc5121_nfc.c | 22 +- drivers/mtd/nand/mxc_nand.c | 35 +- drivers/mtd/nand/nand_base.c | 996 ++++++------ drivers/mtd/nand/nand_bbt.c | 516 +++---- drivers/mtd/nand/nand_bch.c | 4 +- drivers/mtd/nand/nand_ecc.c | 10 +- drivers/mtd/nand/nandsim.c | 4 +- drivers/mtd/nand/ndfc.c | 22 +- drivers/mtd/nand/nomadik_nand.c | 1 + drivers/mtd/nand/nuc900_nand.c | 1 + drivers/mtd/nand/omap2.c | 22 +- drivers/mtd/nand/orion_nand.c | 16 +- drivers/mtd/nand/pasemi_nand.c | 3 +- drivers/mtd/nand/plat_nand.c | 25 +- drivers/mtd/nand/ppchameleonevb.c | 47 +- drivers/mtd/nand/pxa3xx_nand.c | 471 ++++--- drivers/mtd/nand/rtc_from4.c | 5 +- drivers/mtd/nand/s3c2410.c | 27 +- drivers/mtd/nand/sharpsl.c | 13 +- drivers/mtd/nand/socrates_nand.c | 28 +- drivers/mtd/nand/tmio_nand.c | 17 +- drivers/mtd/nand/txx9ndfmc.c | 8 +- drivers/mtd/nftlcore.c | 27 +- drivers/mtd/nftlmount.c | 26 +- drivers/mtd/ofpart.c | 112 ++- drivers/mtd/onenand/generic.c | 14 +- drivers/mtd/onenand/omap2.c | 16 +- drivers/mtd/onenand/onenand_base.c | 62 +- drivers/mtd/onenand/onenand_bbt.c | 6 +- drivers/mtd/onenand/samsung.c | 13 +- drivers/mtd/redboot.c | 13 +- drivers/mtd/sm_ftl.c | 18 +- drivers/mtd/ssfdc.c | 44 +- drivers/mtd/tests/mtd_readtest.c | 3 +- fs/jffs2/scan.c | 4 +- fs/jffs2/wbuf.c | 3 +- include/linux/mtd/bbm.h | 39 +- include/linux/mtd/mtd.h | 54 +- include/linux/mtd/nand.h | 80 +- include/linux/mtd/onenand.h | 4 + include/linux/mtd/partitions.h | 46 +- include/linux/mtd/physmap.h | 17 - include/mtd/mtd-abi.h | 7 +- 163 files changed, 5405 insertions(+), 3669 deletions(-) create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt delete mode 100644 drivers/mtd/maps/ceiva.c delete mode 100644 drivers/mtd/maps/edb7312.c delete mode 100644 drivers/mtd/nand/edb7312.c create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h Merging crypto/master $ git merge crypto/master Merge made by recursive. .../devicetree/bindings/crypto/picochip-spacc.txt | 23 + arch/x86/crypto/Makefile | 8 + arch/x86/crypto/sha1_ssse3_asm.S | 558 ++++++++++++++++++++ arch/x86/crypto/sha1_ssse3_glue.c | 240 +++++++++ arch/x86/include/asm/cpufeature.h | 3 + crypto/Kconfig | 10 + crypto/cryptd.c | 2 +- crypto/sha1_generic.c | 9 +- drivers/crypto/n2_core.c | 4 +- drivers/crypto/padlock-aes.c | 4 +- drivers/crypto/picoxcell_crypto.c | 121 ++--- include/crypto/sha.h | 5 + 12 files changed, 915 insertions(+), 72 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c Merging sound/for-next $ git merge sound/for-next Removing sound/pci/hda/alc268_quirks.c Removing sound/pci/hda/alc269_quirks.c Removing sound/pci/hda/alc662_quirks.c Removing sound/pci/hda/alc680_quirks.c Removing sound/pci/hda/alc861_quirks.c Removing sound/pci/hda/alc861vd_quirks.c Merge made by recursive. .../bindings/sound/soc/codecs/fsl-sgtl5000.txt | 11 + Documentation/devicetree/bindings/sound/wm8510.txt | 18 + Documentation/devicetree/bindings/sound/wm8523.txt | 16 + Documentation/devicetree/bindings/sound/wm8580.txt | 16 + Documentation/devicetree/bindings/sound/wm8711.txt | 18 + Documentation/devicetree/bindings/sound/wm8728.txt | 18 + Documentation/devicetree/bindings/sound/wm8731.txt | 18 + Documentation/devicetree/bindings/sound/wm8737.txt | 18 + Documentation/devicetree/bindings/sound/wm8741.txt | 18 + Documentation/devicetree/bindings/sound/wm8750.txt | 18 + Documentation/devicetree/bindings/sound/wm8753.txt | 18 + Documentation/sound/alsa/ALSA-Configuration.txt | 5 + Documentation/sound/alsa/HD-Audio-Models.txt | 67 +- Documentation/sound/alsa/HD-Audio.txt | 48 + arch/mips/alchemy/devboards/db1200/platform.c | 16 + arch/mips/alchemy/devboards/db1x00/platform.c | 48 + include/linux/mfd/wm8994/registers.h | 84 ++ include/sound/adau1373.h | 34 + include/sound/soc-dapm.h | 2 + include/sound/soc.h | 10 + sound/core/control.c | 4 +- sound/firewire/isight.c | 1 - sound/mips/Kconfig | 5 +- sound/pci/ctxfi/ctpcm.c | 2 +- sound/pci/ctxfi/ctsrc.c | 2 +- sound/pci/ctxfi/ctvmem.h | 2 +- sound/pci/hda/Makefile | 3 + sound/pci/hda/alc260_quirks.c | 304 ----- sound/pci/hda/alc262_quirks.c | 508 +------- sound/pci/hda/alc268_quirks.c | 636 --------- sound/pci/hda/alc269_quirks.c | 674 ---------- sound/pci/hda/alc662_quirks.c | 1408 ------------------- sound/pci/hda/alc680_quirks.c | 222 --- sound/pci/hda/alc861_quirks.c | 725 ---------- sound/pci/hda/alc861vd_quirks.c | 605 --------- sound/pci/hda/hda_codec.c | 71 +- sound/pci/hda/hda_intel.c | 68 +- sound/pci/hda/hda_local.h | 24 +- sound/pci/hda/hda_trace.h | 117 ++ sound/pci/hda/patch_conexant.c | 93 +- sound/pci/hda/patch_realtek.c | 946 +++++++++----- sound/pci/oxygen/xonar_pcm179x.c | 1 + sound/pci/rme9652/hdspm.c | 139 +- sound/soc/Kconfig | 3 + sound/soc/Makefile | 1 + sound/soc/au1x/Kconfig | 28 + sound/soc/au1x/Makefile | 10 + sound/soc/au1x/ac97c.c | 363 +++++ sound/soc/au1x/db1000.c | 75 + sound/soc/au1x/db1200.c | 64 +- sound/soc/au1x/dbdma2.c | 91 +- sound/soc/au1x/dma.c | 377 ++++++ sound/soc/au1x/i2sc.c | 346 +++++ sound/soc/au1x/psc-ac97.c | 48 +- sound/soc/au1x/psc-i2s.c | 42 +- sound/soc/au1x/psc.h | 16 +- sound/soc/blackfin/Kconfig | 13 + sound/soc/blackfin/Makefile | 2 + sound/soc/blackfin/bfin-eval-adau1373.c | 202 +++ sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/adau1373.c | 1414 ++++++++++++++++++++ sound/soc/codecs/adau1373.h | 29 + sound/soc/codecs/sgtl5000.c | 8 + sound/soc/codecs/sta32x.c | 21 +- sound/soc/codecs/wm1250-ev1.c | 20 +- sound/soc/codecs/wm8510.c | 8 + sound/soc/codecs/wm8523.c | 35 +- sound/soc/codecs/wm8580.c | 9 +- sound/soc/codecs/wm8711.c | 13 +- sound/soc/codecs/wm8728.c | 13 +- sound/soc/codecs/wm8731.c | 10 + sound/soc/codecs/wm8737.c | 10 + sound/soc/codecs/wm8741.c | 135 ++- sound/soc/codecs/wm8750.c | 14 +- sound/soc/codecs/wm8753.c | 13 +- sound/soc/codecs/wm8962.c | 187 +++- sound/soc/codecs/wm8993.c | 7 +- sound/soc/codecs/wm8994-tables.c | 16 +- sound/soc/codecs/wm8994.c | 270 +++- sound/soc/codecs/wm8994.h | 2 + sound/soc/codecs/wm8996.c | 12 +- sound/soc/codecs/wm_hubs.c | 48 +- sound/soc/codecs/wm_hubs.h | 3 +- sound/soc/fsl/fsl_dma.c | 1 - sound/soc/fsl/fsl_ssi.c | 61 +- sound/soc/fsl/mpc5200_dma.c | 6 +- sound/soc/mxs/Kconfig | 20 + sound/soc/mxs/Makefile | 10 + sound/soc/mxs/mxs-pcm.c | 359 +++++ sound/soc/mxs/mxs-pcm.h | 43 + sound/soc/mxs/mxs-saif.c | 680 ++++++++++ sound/soc/mxs/mxs-saif.h | 130 ++ sound/soc/mxs/mxs-sgtl5000.c | 173 +++ sound/soc/nuc900/nuc900-pcm.c | 1 - sound/soc/pxa/spitz.c | 2 +- sound/soc/pxa/z2.c | 2 +- sound/soc/s6000/s6000-pcm.c | 1 - sound/soc/samsung/Kconfig | 6 +- sound/soc/samsung/jive_wm8750.c | 2 +- sound/soc/samsung/smartq_wm8987.c | 2 +- sound/soc/samsung/smdk_wm8580.c | 6 +- sound/soc/samsung/smdk_wm8580pcm.c | 4 +- sound/soc/samsung/speyside.c | 5 +- sound/soc/samsung/speyside_wm8962.c | 4 +- sound/soc/soc-cache.c | 7 - sound/soc/soc-core.c | 6 +- sound/soc/soc-dapm.c | 12 +- sound/soc/soc-io.c | 357 +----- sound/soc/soc-pcm.c | 2 - sound/usb/midi.c | 27 + sound/usb/mixer.c | 13 +- sound/usb/quirks-table.h | 11 + sound/usb/quirks.c | 1 + sound/usb/usbaudio.h | 1 + 115 files changed, 6742 insertions(+), 6258 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt create mode 100644 include/sound/adau1373.h delete mode 100644 sound/pci/hda/alc268_quirks.c delete mode 100644 sound/pci/hda/alc269_quirks.c delete mode 100644 sound/pci/hda/alc662_quirks.c delete mode 100644 sound/pci/hda/alc680_quirks.c delete mode 100644 sound/pci/hda/alc861_quirks.c delete mode 100644 sound/pci/hda/alc861vd_quirks.c create mode 100644 sound/pci/hda/hda_trace.h create mode 100644 sound/soc/au1x/ac97c.c create mode 100644 sound/soc/au1x/db1000.c create mode 100644 sound/soc/au1x/dma.c create mode 100644 sound/soc/au1x/i2sc.c create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c create mode 100644 sound/soc/codecs/adau1373.c create mode 100644 sound/soc/codecs/adau1373.h create mode 100644 sound/soc/mxs/Kconfig create mode 100644 sound/soc/mxs/Makefile create mode 100644 sound/soc/mxs/mxs-pcm.c create mode 100644 sound/soc/mxs/mxs-pcm.h create mode 100644 sound/soc/mxs/mxs-saif.c create mode 100644 sound/soc/mxs/mxs-saif.h create mode 100644 sound/soc/mxs/mxs-sgtl5000.c Merging sound-asoc/for-next $ git merge sound-asoc/for-next Already up-to-date. Merging cpufreq/next $ git merge cpufreq/next Merge made by recursive. Documentation/cpu-freq/governors.txt | 2 +- drivers/cpufreq/cpufreq_ondemand.c | 2 +- drivers/cpufreq/e_powersaver.c | 135 +++++++++++++++++++++++++++++++--- drivers/cpufreq/exynos4210-cpufreq.c | 23 ++++++- 4 files changed, 148 insertions(+), 14 deletions(-) Merging quilt/rr $ git merge quilt/rr Auto-merging drivers/net/virtio_net.c Merge made by recursive. arch/x86/lguest/boot.c | 10 ++++++++++ drivers/char/virtio_console.c | 10 ++++------ drivers/lguest/core.c | 2 +- drivers/net/virtio_net.c | 14 +++++--------- include/linux/virtio.h | 4 ++-- include/linux/virtio_config.h | 3 +++ 6 files changed, 25 insertions(+), 18 deletions(-) Merging input/next $ git merge input/next Auto-merging drivers/input/misc/Kconfig Auto-merging drivers/input/misc/Makefile Auto-merging drivers/input/misc/ad714x-i2c.c Auto-merging include/linux/input.h Merge made by recursive. Documentation/input/multi-touch-protocol.txt | 14 + drivers/input/input-mt.c | 1 + drivers/input/input-polldev.c | 6 +- drivers/input/misc/Kconfig | 45 ++- drivers/input/misc/Makefile | 4 +- drivers/input/misc/ad714x-i2c.c | 4 +- drivers/input/misc/bma150.c | 691 ++++++++++++++++++++++++++ drivers/input/misc/pm8xxx-vibrator.c | 296 +++++++++++ drivers/input/mouse/synaptics.c | 527 ++++++++++++++++++-- drivers/input/mouse/synaptics.h | 27 +- drivers/input/touchscreen/tsc2007.c | 194 ++++---- drivers/input/touchscreen/wacom_w8001.c | 29 +- include/linux/bma150.h | 46 ++ include/linux/input.h | 1 + 14 files changed, 1722 insertions(+), 163 deletions(-) create mode 100644 drivers/input/misc/bma150.c create mode 100644 drivers/input/misc/pm8xxx-vibrator.c create mode 100644 include/linux/bma150.h Merging input-mt/next $ git merge input-mt/next Already up-to-date. Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Already up-to-date. Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. Documentation/device-mapper/persistent-data.txt | 84 + Documentation/device-mapper/thin-provisioning.txt | 275 +++ drivers/md/Kconfig | 9 + drivers/md/Makefile | 3 + drivers/md/dm-crypt.c | 1 + drivers/md/dm-flakey.c | 4 +- drivers/md/dm-kcopyd.c | 31 +- drivers/md/dm-raid.c | 2 +- drivers/md/dm-table.c | 84 +- drivers/md/dm-thin-metadata.c | 1406 ++++++++++++ drivers/md/dm-thin-metadata.h | 168 ++ drivers/md/dm-thin.c | 2280 ++++++++++++++++++++ drivers/md/dm.c | 12 +- drivers/md/persistent-data/Kconfig | 7 + drivers/md/persistent-data/Makefile | 9 + drivers/md/persistent-data/dm-block-manager.c | 998 +++++++++ drivers/md/persistent-data/dm-block-manager.h | 134 ++ drivers/md/persistent-data/dm-btree-internal.h | 133 ++ drivers/md/persistent-data/dm-btree-remove.c | 571 +++++ drivers/md/persistent-data/dm-btree-spine.c | 222 ++ drivers/md/persistent-data/dm-btree.c | 861 ++++++++ drivers/md/persistent-data/dm-btree.h | 158 ++ .../persistent-data/dm-persistent-data-internal.h | 20 + drivers/md/persistent-data/dm-space-map-common.h | 94 + drivers/md/persistent-data/dm-space-map-disk.c | 663 ++++++ drivers/md/persistent-data/dm-space-map-disk.h | 25 + drivers/md/persistent-data/dm-space-map-metadata.c | 956 ++++++++ drivers/md/persistent-data/dm-space-map-metadata.h | 33 + drivers/md/persistent-data/dm-space-map.h | 118 + .../md/persistent-data/dm-transaction-manager.c | 414 ++++ .../md/persistent-data/dm-transaction-manager.h | 130 ++ include/linux/device-mapper.h | 40 +- include/linux/dm-kcopyd.h | 4 + 33 files changed, 9927 insertions(+), 22 deletions(-) create mode 100644 Documentation/device-mapper/persistent-data.txt create mode 100644 Documentation/device-mapper/thin-provisioning.txt create mode 100644 drivers/md/dm-thin-metadata.c create mode 100644 drivers/md/dm-thin-metadata.h create mode 100644 drivers/md/dm-thin.c create mode 100644 drivers/md/persistent-data/Kconfig create mode 100644 drivers/md/persistent-data/Makefile create mode 100644 drivers/md/persistent-data/dm-block-manager.c create mode 100644 drivers/md/persistent-data/dm-block-manager.h create mode 100644 drivers/md/persistent-data/dm-btree-internal.h create mode 100644 drivers/md/persistent-data/dm-btree-remove.c create mode 100644 drivers/md/persistent-data/dm-btree-spine.c create mode 100644 drivers/md/persistent-data/dm-btree.c create mode 100644 drivers/md/persistent-data/dm-btree.h create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h create mode 100644 drivers/md/persistent-data/dm-space-map-common.h create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h create mode 100644 drivers/md/persistent-data/dm-space-map.h create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h 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 Already up-to-date. Merging battery/master $ git merge battery/master Merge made by recursive. .../bindings/power_supply/olpc_battery.txt | 5 + drivers/power/ds2780_battery.c | 2 +- drivers/power/max17042_battery.c | 17 ++-- drivers/power/max8903_charger.c | 2 +- drivers/power/max8997_charger.c | 1 + drivers/power/max8998_charger.c | 2 + drivers/power/olpc_battery.c | 79 ++++++++++++++----- drivers/power/pda_power.c | 74 ++++++++++++++++-- drivers/power/power_supply_sysfs.c | 4 +- drivers/power/wm831x_power.c | 44 +++++++---- drivers/power/z2_battery.c | 2 +- include/linux/pda_power.h | 2 + 12 files changed, 175 insertions(+), 59 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt Merging leds/for-mm $ git merge leds/for-mm Resolved 'drivers/leds/Kconfig' using previous resolution. Auto-merging drivers/leds/Kconfig CONFLICT (content): Merge conflict in drivers/leds/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1bb11b0] Merge remote-tracking branch 'leds/for-mm' $ git diff -M --stat --summary HEAD^.. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging mmc/mmc-next $ git merge mmc/mmc-next Auto-merging arch/arm/mach-at91/at91sam9260_devices.c Auto-merging arch/arm/mach-msm/devices-msm7x00.c Auto-merging arch/arm/mach-msm/devices-qsd8x50.c Auto-merging arch/arm/mach-shmobile/board-ag5evm.c Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging drivers/mmc/host/sdhci-tegra.c Merge made by recursive. .../devicetree/bindings/mmc/nvidia-sdhci.txt | 25 + Documentation/fault-injection/fault-injection.txt | 8 +- arch/arm/mach-at91/at91sam9260_devices.c | 2 +- arch/arm/mach-msm/devices-msm7x00.c | 24 - arch/arm/mach-msm/devices-qsd8x50.c | 24 - arch/arm/mach-msm/include/mach/mmc.h | 9 +- arch/arm/mach-shmobile/board-ag5evm.c | 6 + arch/arm/mach-shmobile/board-mackerel.c | 6 + drivers/mmc/card/block.c | 4 +- drivers/mmc/card/queue.c | 2 +- drivers/mmc/core/core.c | 78 ++- drivers/mmc/core/debugfs.c | 25 + drivers/mmc/core/host.c | 23 +- drivers/mmc/core/host.h | 8 +- drivers/mmc/core/mmc_ops.c | 4 +- drivers/mmc/core/sd.c | 81 ++- drivers/mmc/core/sd_ops.c | 8 +- drivers/mmc/core/sdio_ops.c | 2 +- drivers/mmc/host/Kconfig | 12 +- drivers/mmc/host/at91_mci.c | 6 +- drivers/mmc/host/atmel-mci-regs.h | 220 +++--- drivers/mmc/host/atmel-mci.c | 823 +++++++++++++------- drivers/mmc/host/msm_sdcc.c | 78 ++- drivers/mmc/host/msm_sdcc.h | 6 +- drivers/mmc/host/sdhci-esdhc-imx.c | 45 +- drivers/mmc/host/sdhci-s3c.c | 2 + drivers/mmc/host/sdhci-tegra.c | 51 +- drivers/mmc/host/sh_mobile_sdhi.c | 102 ++- drivers/mmc/host/tmio_mmc.h | 7 + drivers/mmc/host/tmio_mmc_pio.c | 149 +++-- include/linux/atmel-mci.h | 4 +- include/linux/atmel_pdc.h | 2 + include/linux/mmc/host.h | 5 + include/linux/mmc/sh_mobile_sdhi.h | 4 + lib/Kconfig.debug | 11 + lib/fault-inject.c | 2 + 36 files changed, 1258 insertions(+), 610 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. Merging slab/for-next $ git merge slab/for-next Merge made by recursive. include/linux/mm_types.h | 14 ++- include/linux/slub_def.h | 4 + mm/slub.c | 509 ++++++++++++++++++++++++++++++++++------------ tools/slub/slabinfo.c | 8 + 4 files changed, 406 insertions(+), 129 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 Auto-merging arch/arm/mach-omap2/board-omap3beagle.c Merge made by recursive. arch/arm/mach-omap2/board-omap3beagle.c | 9 +- drivers/leds/leds-asic3.c | 35 +++- drivers/mfd/Kconfig | 1 + drivers/mfd/ab3550-core.c | 10 +- drivers/mfd/ab8500-gpadc.c | 56 ++++-- drivers/mfd/asic3.c | 26 ++- drivers/mfd/max8997.c | 32 +++- drivers/mfd/omap-usb-host.c | 2 +- drivers/mfd/pcf50633-core.c | 114 +++------- drivers/mfd/tc3589x.c | 2 + drivers/mfd/timberdale.c | 9 +- drivers/mfd/tps65910-irq.c | 2 + drivers/mfd/twl4030-irq.c | 342 ++++++++++++------------------- drivers/mfd/twl4030-madc.c | 27 +++- drivers/mfd/twl6030-irq.c | 18 +- drivers/mfd/wm831x-irq.c | 2 - drivers/mfd/wm8350-gpio.c | 4 +- drivers/mfd/wm8994-core.c | 53 +++++ drivers/rtc/rtc-twl.c | 10 +- include/linux/i2c/twl4030-madc.h | 4 + include/linux/mfd/ab8500/gpadc.h | 5 +- include/linux/mfd/max8997-private.h | 1 - include/linux/mfd/pcf50633/core.h | 3 +- include/linux/mfd/wm8994/core.h | 2 + include/linux/mfd/wm8994/pdata.h | 9 +- 25 files changed, 433 insertions(+), 345 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 fbdev/master $ git merge fbdev/master Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c Auto-merging arch/powerpc/sysdev/fsl_soc.h Auto-merging drivers/staging/xgifb/XGI_main_26.c Auto-merging drivers/video/atmel_lcdfb.c Auto-merging drivers/video/backlight/adp8860_bl.c Auto-merging drivers/video/backlight/adp8870_bl.c Auto-merging drivers/video/controlfb.c Auto-merging drivers/video/fb_defio.c Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c Auto-merging drivers/video/platinumfb.c Auto-merging drivers/video/via/viafbdev.c Merge made by recursive. arch/powerpc/platforms/512x/mpc512x_shared.c | 22 +- arch/powerpc/platforms/85xx/p1022_ds.c | 47 +-- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 55 ++-- arch/powerpc/sysdev/fsl_soc.h | 25 +- drivers/staging/xgifb/XGI_main_26.c | 22 +- drivers/video/68328fb.c | 4 +- drivers/video/Kconfig | 16 +- drivers/video/Makefile | 1 + drivers/video/acornfb.c | 5 +- drivers/video/arkfb.c | 9 +- drivers/video/atmel_lcdfb.c | 15 +- drivers/video/aty/radeon_base.c | 10 +- drivers/video/au1200fb.c | 297 ++++++-------- drivers/video/backlight/adp8860_bl.c | 1 - drivers/video/backlight/adp8870_bl.c | 1 - drivers/video/controlfb.c | 2 +- drivers/video/da8xx-fb.c | 155 +++++++- drivers/video/fb-puv3.c | 4 +- drivers/video/fb_defio.c | 3 +- drivers/video/fsl-diu-fb.c | 74 +++- drivers/video/g364fb.c | 5 +- drivers/video/grvga.c | 579 ++++++++++++++++++++++++++ drivers/video/gxt4500.c | 4 +- drivers/video/hgafb.c | 4 +- drivers/video/imsttfb.c | 2 +- drivers/video/intelfb/intelfbhw.c | 6 +- drivers/video/mb862xx/mb862xxfbdrv.c | 2 +- drivers/video/mx3fb.c | 6 +- drivers/video/neofb.c | 4 +- drivers/video/platinumfb.c | 2 +- drivers/video/pm2fb.c | 6 +- drivers/video/pm3fb.c | 6 +- drivers/video/pxa3xx-gcu.c | 2 - drivers/video/s3c-fb.c | 2 +- drivers/video/s3fb.c | 9 +- drivers/video/savage/savagefb_driver.c | 16 +- drivers/video/sis/sis_main.c | 30 +- drivers/video/skeletonfb.c | 2 +- drivers/video/sm501fb.c | 6 +- drivers/video/tridentfb.c | 4 +- drivers/video/valkyriefb.c | 2 +- drivers/video/vfb.c | 4 +- drivers/video/vga16fb.c | 2 +- drivers/video/via/via_modesetting.h | 5 + drivers/video/via/viafbdev.c | 16 +- drivers/video/vt8500lcdfb.c | 4 +- drivers/video/vt8623fb.c | 9 +- drivers/video/xilinxfb.c | 1 - 48 files changed, 1110 insertions(+), 398 deletions(-) create mode 100644 drivers/video/grvga.c Merging viafb/viafb-next $ git merge viafb/viafb-next Merge made by recursive. drivers/video/via/dvi.c | 34 +-- drivers/video/via/dvi.h | 3 +- drivers/video/via/global.c | 2 + drivers/video/via/global.h | 2 + drivers/video/via/hw.c | 544 ++++++----------------------------- drivers/video/via/hw.h | 285 +------------------ drivers/video/via/lcd.c | 53 ++-- drivers/video/via/lcd.h | 7 +- drivers/video/via/share.h | 23 +-- drivers/video/via/via-core.c | 2 +- drivers/video/via/via_modesetting.c | 104 +++++++ drivers/video/via/via_modesetting.h | 18 ++ drivers/video/via/viafbdev.c | 166 ++++++------ drivers/video/via/viamode.c | 60 +++- drivers/video/via/viamode.h | 4 +- 15 files changed, 391 insertions(+), 916 deletions(-) Merging omap_dss2/for-next $ git merge omap_dss2/for-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/88pm8607.c | 2 +- drivers/regulator/aat2870-regulator.c | 1 + drivers/regulator/core.c | 41 +++++++ drivers/regulator/max8649.c | 2 +- drivers/regulator/max8952.c | 3 - drivers/regulator/tps65023-regulator.c | 190 +++++++++++++++++++++++++++---- drivers/regulator/tps6507x-regulator.c | 8 +- drivers/regulator/tps6586x-regulator.c | 32 +++++- drivers/regulator/tps65912-regulator.c | 2 - include/linux/mfd/tps6586x.h | 16 +++ include/linux/regulator/consumer.h | 2 +- 11 files changed, 258 insertions(+), 41 deletions(-) Merging security/next $ git merge security/next Resolved 'fs/ocfs2/xattr.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging fs/gfs2/inode.c Auto-merging fs/ocfs2/xattr.c CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c Auto-merging fs/xfs/xfs_iops.c Auto-merging kernel/cred.c Removing security/integrity/ima/ima_iint.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3434197] Merge remote-tracking branch 'security/next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/evm | 23 ++ Documentation/kernel-parameters.txt | 6 + MAINTAINERS | 5 + drivers/char/tpm/tpm.c | 3 + fs/attr.c | 5 +- fs/btrfs/xattr.c | 50 +++--- fs/cifs/xattr.c | 40 ++-- fs/ext2/xattr_security.c | 34 ++-- fs/ext3/xattr_security.c | 36 ++-- fs/ext4/xattr_security.c | 36 ++-- fs/gfs2/inode.c | 38 ++-- fs/jffs2/security.c | 35 ++-- fs/jfs/xattr.c | 57 +++--- fs/ocfs2/xattr.c | 41 +++-- fs/reiserfs/xattr_security.c | 4 +- fs/xattr.c | 63 ++++++- fs/xfs/xfs_iops.c | 39 ++-- include/linux/evm.h | 92 +++++++++ include/linux/ima.h | 13 -- include/linux/integrity.h | 38 ++++ include/linux/security.h | 28 ++- include/linux/xattr.h | 14 ++- kernel/cred.c | 18 ++- mm/shmem.c | 4 +- security/Kconfig | 2 +- security/Makefile | 4 +- security/commoncap.c | 16 +- security/integrity/Kconfig | 7 + security/integrity/Makefile | 12 + security/integrity/evm/Kconfig | 14 ++ security/integrity/evm/Makefile | 6 + security/integrity/evm/evm.h | 38 ++++ security/integrity/evm/evm_crypto.c | 216 +++++++++++++++++++ security/integrity/evm/evm_main.c | 384 ++++++++++++++++++++++++++++++++++ security/integrity/evm/evm_secfs.c | 108 ++++++++++ security/integrity/iint.c | 171 ++++++++++++++++ security/integrity/ima/Kconfig | 1 + security/integrity/ima/Makefile | 2 +- security/integrity/ima/ima.h | 29 +-- security/integrity/ima/ima_api.c | 7 +- security/integrity/ima/ima_iint.c | 169 --------------- security/integrity/ima/ima_main.c | 12 +- security/integrity/integrity.h | 47 +++++ security/keys/gc.c | 386 +++++++++++++++++++++++++---------- security/keys/internal.h | 4 + security/keys/key.c | 121 +----------- security/keys/keyring.c | 3 +- security/keys/process_keys.c | 16 ++- security/security.c | 71 ++++++- security/tomoyo/gc.c | 2 +- 50 files changed, 1899 insertions(+), 671 deletions(-) create mode 100644 Documentation/ABI/testing/evm create mode 100644 include/linux/evm.h create mode 100644 include/linux/integrity.h create mode 100644 security/integrity/Kconfig create mode 100644 security/integrity/Makefile create mode 100644 security/integrity/evm/Kconfig create mode 100644 security/integrity/evm/Makefile create mode 100644 security/integrity/evm/evm.h create mode 100644 security/integrity/evm/evm_crypto.c create mode 100644 security/integrity/evm/evm_main.c create mode 100644 security/integrity/evm/evm_secfs.c create mode 100644 security/integrity/iint.c delete mode 100644 security/integrity/ima/ima_iint.c create mode 100644 security/integrity/integrity.h Merging selinux/master $ git merge selinux/master Already up-to-date. Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Merge made by recursive. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/hpwdt.c | 9 +++++---- drivers/watchdog/watchdog_dev.c | 14 +++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) 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 iommu/next $ git merge iommu/next Auto-merging arch/arm/plat-omap/include/plat/iopgtable.h Auto-merging drivers/iommu/omap-iommu-debug.c Auto-merging drivers/iommu/omap-iommu.c Auto-merging drivers/iommu/omap-iovmm.c Merge made by recursive. arch/arm/mach-omap2/iommu2.c | 31 +- arch/arm/plat-omap/Kconfig | 12 - arch/arm/plat-omap/Makefile | 2 - arch/arm/plat-omap/include/plat/iommu.h | 77 ++-- arch/arm/plat-omap/include/plat/iommu2.h | 4 +- arch/arm/plat-omap/{ => include/plat}/iopgtable.h | 20 +- arch/arm/plat-omap/include/plat/iovmm.h | 30 +- drivers/iommu/Kconfig | 18 + drivers/iommu/Makefile | 3 + .../iommu/omap-iommu-debug.c | 36 +- .../iommu.c => drivers/iommu/omap-iommu.c | 517 +++++++++++++------- .../iovmm.c => drivers/iommu/omap-iovmm.c | 338 +++---------- drivers/media/video/Kconfig | 2 +- drivers/media/video/omap3isp/isp.c | 45 ++- drivers/media/video/omap3isp/isp.h | 5 +- drivers/media/video/omap3isp/ispccdc.c | 25 +- drivers/media/video/omap3isp/ispstat.c | 11 +- drivers/media/video/omap3isp/ispvideo.c | 4 +- lib/dma-debug.c | 68 +++- 19 files changed, 676 insertions(+), 572 deletions(-) rename arch/arm/plat-omap/{ => include/plat}/iopgtable.h (82%) rename arch/arm/plat-omap/iommu-debug.c => drivers/iommu/omap-iommu-debug.c (91%) rename arch/arm/plat-omap/iommu.c => drivers/iommu/omap-iommu.c (61%) rename arch/arm/plat-omap/iovmm.c => drivers/iommu/omap-iovmm.c (63%) $ git reset --hard HEAD^ HEAD is now at 7a23b21 Merge remote-tracking branch 'watchdog/master' Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Merge made by recursive. fs/exofs/exofs.h | 3 -- fs/exofs/super.c | 57 ++++++++++++++++++----------------------------- include/scsi/osd_ore.h | 2 + 3 files changed, 24 insertions(+), 38 deletions(-) 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 fs/eventpoll.c Auto-merging lib/Kconfig.debug Auto-merging lib/idr.c Auto-merging mm/vmscan.c Merge made by recursive. Documentation/ABI/removed/o2cb | 2 +- Documentation/ABI/testing/sysfs-bus-bcma | 8 ++++---- .../testing/sysfs-class-backlight-driver-adp8870 | 16 ++++++++-------- drivers/usb/serial/mos7720.c | 1 - drivers/usb/serial/mos7840.c | 1 - fs/eventpoll.c | 2 +- lib/Kconfig.debug | 2 +- lib/idr.c | 2 +- mm/vmscan.c | 2 +- 9 files changed, 17 insertions(+), 19 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging pm/linux-next $ git merge pm/linux-next Resolved 'arch/arm/mach-shmobile/board-ap4evb.c' using previous resolution. Resolved 'arch/s390/include/asm/thread_info.h' using previous resolution. Resolved 'drivers/mfd/twl4030-irq.c' using previous resolution. Auto-merging arch/alpha/include/asm/thread_info.h Auto-merging arch/arm/mach-shmobile/board-ap4evb.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/mach-shmobile/setup-sh7372.c Auto-merging arch/s390/Kconfig Auto-merging arch/s390/include/asm/thread_info.h CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h Auto-merging drivers/bluetooth/btusb.c Auto-merging drivers/mfd/twl4030-irq.c CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c Auto-merging drivers/mfd/twl6030-irq.c Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c Auto-merging drivers/usb/core/hcd.c Auto-merging fs/ext4/super.c Auto-merging fs/gfs2/quota.c Auto-merging include/linux/netdevice.h Removing include/linux/pm_qos_params.h Auto-merging kernel/power/qos.c Auto-merging net/mac80211/main.c Auto-merging net/mac80211/mlme.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 8fd7c37] Merge remote-tracking branch 'pm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/power/basic-pm-debugging.txt | 24 ++ Documentation/power/freezing-of-tasks.txt | 14 +- Documentation/power/runtime_pm.txt | 1 + Documentation/usb/power-management.txt | 8 +- arch/alpha/include/asm/thread_info.h | 2 - arch/arm/include/asm/thread_info.h | 2 - arch/arm/mach-msm/clock.c | 2 +- arch/arm/mach-omap1/pm_bus.c | 1 + arch/arm/mach-shmobile/board-ap4evb.c | 1 + arch/arm/mach-shmobile/board-mackerel.c | 2 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 3 + arch/arm/mach-shmobile/pm-sh7372.c | 57 +--- arch/arm/mach-shmobile/pm_runtime.c | 1 + arch/arm/mach-shmobile/setup-sh7372.c | 3 + arch/avr32/include/asm/thread_info.h | 2 - arch/blackfin/include/asm/thread_info.h | 2 - arch/cris/include/asm/thread_info.h | 2 - arch/frv/include/asm/thread_info.h | 2 - arch/h8300/include/asm/thread_info.h | 2 - arch/ia64/include/asm/thread_info.h | 2 - arch/m32r/include/asm/thread_info.h | 2 - arch/m68k/include/asm/thread_info.h | 1 - arch/microblaze/include/asm/thread_info.h | 2 - arch/mips/include/asm/thread_info.h | 2 - arch/mn10300/include/asm/thread_info.h | 2 - arch/parisc/include/asm/thread_info.h | 2 - arch/powerpc/include/asm/thread_info.h | 2 - arch/s390/Kconfig | 1 + arch/s390/include/asm/thread_info.h | 2 - arch/s390/kernel/suspend.c | 118 ++++++++ arch/s390/kernel/swsusp_asm64.S | 3 + arch/sh/include/asm/thread_info.h | 2 - arch/sparc/include/asm/thread_info_32.h | 2 - arch/sparc/include/asm/thread_info_64.h | 2 - arch/um/include/asm/thread_info.h | 2 - arch/unicore32/include/asm/thread_info.h | 2 - arch/x86/include/asm/thread_info.h | 2 - arch/xtensa/include/asm/thread_info.h | 2 - drivers/acpi/processor_idle.c | 2 +- drivers/base/power/Makefile | 4 +- drivers/base/power/clock_ops.c | 122 ++++----- drivers/base/power/common.c | 86 ++++++ drivers/base/power/domain.c | 346 +++++++++++++---------- drivers/base/power/main.c | 34 ++- drivers/base/power/qos.c | 399 ++++++++++++++++++++++++++ drivers/base/power/runtime.c | 15 +- drivers/bluetooth/btmrvl_main.c | 2 - drivers/bluetooth/btusb.c | 2 +- drivers/cpuidle/cpuidle.c | 2 +- drivers/cpuidle/governors/ladder.c | 2 +- drivers/cpuidle/governors/menu.c | 2 +- drivers/hid/hid-picolcd.c | 2 +- drivers/hid/usbhid/hid-core.c | 7 +- drivers/media/video/via-camera.c | 4 +- drivers/mfd/twl6030-irq.c | 2 - drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- drivers/net/irda/stir4200.c | 2 +- drivers/net/usb/usbnet.c | 2 +- drivers/net/wimax/i2400m/usb.c | 4 +- drivers/net/wireless/ipw2x00/ipw2100.c | 4 +- drivers/platform/x86/thinkpad_acpi.c | 15 +- drivers/staging/rts_pstor/rtsx.c | 2 - drivers/usb/class/cdc-acm.c | 2 +- drivers/usb/class/cdc-wdm.c | 6 +- drivers/usb/core/driver.c | 9 +- drivers/usb/core/hcd.c | 4 +- drivers/usb/core/hub.c | 10 +- drivers/usb/serial/sierra.c | 2 +- drivers/usb/serial/usb_wwan.c | 2 +- fs/btrfs/async-thread.c | 2 +- fs/btrfs/disk-io.c | 8 +- fs/ext4/super.c | 3 +- fs/fs-writeback.c | 4 +- fs/gfs2/log.c | 4 +- fs/gfs2/quota.c | 4 +- fs/jbd/journal.c | 2 +- fs/jbd2/journal.c | 2 +- fs/jfs/jfs_logmgr.c | 2 +- fs/jfs/jfs_txnmgr.c | 4 +- fs/nilfs2/segment.c | 2 +- fs/xfs/xfs_buf.c | 2 +- include/linux/device.h | 5 + include/linux/freezer.h | 78 ++--- include/linux/kthread.h | 1 + include/linux/netdevice.h | 4 +- include/linux/pm.h | 32 ++- include/linux/pm_clock.h | 71 +++++ include/linux/pm_domain.h | 18 +- include/linux/pm_qos.h | 147 ++++++++++ include/linux/pm_qos_params.h | 38 --- include/linux/pm_runtime.h | 42 --- include/linux/sched.h | 3 +- include/linux/suspend.h | 86 ++++++ include/sound/pcm.h | 4 +- kernel/Makefile | 2 +- kernel/cgroup_freezer.c | 51 ++-- kernel/exit.c | 8 +- kernel/fork.c | 1 - kernel/freezer.c | 179 +++++++----- kernel/kthread.c | 25 ++ kernel/power/Kconfig | 3 + kernel/power/Makefile | 2 +- kernel/power/hibernate.c | 15 +- kernel/power/main.c | 102 +++++++ kernel/power/process.c | 65 ++--- kernel/{pm_qos_params.c => power/qos.c} | 273 +++++++++--------- kernel/power/snapshot.c | 18 ++ kernel/power/suspend.c | 17 +- kernel/power/user.c | 4 +- mm/backing-dev.c | 8 +- net/mac80211/main.c | 2 +- net/mac80211/mlme.c | 2 +- net/mac80211/scan.c | 2 +- sound/core/pcm_native.c | 2 +- sound/usb/card.c | 2 +- 115 files changed, 1875 insertions(+), 859 deletions(-) create mode 100644 drivers/base/power/common.c create mode 100644 drivers/base/power/qos.c create mode 100644 include/linux/pm_clock.h create mode 100644 include/linux/pm_qos.h delete mode 100644 include/linux/pm_qos_params.h rename kernel/{pm_qos_params.c => power/qos.c} (71%) Merging apm/for-next $ git merge apm/for-next Auto-merging drivers/char/apm-emulation.c Merge made by recursive. drivers/char/apm-emulation.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging fs/cachefiles/namei.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/notify/fanotify/fanotify_user.c Auto-merging fs/notify/group.c Auto-merging fs/notify/mark.c Auto-merging include/linux/fsnotify_backend.h Merge made by recursive. fs/cachefiles/namei.c | 1 - fs/cachefiles/xattr.c | 1 - fs/nfsd/vfs.c | 3 - fs/notify/dnotify/dnotify.c | 15 +++--- fs/notify/fanotify/fanotify.c | 24 +++++---- fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- fs/notify/group.c | 1 + fs/notify/mark.c | 36 +++++-------- include/linux/fanotify.h | 5 ++- include/linux/fsnotify_backend.h | 14 ++++- 10 files changed, 121 insertions(+), 80 deletions(-) Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Auto-merging drivers/edac/i7core_edac.c Merge made by recursive. drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) Merging i7300_edac/linux_next $ git merge i7300_edac/linux_next Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution. Auto-merging arch/x86/kernel/cpu/mcheck/mce.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c Removing drivers/edac/edac_mce.c Auto-merging drivers/edac/i7core_edac.c Auto-merging include/linux/edac.h Removing include/linux/edac_mce.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5ae6c86] Merge remote-tracking branch 'i7300_edac/linux_next' $ git diff -M --stat --summary HEAD^.. arch/x86/kernel/cpu/mcheck/mce.c | 18 +-- drivers/edac/Kconfig | 8 +- drivers/edac/Makefile | 1 - drivers/edac/edac_core.h | 350 +---------------------------------- drivers/edac/edac_mce.c | 61 ------ drivers/edac/i7core_edac.c | 385 ++++++++++++++++++++++++++++++++++---- include/linux/edac.h | 350 ++++++++++++++++++++++++++++++++++ include/linux/edac_mce.h | 31 --- 8 files changed, 709 insertions(+), 495 deletions(-) delete mode 100644 drivers/edac/edac_mce.c delete mode 100644 include/linux/edac_mce.h Merging devicetree/devicetree/next $ git merge devicetree/devicetree/next Resolved 'drivers/of/base.c' using previous resolution. Auto-merging drivers/of/base.c CONFLICT (content): Merge conflict in drivers/of/base.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ceb6334] Merge remote-tracking branch 'devicetree/devicetree/next' $ git diff -M --stat --summary HEAD^.. Merging spi/spi/next $ git merge spi/spi/next Already up-to-date. Merging gpio/gpio/next $ git merge gpio/gpio/next Already up-to-date. Merging tip/auto-latest $ git merge tip/auto-latest Resolved 'arch/x86/mm/fault.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/mm/fault.c CONFLICT (content): Merge conflict in arch/x86/mm/fault.c Auto-merging arch/x86/xen/mmu.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d17742f] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 18 ++++ Documentation/x86/entry_64.txt | 3 - arch/x86/Kconfig | 9 ++ arch/x86/include/asm/archrandom.h | 75 +++++++++++++++++ arch/x86/include/asm/cmpxchg_32.h | 21 +++++ arch/x86/include/asm/cmpxchg_64.h | 26 ++++++ arch/x86/include/asm/elf.h | 31 +++++++ arch/x86/include/asm/pgtable_types.h | 1 - arch/x86/include/asm/spinlock.h | 140 +++++++++++--------------------- arch/x86/include/asm/spinlock_types.h | 22 +++++- arch/x86/include/asm/x86_init.h | 12 --- arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/amd.c | 47 +++++++---- arch/x86/kernel/cpu/common.c | 5 + arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/rdrand.c | 73 ++++++++++++++++ arch/x86/kernel/sys_x86_64.c | 77 +++++++++++++++++- arch/x86/kernel/x86_init.c | 4 - arch/x86/mm/fault.c | 2 +- arch/x86/mm/init.c | 147 ++++++++++++++++++++++++--------- arch/x86/mm/mmap.c | 20 +---- arch/x86/vdso/vma.c | 9 ++ arch/x86/xen/mmu.c | 15 ---- drivers/char/random.c | 23 +++++- include/linux/random.h | 13 +++ 25 files changed, 588 insertions(+), 207 deletions(-) create mode 100644 arch/x86/include/asm/archrandom.h create mode 100644 arch/x86/kernel/cpu/rdrand.c $ git revert -m 1 6f8fa39c81f1 [master efd12f4] Revert "Merge branch 'x86/spinlocks' into auto-latest" 4 files changed, 109 insertions(+), 128 deletions(-) rewrite arch/x86/include/asm/spinlock_types.h (60%) $ git reset HEAD^ Unstaged changes after reset: M arch/x86/include/asm/cmpxchg_32.h M arch/x86/include/asm/cmpxchg_64.h M arch/x86/include/asm/spinlock.h M arch/x86/include/asm/spinlock_types.h $ git add . $ git commit -v -a --amend [master d33cbc5] Merge remote-tracking branch 'tip/auto-latest' Merging rcu/rcu/next $ git merge rcu/rcu/next Auto-merging Documentation/RCU/NMI-RCU.txt Auto-merging include/linux/rcupdate.h Auto-merging include/linux/sched.h Auto-merging init/Kconfig Auto-merging kernel/lockdep.c Auto-merging kernel/pid.c Auto-merging kernel/rcupdate.c Auto-merging kernel/rcutorture.c Auto-merging kernel/rcutree_trace.c Auto-merging kernel/rtmutex.c Auto-merging kernel/sched.c Merge made by recursive. Documentation/RCU/NMI-RCU.txt | 2 +- Documentation/RCU/lockdep-splat.txt | 110 +++++++++ Documentation/RCU/lockdep.txt | 34 ++- Documentation/RCU/torture.txt | 137 ++++++++--- Documentation/RCU/trace.txt | 38 ++-- include/linux/lockdep.h | 2 +- include/linux/rcupdate.h | 303 +++++++++++------------- include/linux/rcutiny.h | 20 ++- include/linux/rcutree.h | 2 + include/linux/sched.h | 4 - include/linux/types.h | 10 + include/trace/events/rcu.h | 459 +++++++++++++++++++++++++++++++++++ init/Kconfig | 6 +- kernel/lockdep.c | 84 ++++--- kernel/pid.c | 4 +- kernel/rcu.h | 85 +++++++ kernel/rcupdate.c | 26 ++- kernel/rcutiny.c | 117 ++------- kernel/rcutiny_plugin.h | 135 +++++++---- kernel/rcutorture.c | 77 +++---- kernel/rcutree.c | 297 +++++++++++++++-------- kernel/rcutree.h | 17 +- kernel/rcutree_plugin.h | 159 +++++++----- kernel/rcutree_trace.c | 13 +- kernel/rtmutex.c | 8 + kernel/sched.c | 13 +- kernel/time/tick-sched.c | 6 - 27 files changed, 1508 insertions(+), 660 deletions(-) create mode 100644 Documentation/RCU/lockdep-splat.txt create mode 100644 include/trace/events/rcu.h create mode 100644 kernel/rcu.h Merging kvm/linux-next $ git merge kvm/linux-next Already up-to-date. Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging ptrace/ptrace $ git merge ptrace/ptrace Auto-merging arch/mips/kernel/signal.c Auto-merging arch/openrisc/kernel/signal.c Auto-merging arch/sparc/kernel/signal32.c Auto-merging arch/sparc/kernel/signal_32.c Auto-merging arch/sparc/kernel/signal_64.c Auto-merging include/linux/sched.h Auto-merging kernel/fork.c Merge made by recursive. arch/alpha/kernel/signal.c | 31 ++++++------------ arch/arm/kernel/signal.c | 24 +++++--------- arch/avr32/kernel/signal.c | 26 +++++---------- arch/blackfin/kernel/signal.c | 17 ++-------- arch/cris/arch-v10/kernel/signal.c | 34 +++++++------------- arch/cris/arch-v32/kernel/signal.c | 37 ++++++--------------- arch/frv/kernel/signal.c | 32 ++++++------------- arch/h8300/kernel/signal.c | 33 +++++-------------- arch/ia64/kernel/signal.c | 15 +-------- arch/m32r/kernel/signal.c | 12 +------ arch/m68k/kernel/signal_mm.c | 22 +++++-------- arch/m68k/kernel/signal_no.c | 28 +++++----------- arch/microblaze/kernel/signal.c | 42 ++++++++++--------------- arch/mips/kernel/signal.c | 27 +++------------- arch/mips/kernel/signal32.c | 20 ++--------- arch/mips/kernel/signal_n32.c | 10 +----- arch/mn10300/kernel/signal.c | 32 ++++++------------- arch/openrisc/kernel/signal.c | 45 +++++++++++--------------- arch/parisc/kernel/signal.c | 12 +------ arch/powerpc/kernel/signal.c | 13 +------ arch/powerpc/kernel/signal_32.c | 11 +++--- arch/s390/kernel/compat_signal.c | 6 +--- arch/s390/kernel/signal.c | 6 +--- arch/score/kernel/signal.c | 13 ++------ arch/sh/kernel/signal_32.c | 35 ++++++--------------- arch/sh/kernel/signal_64.c | 40 ++++++----------------- arch/sparc/include/asm/signal.h | 3 +- arch/sparc/kernel/signal32.c | 17 ++-------- arch/sparc/kernel/signal_32.c | 28 +++++----------- arch/sparc/kernel/signal_64.c | 29 ++++++----------- arch/tile/kernel/compat_signal.c | 5 +-- arch/tile/kernel/signal.c | 13 +------ arch/um/kernel/signal.c | 28 +++++----------- arch/um/sys-i386/signal.c | 12 +------ arch/um/sys-x86_64/signal.c | 6 +--- arch/unicore32/kernel/signal.c | 13 +------ arch/x86/kernel/signal.c | 6 +--- arch/xtensa/kernel/signal.c | 35 ++++++-------------- fs/autofs4/waitq.c | 13 ++----- fs/coda/upcall.c | 19 +++++------ fs/dlm/user.c | 1 - fs/exec.c | 18 +--------- fs/ncpfs/sock.c | 15 +++------ include/linux/sched.h | 3 +- include/linux/signal.h | 1 + kernel/fork.c | 61 +++++++++++++++++++++++------------- kernel/signal.c | 22 +++++++++++++ 47 files changed, 321 insertions(+), 650 deletions(-) Merging xen/upstream/xen $ git merge xen/upstream/xen Merge made by recursive. arch/x86/include/asm/atomic.h | 8 +- arch/x86/include/asm/atomic64_64.h | 6 +- arch/x86/include/asm/cmpxchg.h | 198 +++++++++++++++++++++++++++++++++ arch/x86/include/asm/cmpxchg_32.h | 114 ------------------- arch/x86/include/asm/cmpxchg_64.h | 131 ---------------------- arch/x86/include/asm/rwsem.h | 8 +- arch/x86/include/asm/spinlock.h | 110 +++++-------------- arch/x86/include/asm/spinlock_types.h | 22 ++++- arch/x86/include/asm/uv/uv_bau.h | 6 +- arch/x86/xen/time.c | 5 +- 10 files changed, 253 insertions(+), 355 deletions(-) Merging xen-two/linux-next $ git merge xen-two/linux-next Auto-merging arch/x86/xen/mmu.c Merge made by recursive. .../ABI/testing/sysfs-bus-pci-devices-cciss | 7 ++ Documentation/blockdev/cciss.txt | 10 +++ arch/x86/xen/Kconfig | 8 -- arch/x86/xen/mmu.c | 38 ----------- drivers/block/cciss.c | 69 ++++++++++++++++--- drivers/block/cciss.h | 1 + drivers/block/xen-blkback/blkback.c | 8 +- drivers/block/xen-blkback/common.h | 2 +- drivers/block/xen-blkback/xenbus.c | 14 +++- drivers/block/xen-blkfront.c | 9 ++- drivers/pci/xen-pcifront.c | 4 +- drivers/xen/balloon.c | 15 ++-- drivers/xen/events.c | 9 +-- drivers/xen/gntdev.c | 3 +- drivers/xen/grant-table.c | 2 +- drivers/xen/pci.c | 4 +- drivers/xen/swiotlb-xen.c | 42 ++++++++---- drivers/xen/xen-balloon.c | 17 ++--- drivers/xen/xen-pciback/conf_space_header.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 7 +- drivers/xen/xenbus/xenbus_probe.h | 3 +- 21 files changed, 156 insertions(+), 118 deletions(-) Merging xen-pvhvm/linux-next $ git merge xen-pvhvm/linux-next Already up-to-date. Merging edac-amd/for-next $ git merge edac-amd/for-next Merge made by recursive. drivers/edac/amd64_edac.c | 6 ++---- drivers/edac/mce_amd.c | 44 +++++++++++++------------------------------- drivers/edac/mce_amd.h | 6 +++--- 3 files changed, 18 insertions(+), 38 deletions(-) Merging percpu/for-next $ git merge percpu/for-next Merge made by recursive. mm/percpu-vm.c | 5 ++--- mm/percpu.c | 17 +++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. 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 Already up-to-date. Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Auto-merging fs/proc/proc_sysctl.c Merge made by recursive. fs/proc/proc_sysctl.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) Merging namespace/master $ git merge namespace/master Auto-merging fs/proc/inode.c Merge made by recursive. fs/proc/inode.c | 6 +- fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 142 insertions(+), 24 deletions(-) Merging regmap/for-next $ git merge regmap/for-next Auto-merging drivers/base/regmap/regmap-spi.c Auto-merging drivers/mfd/Kconfig Auto-merging drivers/mfd/wm8994-core.c Auto-merging include/linux/mfd/wm8994/core.h Merge made by recursive. drivers/base/regmap/Makefile | 1 + drivers/base/regmap/internal.h | 66 ++++++ drivers/base/regmap/regmap-debugfs.c | 209 +++++++++++++++++ drivers/base/regmap/regmap-i2c.c | 1 - drivers/base/regmap/regmap-spi.c | 1 - drivers/base/regmap/regmap.c | 139 +++++++++--- drivers/mfd/Kconfig | 3 + drivers/mfd/wm831x-core.c | 424 +++++++++++++++++++++++++++++----- drivers/mfd/wm831x-i2c.c | 68 +----- drivers/mfd/wm831x-spi.c | 196 +++------------- drivers/mfd/wm8400-core.c | 106 +++------ drivers/mfd/wm8994-core.c | 178 +++------------ include/linux/mfd/wm831x/core.h | 9 +- include/linux/mfd/wm8400-private.h | 7 +- include/linux/mfd/wm8994/core.h | 9 +- include/linux/regmap.h | 47 ++++- include/trace/events/regmap.h | 112 +++++++++ 17 files changed, 1025 insertions(+), 551 deletions(-) create mode 100644 drivers/base/regmap/internal.h create mode 100644 drivers/base/regmap/regmap-debugfs.c create mode 100644 include/trace/events/regmap.h Merging driver-core/driver-core-next $ git merge driver-core/driver-core-next Recorded preimage for 'arch/arm/plat-mxc/devices.c' Auto-merging MAINTAINERS Auto-merging arch/arm/plat-mxc/devices.c CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h Auto-merging drivers/base/platform.c Auto-merging include/linux/device.h Auto-merging include/linux/netdevice.h Auto-merging net/core/dev.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/plat-mxc/devices.c'. [master 128721c] Merge remote-tracking branch 'driver-core/driver-core-next' $ git diff -M --stat --summary HEAD^.. Documentation/driver-model/binding.txt | 4 - Documentation/driver-model/device.txt | 65 +++++----- Documentation/filesystems/sysfs.txt | 10 ++- MAINTAINERS | 6 + arch/arm/plat-mxc/devices.c | 53 ------- arch/arm/plat-mxc/include/mach/devices-common.h | 16 ++- drivers/base/core.c | 5 +- drivers/base/platform.c | 54 +++++--- drivers/misc/pch_phub.c | 10 +- drivers/uio/uio.c | 7 +- drivers/uio/uio_pci_generic.c | 5 - drivers/uio/uio_pdrv_genirq.c | 2 +- fs/debugfs/inode.c | 2 +- fs/sysfs/dir.c | 167 +++++++++++++++-------- fs/sysfs/inode.c | 14 +-- fs/sysfs/sysfs.h | 17 ++- include/linux/device.h | 5 + include/linux/dynamic_debug.h | 34 ++++-- include/linux/netdevice.h | 10 +- include/linux/platform_device.h | 48 ++++++- lib/dynamic_debug.c | 158 +++++++++++++++------ lib/kobject_uevent.c | 2 +- net/core/dev.c | 3 +- 23 files changed, 432 insertions(+), 265 deletions(-) Merging tty/tty-next $ git merge tty/tty-next Auto-merging arch/arm/Kconfig Removing arch/arm/plat-samsung/irq-uart.c Auto-merging arch/x86/platform/mrst/mrst.c Auto-merging drivers/tty/serial/8250.c Auto-merging drivers/tty/serial/atmel_serial.c Auto-merging drivers/tty/serial/bfin_uart.c Auto-merging drivers/tty/serial/mrst_max3110.c Auto-merging drivers/tty/serial/samsung.c Auto-merging drivers/tty/serial/serial_core.c Auto-merging include/linux/tty.h Merge made by recursive. .../bindings/tty/serial/snps-dw-apb-uart.txt | 25 + Documentation/serial/serial-rs485.txt | 3 + arch/arm/Kconfig | 1 - arch/arm/mach-s3c64xx/dev-uart.c | 60 +-- arch/arm/mach-s3c64xx/include/mach/irqs.h | 30 - arch/arm/mach-s3c64xx/irq.c | 25 - arch/arm/plat-s5p/Kconfig | 1 - arch/arm/plat-s5p/dev-uart.c | 84 +-- arch/arm/plat-s5p/include/plat/irqs.h | 35 - arch/arm/plat-s5p/irq.c | 34 - arch/arm/plat-samsung/Kconfig | 5 - arch/arm/plat-samsung/Makefile | 1 - arch/arm/plat-samsung/include/plat/regs-serial.h | 5 + arch/arm/plat-samsung/irq-uart.c | 96 --- arch/mips/pmc-sierra/msp71xx/msp_serial.c | 73 ++- arch/powerpc/include/asm/udbg.h | 1 + arch/powerpc/kernel/udbg.c | 2 + arch/x86/platform/mrst/mrst.c | 3 + drivers/isdn/i4l/isdn_tty.c | 2 +- drivers/tty/Kconfig | 34 + drivers/tty/Makefile | 1 + drivers/tty/amiserial.c | 10 +- drivers/tty/cyclades.c | 12 +- drivers/tty/ehv_bytechan.c | 884 ++++++++++++++++++++ drivers/tty/hvc/hvc_console.c | 2 +- drivers/tty/hvc/hvcs.c | 2 +- drivers/tty/mxser.c | 13 +- drivers/tty/n_gsm.c | 9 +- drivers/tty/serial/8250.c | 108 +-- drivers/tty/serial/8250_dw.c | 194 +++++ drivers/tty/serial/Kconfig | 13 +- drivers/tty/serial/Makefile | 3 +- drivers/tty/serial/atmel_serial.c | 9 +- drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} | 61 +- drivers/tty/serial/imx.c | 10 +- drivers/tty/serial/jsm/jsm.h | 10 - drivers/tty/serial/jsm/jsm_driver.c | 19 - drivers/tty/serial/jsm/jsm_neo.c | 29 +- drivers/tty/serial/jsm/jsm_tty.c | 94 +-- drivers/tty/serial/mfd.c | 47 + drivers/tty/serial/mrst_max3110.c | 115 ++-- drivers/tty/serial/mrst_max3110.h | 1 + drivers/tty/serial/msm_serial.c | 2 - drivers/tty/serial/samsung.c | 107 +++- drivers/tty/serial/samsung.h | 1 + drivers/tty/serial/serial_core.c | 64 +-- drivers/tty/synclink.c | 1 - drivers/tty/tty_ldisc.c | 1 - drivers/tty/tty_mutex.c | 12 - drivers/tty/tty_port.c | 2 +- drivers/tty/vt/selection.c | 4 +- drivers/tty/vt/vt.c | 2 +- include/linux/serial.h | 1 + include/linux/serial_8250.h | 2 + include/linux/serial_core.h | 6 +- include/linux/tty.h | 20 +- net/irda/ircomm/ircomm_tty.c | 2 +- 57 files changed, 1619 insertions(+), 774 deletions(-) create mode 100644 Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt delete mode 100644 arch/arm/plat-samsung/irq-uart.c create mode 100644 drivers/tty/ehv_bytechan.c create mode 100644 drivers/tty/serial/8250_dw.c rename drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (97%) Merging usb/usb-next $ git merge usb/usb-next Resolved 'drivers/usb/host/xhci-ring.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/mach-mmp/pxa168.c Auto-merging drivers/usb/class/cdc-acm.c Auto-merging drivers/usb/class/cdc-wdm.c Auto-merging drivers/usb/core/hub.c Auto-merging drivers/usb/host/ehci-hub.c Auto-merging drivers/usb/host/ehci-s5p.c Auto-merging drivers/usb/host/xhci-ring.c CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c Auto-merging drivers/usb/host/xhci.c Auto-merging drivers/usb/musb/musb_gadget.c Auto-merging drivers/usb/serial/ftdi_sio.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2342b33] Merge remote-tracking branch 'usb/usb-next' $ git diff -M --stat --summary HEAD^.. Documentation/usb/dwc3.txt | 53 + MAINTAINERS | 8 + arch/arm/mach-mmp/include/mach/pxa168.h | 7 + arch/arm/mach-mmp/pxa168.c | 46 + drivers/usb/Kconfig | 3 + drivers/usb/Makefile | 2 + drivers/usb/class/cdc-acm.c | 6 +- drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/class/usbtmc.c | 5 +- drivers/usb/core/config.c | 8 +- drivers/usb/core/devices.c | 4 +- drivers/usb/core/endpoint.c | 2 +- drivers/usb/core/hub.c | 7 +- drivers/usb/core/urb.c | 2 +- drivers/usb/dwc3/Kconfig | 25 + drivers/usb/dwc3/Makefile | 36 + drivers/usb/dwc3/core.c | 467 +++++++ drivers/usb/dwc3/core.h | 709 +++++++++++ drivers/usb/dwc3/debug.h | 51 + drivers/usb/dwc3/debugfs.c | 534 ++++++++ drivers/usb/dwc3/dwc3-omap.c | 410 ++++++ drivers/usb/dwc3/dwc3-pci.c | 220 ++++ drivers/usb/dwc3/ep0.c | 782 ++++++++++++ drivers/usb/dwc3/gadget.c | 2062 +++++++++++++++++++++++++++++++ drivers/usb/dwc3/gadget.h | 297 +++++ drivers/usb/dwc3/io.h | 55 + drivers/usb/gadget/Kconfig | 21 +- drivers/usb/gadget/amd5536udc.c | 2 +- drivers/usb/gadget/at91_udc.c | 2 +- drivers/usb/gadget/atmel_usba_udc.c | 4 +- drivers/usb/gadget/ci13xxx_udc.c | 2 +- drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/dummy_hcd.c | 4 +- drivers/usb/gadget/epautoconf.c | 2 +- drivers/usb/gadget/f_mass_storage.c | 3 +- drivers/usb/gadget/file_storage.c | 2 +- drivers/usb/gadget/fsl_qe_udc.c | 2 +- drivers/usb/gadget/fsl_udc_core.c | 2 +- drivers/usb/gadget/fusb300_udc.c | 2 +- drivers/usb/gadget/gadget_chips.h | 3 + drivers/usb/gadget/imx_udc.c | 2 +- drivers/usb/gadget/langwell_udc.c | 2 +- drivers/usb/gadget/m66592-udc.c | 4 +- drivers/usb/gadget/mv_udc_core.c | 2 +- drivers/usb/gadget/net2272.c | 2 +- drivers/usb/gadget/net2280.c | 4 +- drivers/usb/gadget/omap_udc.c | 7 +- drivers/usb/gadget/pch_udc.c | 6 +- drivers/usb/gadget/pxa25x_udc.c | 14 +- drivers/usb/gadget/pxa27x_udc.c | 2 +- drivers/usb/gadget/r8a66597-udc.c | 4 +- drivers/usb/gadget/s3c-hsotg.c | 2 +- drivers/usb/gadget/s3c-hsudc.c | 55 +- drivers/usb/gadget/s3c2410_udc.c | 2 +- drivers/usb/host/Kconfig | 13 +- drivers/usb/host/ehci-au1xxx.c | 2 +- drivers/usb/host/ehci-dbg.c | 17 +- drivers/usb/host/ehci-fsl.c | 4 +- drivers/usb/host/ehci-hcd.c | 30 +- drivers/usb/host/ehci-hub.c | 10 +- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ehci-pxa168.c | 363 ++++++ drivers/usb/host/ehci-q.c | 22 +- drivers/usb/host/ehci-s5p.c | 2 +- drivers/usb/host/ehci-sched.c | 11 +- drivers/usb/host/ehci-xls.c | 161 +++ drivers/usb/host/ehci.h | 7 + drivers/usb/host/fhci-hcd.c | 5 +- drivers/usb/host/isp1362-hcd.c | 6 +- drivers/usb/host/isp1760-hcd.c | 401 ++++--- drivers/usb/host/isp1760-hcd.h | 3 +- drivers/usb/host/ohci-hcd.c | 5 + drivers/usb/host/ohci-omap3.c | 2 +- drivers/usb/host/ohci-q.c | 4 +- drivers/usb/host/ohci-xls.c | 151 +++ drivers/usb/host/r8a66597-hcd.c | 2 +- drivers/usb/host/uhci-q.c | 6 +- drivers/usb/host/xhci-mem.c | 10 +- drivers/usb/host/xhci-ring.c | 8 +- drivers/usb/host/xhci.c | 2 +- drivers/usb/misc/adutux.c | 14 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/idmouse.c | 2 +- drivers/usb/misc/iowarrior.c | 2 +- drivers/usb/misc/ldusb.c | 4 +- drivers/usb/misc/legousbtower.c | 4 +- drivers/usb/misc/usblcd.c | 129 ++- drivers/usb/misc/usbled.c | 25 +- drivers/usb/misc/usbtest.c | 10 +- drivers/usb/musb/musb_gadget.c | 2 +- drivers/usb/musb/musb_host.c | 2 +- drivers/usb/otg/twl6030-usb.c | 16 - drivers/usb/renesas_usbhs/pipe.c | 2 +- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/ftdi_sio.c | 2 +- drivers/usb/serial/io_edgeport.c | 4 +- drivers/usb/serial/ipw.c | 33 +- drivers/usb/serial/opticon.c | 2 +- drivers/usb/serial/pl2303.c | 3 - drivers/usb/serial/symbolserial.c | 2 +- drivers/usb/serial/usb-serial.c | 8 +- drivers/usb/storage/realtek_cr.c | 35 +- drivers/usb/storage/usb.c | 16 +- drivers/usb/usb-skeleton.c | 2 +- drivers/usb/wusbcore/wa-hc.c | 2 +- include/linux/usb.h | 2 +- include/linux/usb/ch9.h | 17 + 107 files changed, 7127 insertions(+), 429 deletions(-) create mode 100644 Documentation/usb/dwc3.txt create mode 100644 drivers/usb/dwc3/Kconfig create mode 100644 drivers/usb/dwc3/Makefile create mode 100644 drivers/usb/dwc3/core.c create mode 100644 drivers/usb/dwc3/core.h create mode 100644 drivers/usb/dwc3/debug.h create mode 100644 drivers/usb/dwc3/debugfs.c create mode 100644 drivers/usb/dwc3/dwc3-omap.c create mode 100644 drivers/usb/dwc3/dwc3-pci.c create mode 100644 drivers/usb/dwc3/ep0.c create mode 100644 drivers/usb/dwc3/gadget.c create mode 100644 drivers/usb/dwc3/gadget.h create mode 100644 drivers/usb/dwc3/io.h create mode 100644 drivers/usb/host/ehci-pxa168.c create mode 100644 drivers/usb/host/ehci-xls.c create mode 100644 drivers/usb/host/ohci-xls.c Merging staging/staging-next $ git merge staging/staging-next Recorded preimage for 'drivers/staging/brcm80211/brcmsmac/types.h' Resolved 'drivers/staging/xgifb/XGI_main_26.c' using previous resolution. Removing drivers/char/scc.h Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/Makefile Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c Removing drivers/staging/brcm80211/brcmsmac/bmac.c Removing drivers/staging/brcm80211/brcmsmac/bmac.h Auto-merging drivers/staging/brcm80211/brcmsmac/otp.c Auto-merging drivers/staging/brcm80211/brcmsmac/types.h CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/types.h Auto-merging drivers/staging/et131x/et131x_netdev.c Auto-merging drivers/staging/hv/netvsc_drv.c Removing drivers/staging/iio/accel/accel.h Removing drivers/staging/iio/accel/inclinometer.h Removing drivers/staging/iio/adc/adc.h Removing drivers/staging/iio/gyro/gyro.h Removing drivers/staging/iio/magnetometer/magnet.h Removing drivers/staging/rtl8192e/ieee80211/dot11d.c Removing drivers/staging/rtl8192e/ieee80211/dot11d.h Removing drivers/staging/rtl8192e/ieee80211/ieee80211.h Removing drivers/staging/rtl8192e/ieee80211/ieee80211_module.c Removing drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c Removing drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c Removing drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c Removing drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c Removing drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c Removing drivers/staging/rtl8192e/r8180_93cx6.c Removing drivers/staging/rtl8192e/r8180_93cx6.h Removing drivers/staging/rtl8192e/r8190_rtl8256.c Removing drivers/staging/rtl8192e/r8190_rtl8256.h Removing drivers/staging/rtl8192e/r8192E.h CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree. Removing drivers/staging/rtl8192e/r8192E_dm.c Removing drivers/staging/rtl8192e/r8192E_dm.h Removing drivers/staging/rtl8192e/r8192E_wx.c Removing drivers/staging/rtl8192e/r8192E_wx.h Removing drivers/staging/rtl8192e/r8192_pm.c Removing drivers/staging/rtl8192e/r8192_pm.h Removing drivers/staging/rtl8192e/r819xE_cmdpkt.c Removing drivers/staging/rtl8192e/r819xE_cmdpkt.h Removing drivers/staging/rtl8192e/r819xE_firmware.c Removing drivers/staging/rtl8192e/r819xE_phy.c Removing drivers/staging/rtl8192e/r819xE_phy.h Auto-merging drivers/staging/rtl8192e/rtl_crypto.h Auto-merging drivers/staging/rtl8192e/rtllib_crypt.c Auto-merging drivers/staging/rtl8192e/rtllib_crypt.h Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c Auto-merging drivers/staging/rtl8192e/rtllib_crypt_wep.c Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c Auto-merging drivers/staging/vt6655/device_main.c Auto-merging drivers/staging/vt6656/main_usb.c Auto-merging drivers/staging/xgifb/XGI_main_26.c CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c Auto-merging drivers/staging/zcache/zcache-main.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/rtl8192e/r8192E_core.c drivers/staging/rtl8192e/r8192E_core.c: needs merge drivers/staging/xgifb/XGI_main_26.c: needs merge rm 'drivers/staging/rtl8192e/r8192E_core.c' $ git commit -v -a Recorded resolution for 'drivers/staging/brcm80211/brcmsmac/types.h'. [master 8cb54f7] Merge remote-tracking branch 'staging/staging-next' $ git diff -M --stat --summary HEAD^.. arch/x86/include/asm/hyperv.h | 1 + drivers/char/scc.h | 613 - drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/altera-stapl/altera.c | 3 +- drivers/staging/bcm/Bcmchar.c | 3170 ++-- drivers/staging/bcm/Macros.h | 337 +- drivers/staging/bcm/headers.h | 2 + drivers/staging/bcm/nvm.c | 13 +- drivers/staging/brcm80211/Kconfig | 7 +- drivers/staging/brcm80211/Makefile | 1 - drivers/staging/brcm80211/TODO | 4 - drivers/staging/brcm80211/brcmfmac/Makefile | 5 - drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 549 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 994 +- drivers/staging/brcm80211/brcmfmac/dhd.h | 228 +- drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 7 +- drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 66 +- drivers/staging/brcm80211/brcmfmac/dhd_common.c | 338 +- drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 46 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 448 +- drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 5 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 2440 +-- drivers/staging/brcm80211/brcmfmac/sdio_host.h | 278 +- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 301 +- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 14 +- drivers/staging/brcm80211/brcmsmac/Makefile | 8 - drivers/staging/brcm80211/brcmsmac/aiutils.c | 774 +- drivers/staging/brcm80211/brcmsmac/aiutils.h | 75 +- drivers/staging/brcm80211/brcmsmac/alloc.c | 9 +- drivers/staging/brcm80211/brcmsmac/ampdu.c | 230 +- drivers/staging/brcm80211/brcmsmac/antsel.c | 25 +- drivers/staging/brcm80211/brcmsmac/bmac.c | 3593 --- drivers/staging/brcm80211/brcmsmac/bmac.h | 174 - drivers/staging/brcm80211/brcmsmac/channel.c | 400 +- drivers/staging/brcm80211/brcmsmac/channel.h | 25 +- drivers/staging/brcm80211/brcmsmac/d11.h | 645 +- drivers/staging/brcm80211/brcmsmac/dma.c | 1078 +- drivers/staging/brcm80211/brcmsmac/dma.h | 186 +- drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 184 +- drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 20 +- drivers/staging/brcm80211/brcmsmac/main.c | 4876 ++++- drivers/staging/brcm80211/brcmsmac/main.h | 852 +- drivers/staging/brcm80211/brcmsmac/nicpci.c | 75 +- drivers/staging/brcm80211/brcmsmac/nicpci.h | 30 +- drivers/staging/brcm80211/brcmsmac/otp.c | 154 +- drivers/staging/brcm80211/brcmsmac/otp.h | 15 +- drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 1035 +- drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 85 +- drivers/staging/brcm80211/brcmsmac/phy/phy_int.h | 208 +- drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c | 5653 +++--- drivers/staging/brcm80211/brcmsmac/phy/phy_n.c |23096 ++++++++++---------- drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c | 172 +- .../staging/brcm80211/brcmsmac/phy/phytbl_lcn.c | 1168 +- drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c | 3 +- drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h | 24 +- drivers/staging/brcm80211/brcmsmac/phy_shim.c | 24 +- drivers/staging/brcm80211/brcmsmac/phy_shim.h | 69 +- drivers/staging/brcm80211/brcmsmac/pmu.c | 54 +- drivers/staging/brcm80211/brcmsmac/pub.h | 280 +- drivers/staging/brcm80211/brcmsmac/rate.c | 163 +- drivers/staging/brcm80211/brcmsmac/rate.h | 186 +- drivers/staging/brcm80211/brcmsmac/scb.h | 36 +- drivers/staging/brcm80211/brcmsmac/srom.c | 126 +- drivers/staging/brcm80211/brcmsmac/srom.h | 4 +- drivers/staging/brcm80211/brcmsmac/stf.c | 100 +- drivers/staging/brcm80211/brcmsmac/stf.h | 6 +- drivers/staging/brcm80211/brcmsmac/types.h | 283 +- drivers/staging/brcm80211/brcmutil/utils.c | 110 +- drivers/staging/brcm80211/brcmutil/wifi.c | 37 +- drivers/staging/brcm80211/include/brcmu_utils.h | 25 +- drivers/staging/brcm80211/include/brcmu_wifi.h | 145 +- drivers/staging/brcm80211/include/chipcommon.h | 13 +- drivers/staging/brcm80211/include/defs.h | 24 +- drivers/staging/brcm80211/include/soc.h | 9 +- drivers/staging/comedi/Kconfig | 18 +- drivers/staging/comedi/comedi_fops.c | 2 +- drivers/staging/comedi/drivers/Makefile | 1 + drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +- drivers/staging/comedi/drivers/ni_labpc.c | 20 +- drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- drivers/staging/comedi/drivers/usbduxsigma.c | 2880 +++ drivers/staging/cxd2099/Makefile | 6 +- drivers/staging/dt3155v4l/dt3155v4l.c | 1 + drivers/staging/easycap/easycap_ioctl.c | 30 +- drivers/staging/et131x/et1310_eeprom.c | 32 +- drivers/staging/et131x/et1310_mac.c | 379 +- drivers/staging/et131x/et1310_phy.c | 556 +- drivers/staging/et131x/et1310_pm.c | 48 +- drivers/staging/et131x/et1310_rx.c | 625 +- drivers/staging/et131x/et1310_rx.h | 62 +- drivers/staging/et131x/et1310_tx.c | 464 +- drivers/staging/et131x/et131x.h | 74 +- drivers/staging/et131x/et131x_adapter.h | 95 +- drivers/staging/et131x/et131x_initpci.c | 165 +- drivers/staging/et131x/et131x_isr.c | 57 +- drivers/staging/et131x/et131x_netdev.c | 137 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 10 + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 8 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 3 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 24 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +- drivers/staging/gma500/accel_2d.c | 14 +- drivers/staging/gma500/cdv_device.c | 1 - drivers/staging/gma500/framebuffer.c | 7 +- drivers/staging/gma500/gem.c | 5 +- drivers/staging/gma500/gtt.c | 30 +- drivers/staging/gma500/intel_opregion.c | 1 + drivers/staging/gma500/mdfld_intel_display.c | 12 +- drivers/staging/gma500/mrst_crtc.c | 16 +- drivers/staging/gma500/power.c | 8 +- drivers/staging/gma500/psb_device.c | 32 - drivers/staging/gma500/psb_drv.c | 47 +- drivers/staging/gma500/psb_drv.h | 4 + drivers/staging/gma500/psb_intel_display.c | 4 - drivers/staging/gma500/psb_intel_lvds.c | 61 +- drivers/staging/gma500/psb_irq.c | 71 +- drivers/staging/gma500/psb_lid.c | 2 - drivers/staging/go7007/Makefile | 8 +- drivers/staging/go7007/wis-tw2804.c | 6 +- drivers/staging/hv/blkvsc_drv.c | 48 +- drivers/staging/hv/channel.c | 100 +- drivers/staging/hv/channel_mgmt.c | 50 +- drivers/staging/hv/connection.c | 20 +- drivers/staging/hv/hv.c | 19 +- drivers/staging/hv/hv_mouse.c | 315 +- drivers/staging/hv/hv_util.c | 63 +- drivers/staging/hv/hyperv.h | 45 +- drivers/staging/hv/hyperv_net.h | 1 - drivers/staging/hv/hyperv_vmbus.h | 8 +- drivers/staging/hv/netvsc.c | 60 +- drivers/staging/hv/netvsc_drv.c | 60 +- drivers/staging/hv/ring_buffer.c | 6 +- drivers/staging/hv/rndis_filter.c | 49 +- drivers/staging/hv/storvsc.c | 42 +- drivers/staging/hv/storvsc_drv.c | 75 +- drivers/staging/hv/tools/hv_kvp_daemon.c | 19 +- drivers/staging/hv/vmbus_drv.c | 227 +- drivers/staging/iio/Documentation/sysfs-bus-iio | 23 +- .../iio/Documentation/sysfs-bus-iio-adc-ad7280a | 21 + .../sysfs-bus-iio-impedance-analyzer-ad5933 | 30 + drivers/staging/iio/Kconfig | 1 + drivers/staging/iio/Makefile | 1 + drivers/staging/iio/accel/accel.h | 87 - drivers/staging/iio/accel/adis16201_core.c | 5 +- drivers/staging/iio/accel/adis16201_ring.c | 19 +- drivers/staging/iio/accel/adis16201_trigger.c | 13 +- drivers/staging/iio/accel/adis16203_core.c | 4 +- drivers/staging/iio/accel/adis16203_ring.c | 12 +- drivers/staging/iio/accel/adis16203_trigger.c | 14 +- drivers/staging/iio/accel/adis16204_core.c | 48 +- drivers/staging/iio/accel/adis16204_ring.c | 12 +- drivers/staging/iio/accel/adis16204_trigger.c | 14 +- drivers/staging/iio/accel/adis16209_core.c | 4 +- drivers/staging/iio/accel/adis16209_ring.c | 12 +- drivers/staging/iio/accel/adis16209_trigger.c | 14 +- drivers/staging/iio/accel/adis16220_core.c | 343 +- drivers/staging/iio/accel/adis16240_core.c | 3 +- drivers/staging/iio/accel/adis16240_ring.c | 12 +- drivers/staging/iio/accel/adis16240_trigger.c | 14 +- drivers/staging/iio/accel/inclinometer.h | 25 - drivers/staging/iio/accel/kxsd9.c | 269 +- drivers/staging/iio/accel/lis3l02dq_core.c | 27 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 18 +- drivers/staging/iio/accel/sca3000_core.c | 20 +- drivers/staging/iio/accel/sca3000_ring.c | 71 - drivers/staging/iio/adc/Kconfig | 24 + drivers/staging/iio/adc/Makefile | 2 + drivers/staging/iio/adc/ad7150.c | 11 +- drivers/staging/iio/adc/ad7152.c | 1 + drivers/staging/iio/adc/ad7192.c | 1184 + drivers/staging/iio/adc/ad7192.h | 47 + drivers/staging/iio/adc/ad7280a.c | 992 + drivers/staging/iio/adc/ad7280a.h | 38 + drivers/staging/iio/adc/ad7291.c | 1 + drivers/staging/iio/adc/ad7298_core.c | 2 +- drivers/staging/iio/adc/ad7298_ring.c | 12 +- drivers/staging/iio/adc/ad7314.c | 1 + drivers/staging/iio/adc/ad7476_core.c | 2 +- drivers/staging/iio/adc/ad7476_ring.c | 12 +- drivers/staging/iio/adc/ad7606_core.c | 2 +- drivers/staging/iio/adc/ad7606_ring.c | 12 +- drivers/staging/iio/adc/ad7745.c | 1 + drivers/staging/iio/adc/ad7780.c | 2 +- drivers/staging/iio/adc/ad7793.c | 10 +- drivers/staging/iio/adc/ad7816.c | 3 +- drivers/staging/iio/adc/ad7887_core.c | 3 +- drivers/staging/iio/adc/ad7887_ring.c | 13 +- drivers/staging/iio/adc/ad799x_core.c | 14 +- drivers/staging/iio/adc/ad799x_ring.c | 13 +- drivers/staging/iio/adc/adc.h | 42 - drivers/staging/iio/adc/adt7310.c | 1 + drivers/staging/iio/adc/adt7410.c | 1 + drivers/staging/iio/adc/adt75.c | 3 +- drivers/staging/iio/adc/max1363_core.c | 20 +- drivers/staging/iio/adc/max1363_ring.c | 13 +- drivers/staging/iio/addac/adt7316-i2c.c | 1 + drivers/staging/iio/addac/adt7316.c | 3 +- drivers/staging/iio/dac/ad5446.c | 1 + drivers/staging/iio/dac/ad5504.c | 5 +- drivers/staging/iio/dac/ad5624r_spi.c | 1 + drivers/staging/iio/dac/ad5686.c | 1 + drivers/staging/iio/dac/ad5791.c | 2 +- drivers/staging/iio/dds/ad5930.c | 1 + drivers/staging/iio/dds/ad9832.c | 1 + drivers/staging/iio/dds/ad9834.c | 1 + drivers/staging/iio/dds/ad9850.c | 1 + drivers/staging/iio/dds/ad9852.c | 2 +- drivers/staging/iio/dds/ad9910.c | 2 +- drivers/staging/iio/dds/ad9951.c | 2 +- drivers/staging/iio/gyro/adis16060_core.c | 116 +- drivers/staging/iio/gyro/adis16080_core.c | 93 +- drivers/staging/iio/gyro/adis16130_core.c | 145 +- drivers/staging/iio/gyro/adis16260_core.c | 3 +- drivers/staging/iio/gyro/adis16260_ring.c | 12 +- drivers/staging/iio/gyro/adis16260_trigger.c | 14 +- drivers/staging/iio/gyro/adxrs450_core.c | 253 +- drivers/staging/iio/gyro/gyro.h | 85 - drivers/staging/iio/iio.h | 91 +- drivers/staging/iio/iio_core.h | 48 + drivers/staging/iio/iio_core_trigger.h | 46 + drivers/staging/iio/impedance-analyzer/Kconfig | 16 + drivers/staging/iio/impedance-analyzer/Makefile | 5 + drivers/staging/iio/impedance-analyzer/ad5933.c | 818 + drivers/staging/iio/impedance-analyzer/ad5933.h | 28 + drivers/staging/iio/imu/adis16400_core.c | 73 +- drivers/staging/iio/imu/adis16400_ring.c | 12 +- drivers/staging/iio/imu/adis16400_trigger.c | 14 +- drivers/staging/iio/industrialio-core.c | 211 +- drivers/staging/iio/industrialio-ring.c | 1 + drivers/staging/iio/industrialio-trigger.c | 82 +- drivers/staging/iio/light/isl29018.c | 46 + drivers/staging/iio/light/tsl2563.c | 4 +- drivers/staging/iio/light/tsl2583.c | 221 +- drivers/staging/iio/magnetometer/ak8975.c | 214 +- drivers/staging/iio/magnetometer/hmc5843.c | 96 +- drivers/staging/iio/magnetometer/magnet.h | 31 - drivers/staging/iio/meter/ade7753.c | 1 + drivers/staging/iio/meter/ade7754.c | 1 + drivers/staging/iio/meter/ade7758_core.c | 1 + drivers/staging/iio/meter/ade7758_ring.c | 19 +- drivers/staging/iio/meter/ade7758_trigger.c | 16 +- drivers/staging/iio/meter/ade7759.c | 1 + drivers/staging/iio/meter/ade7854-i2c.c | 1 + drivers/staging/iio/meter/ade7854-spi.c | 1 + drivers/staging/iio/meter/ade7854.c | 3 +- drivers/staging/iio/resolver/ad2s120x.c | 1 + drivers/staging/iio/resolver/ad2s1210.c | 2 +- drivers/staging/iio/resolver/ad2s90.c | 2 +- drivers/staging/iio/sysfs.h | 79 +- drivers/staging/iio/trigger.h | 116 +- drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 6 +- drivers/staging/iio/trigger/iio-trig-gpio.c | 6 +- .../staging/iio/trigger/iio-trig-periodic-rtc.c | 7 +- drivers/staging/iio/trigger/iio-trig-sysfs.c | 13 +- drivers/staging/iio/trigger_consumer.h | 71 +- drivers/staging/keucr/scsiglue.c | 5 +- drivers/staging/keucr/smil.h | 6 +- drivers/staging/keucr/smilsub.c | 1574 +-- drivers/staging/keucr/smscsi.c | 117 +- drivers/staging/mei/interrupt.c | 6 + drivers/staging/mei/main.c | 30 +- drivers/staging/nvec/nvec.c | 168 +- drivers/staging/nvec/nvec.h | 13 +- drivers/staging/nvec/nvec_kbd.c | 41 +- drivers/staging/nvec/nvec_ps2.c | 19 +- drivers/staging/olpc_dcon/olpc_dcon.c | 47 +- drivers/staging/pohmelfs/trans.c | 6 +- drivers/staging/rtl8187se/Makefile | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 14 +- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 4 +- drivers/staging/rtl8192e/Makefile | 67 +- drivers/staging/rtl8192e/TODO | 2 + drivers/staging/rtl8192e/dot11d.c | 216 + drivers/staging/rtl8192e/dot11d.h | 113 +- drivers/staging/rtl8192e/ieee80211/dot11d.c | 218 - drivers/staging/rtl8192e/ieee80211/dot11d.h | 102 - drivers/staging/rtl8192e/ieee80211/ieee80211.h | 2636 --- .../staging/rtl8192e/ieee80211/ieee80211_module.c | 352 - drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2676 --- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3278 --- drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 955 - drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 872 - drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h | 69 - .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 676 - drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 483 - .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 1732 -- drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 582 - drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 56 - .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 627 - drivers/staging/rtl8192e/license | 339 + drivers/staging/rtl8192e/r8180_93cx6.c | 141 - drivers/staging/rtl8192e/r8180_93cx6.h | 41 - drivers/staging/rtl8192e/r8190P_def.h | 410 + drivers/staging/rtl8192e/r8190P_rtl8256.c | 306 + drivers/staging/rtl8192e/r8190P_rtl8256.h | 31 + drivers/staging/rtl8192e/r8190_rtl8256.c | 677 - drivers/staging/rtl8192e/r8190_rtl8256.h | 29 - drivers/staging/rtl8192e/r8192E.h | 1148 - drivers/staging/rtl8192e/r8192E_cmdpkt.c | 420 + drivers/staging/rtl8192e/r8192E_cmdpkt.h | 159 + drivers/staging/rtl8192e/r8192E_core.c | 5039 ----- drivers/staging/rtl8192e/r8192E_dev.c | 2413 ++ drivers/staging/rtl8192e/r8192E_dev.h | 62 + drivers/staging/rtl8192e/r8192E_dm.c | 2554 --- drivers/staging/rtl8192e/r8192E_dm.h | 228 - drivers/staging/rtl8192e/r8192E_firmware.c | 348 + drivers/staging/rtl8192e/r8192E_firmware.h | 73 + drivers/staging/rtl8192e/r8192E_hw.h | 552 +- drivers/staging/rtl8192e/r8192E_hwimg.c | 3336 +++ drivers/staging/rtl8192e/r8192E_hwimg.h | 51 + drivers/staging/rtl8192e/r8192E_phy.c | 1633 ++ drivers/staging/rtl8192e/r8192E_phy.h | 144 + drivers/staging/rtl8192e/r8192E_phyreg.h | 852 + drivers/staging/rtl8192e/r8192E_wx.c | 1163 - drivers/staging/rtl8192e/r8192E_wx.h | 18 - drivers/staging/rtl8192e/r8192_pm.c | 123 - drivers/staging/rtl8192e/r8192_pm.h | 24 - drivers/staging/rtl8192e/r819xE_cmdpkt.c | 444 - drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 - drivers/staging/rtl8192e/r819xE_firmware.c | 351 - drivers/staging/rtl8192e/r819xE_phy.c | 2225 -- drivers/staging/rtl8192e/r819xE_phy.h | 131 - drivers/staging/rtl8192e/rtl819x_BA.h | 77 + drivers/staging/rtl8192e/rtl819x_BAProc.c | 566 + drivers/staging/rtl8192e/rtl819x_HT.h | 475 + drivers/staging/rtl8192e/rtl819x_HTProc.c | 1075 + drivers/staging/rtl8192e/rtl819x_Qos.h | 444 + drivers/staging/rtl8192e/rtl819x_TS.h | 73 + drivers/staging/rtl8192e/rtl819x_TSProc.c | 549 + drivers/staging/rtl8192e/rtl_cam.c | 304 + drivers/staging/rtl8192e/rtl_cam.h | 46 + drivers/staging/rtl8192e/rtl_core.c | 3230 +++ drivers/staging/rtl8192e/rtl_core.h | 1124 + .../staging/rtl8192e/{ieee80211 => }/rtl_crypto.h | 105 +- drivers/staging/rtl8192e/rtl_debug.c | 1108 + drivers/staging/rtl8192e/rtl_debug.h | 299 + drivers/staging/rtl8192e/rtl_dm.c | 2995 +++ drivers/staging/rtl8192e/rtl_dm.h | 324 + drivers/staging/rtl8192e/rtl_eeprom.c | 139 + drivers/staging/rtl8192e/rtl_eeprom.h | 29 + drivers/staging/rtl8192e/rtl_ethtool.c | 53 + drivers/staging/rtl8192e/rtl_pci.c | 97 + drivers/staging/rtl8192e/rtl_pci.h | 104 + drivers/staging/rtl8192e/rtl_pm.c | 136 + drivers/staging/rtl8192e/rtl_pm.h | 35 + drivers/staging/rtl8192e/rtl_ps.c | 310 + drivers/staging/rtl8192e/rtl_ps.h | 47 + drivers/staging/rtl8192e/rtl_wx.c | 1332 ++ drivers/staging/rtl8192e/rtl_wx.h | 31 + drivers/staging/rtl8192e/rtllib.h | 3112 +++ .../ieee80211_crypt.c => rtllib_crypt.c} | 91 +- .../ieee80211_crypt.h => rtllib_crypt.h} | 32 +- .../ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} | 170 +- .../ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} | 310 +- .../ieee80211_crypt_wep.c => rtllib_crypt_wep.c} | 116 +- drivers/staging/rtl8192e/rtllib_endianfree.h | 160 + drivers/staging/rtl8192e/rtllib_module.c | 290 + drivers/staging/rtl8192e/rtllib_rx.c | 2722 +++ drivers/staging/rtl8192e/rtllib_softmac.c | 3743 ++++ .../ieee80211_softmac_wx.c => rtllib_softmac_wx.c} | 381 +- drivers/staging/rtl8192e/rtllib_tx.c | 967 + drivers/staging/rtl8192e/rtllib_wx.c | 876 + drivers/staging/rtl8192u/ieee80211/compress.c | 4 +- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 14 +- drivers/staging/rtl8712/big_endian.h | 25 + drivers/staging/rtl8712/drv_types.h | 5 + drivers/staging/rtl8712/ethernet.h | 25 + drivers/staging/rtl8712/generic.h | 25 + drivers/staging/rtl8712/if_ether.h | 25 + drivers/staging/rtl8712/little_endian.h | 25 + drivers/staging/rtl8712/mlme_osdep.h | 25 + drivers/staging/rtl8712/mp_custom_oid.h | 25 + drivers/staging/rtl8712/os_intfs.c | 14 + drivers/staging/rtl8712/osdep_service.h | 1 - drivers/staging/rtl8712/recv_osdep.h | 25 + drivers/staging/rtl8712/rtl8712_bitdef.h | 21 + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 19 + drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 19 + .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 25 + .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 19 + drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 19 + drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 25 + drivers/staging/rtl8712/rtl8712_gp_regdef.h | 25 + drivers/staging/rtl8712/rtl8712_hal.h | 25 + drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 19 + .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 19 + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 19 + drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 19 + drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 25 + drivers/staging/rtl8712/rtl8712_regdef.h | 25 + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_spec.h | 25 + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 25 + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 25 + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 19 + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 25 + drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 25 + drivers/staging/rtl8712/rtl871x_byteorder.h | 19 + drivers/staging/rtl8712/rtl871x_eeprom.h | 19 + drivers/staging/rtl8712/rtl871x_event.h | 25 + drivers/staging/rtl8712/rtl871x_ht.h | 25 + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 28 +- drivers/staging/rtl8712/rtl871x_ioctl_set.h | 25 + drivers/staging/rtl8712/rtl871x_mp.h | 25 + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 25 + drivers/staging/rtl8712/rtl871x_rf.h | 25 + drivers/staging/rtl8712/rtl871x_security.h | 25 + drivers/staging/rtl8712/rtl871x_wlan_sme.h | 25 + drivers/staging/rtl8712/swab.h | 25 + drivers/staging/rtl8712/usb_ops.h | 25 + drivers/staging/rtl8712/usb_osintf.h | 25 + drivers/staging/rtl8712/usb_vendor_req.h | 25 + drivers/staging/rts5139/Kconfig | 16 + drivers/staging/rts5139/Makefile | 37 + drivers/staging/rts5139/TODO | 5 + drivers/staging/rts5139/debug.h | 46 + drivers/staging/rts5139/ms.c | 4191 ++++ drivers/staging/rts5139/ms.h | 263 + drivers/staging/rts5139/ms_mg.c | 642 + drivers/staging/rts5139/ms_mg.h | 41 + drivers/staging/rts5139/rts51x.c | 967 + drivers/staging/rts5139/rts51x.h | 205 + drivers/staging/rts5139/rts51x_card.c | 986 + drivers/staging/rts5139/rts51x_card.h | 881 + drivers/staging/rts5139/rts51x_chip.c | 1167 + drivers/staging/rts5139/rts51x_chip.h | 904 + drivers/staging/rts5139/rts51x_fop.c | 298 + drivers/staging/rts5139/rts51x_fop.h | 62 + drivers/staging/rts5139/rts51x_scsi.c | 2234 ++ drivers/staging/rts5139/rts51x_scsi.h | 162 + drivers/staging/rts5139/rts51x_sys.h | 54 + drivers/staging/rts5139/rts51x_transport.c | 1000 + drivers/staging/rts5139/rts51x_transport.h | 80 + drivers/staging/rts5139/sd.c | 3400 +++ drivers/staging/rts5139/sd.h | 304 + drivers/staging/rts5139/sd_cprm.c | 1215 + drivers/staging/rts5139/sd_cprm.h | 54 + drivers/staging/rts5139/trace.h | 137 + drivers/staging/rts5139/xd.c | 2255 ++ drivers/staging/rts5139/xd.h | 193 + drivers/staging/rts_pstor/Makefile | 2 +- drivers/staging/rts_pstor/rtsx_scsi.c | 2 +- drivers/staging/rts_pstor/sd.c | 4 +- drivers/staging/rts_pstor/spi.c | 2 +- drivers/staging/serqt_usb2/serqt_usb2.c | 34 +- drivers/staging/sm7xx/smtcfb.c | 2 + drivers/staging/spectra/ffsport.c | 15 +- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 + drivers/staging/tidspbridge/gen/gh.c | 2 +- drivers/staging/usbip/stub.h | 5 + drivers/staging/usbip/stub_dev.c | 7 +- drivers/staging/usbip/stub_main.c | 1 + drivers/staging/usbip/stub_rx.c | 5 +- drivers/staging/usbip/usbip_protocol.txt | 358 + .../staging/usbip/userspace/libsrc/vhci_driver.c | 2 +- drivers/staging/usbip/userspace/src/usbip_attach.c | 4 +- drivers/staging/usbip/userspace/src/utils.h | 1 + drivers/staging/usbip/vhci.h | 5 + drivers/staging/vme/bridges/vme_ca91cx42.c | 24 + drivers/staging/vme/bridges/vme_tsi148.c | 24 + drivers/staging/vme/devices/vme_user.c | 4 +- drivers/staging/vme/vme.c | 74 +- drivers/staging/vme/vme_bridge.h | 11 +- drivers/staging/vt6655/IEEE11h.c | 406 +- drivers/staging/vt6655/device_main.c | 10 +- drivers/staging/vt6655/dpc.c | 30 +- drivers/staging/vt6655/wmgr.c | 49 +- drivers/staging/vt6656/dpc.c | 30 +- drivers/staging/vt6656/main_usb.c | 11 +- drivers/staging/vt6656/wmgr.c | 49 +- drivers/staging/winbond/phy_calibration.c | 12 +- drivers/staging/xgifb/XGI_main.h | 128 +- drivers/staging/xgifb/XGI_main_26.c | 544 +- drivers/staging/xgifb/XGIfb.h | 12 - drivers/staging/xgifb/vb_def.h | 590 +- drivers/staging/xgifb/vb_ext.h | 20 - drivers/staging/xgifb/vb_setmode.c | 3 - drivers/staging/xgifb/vb_struct.h | 71 - drivers/staging/xgifb/vb_table.h | 729 - drivers/staging/xgifb/vgatypes.h | 5 - drivers/staging/zcache/zcache-main.c | 6 +- drivers/staging/zram/zram_drv.c | 36 +- drivers/staging/zram/zram_drv.h | 4 +- drivers/staging/zram/zram_sysfs.c | 4 +- include/linux/mod_devicetable.h | 9 + scripts/mod/file2alias.c | 25 + 496 files changed, 99186 insertions(+), 69163 deletions(-) delete mode 100644 drivers/char/scc.h delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.c delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h create mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933 delete mode 100644 drivers/staging/iio/accel/accel.h delete mode 100644 drivers/staging/iio/accel/inclinometer.h create mode 100644 drivers/staging/iio/adc/ad7192.c create mode 100644 drivers/staging/iio/adc/ad7192.h create mode 100644 drivers/staging/iio/adc/ad7280a.c create mode 100644 drivers/staging/iio/adc/ad7280a.h delete mode 100644 drivers/staging/iio/adc/adc.h delete mode 100644 drivers/staging/iio/gyro/gyro.h create mode 100644 drivers/staging/iio/iio_core.h create mode 100644 drivers/staging/iio/iio_core_trigger.h create mode 100644 drivers/staging/iio/impedance-analyzer/Kconfig create mode 100644 drivers/staging/iio/impedance-analyzer/Makefile create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.c create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h delete mode 100644 drivers/staging/iio/magnetometer/magnet.h create mode 100644 drivers/staging/rtl8192e/TODO create mode 100644 drivers/staging/rtl8192e/dot11d.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.h delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211.h delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c create mode 100644 drivers/staging/rtl8192e/license delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h create mode 100644 drivers/staging/rtl8192e/r8190P_def.h create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.c create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.h delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.h delete mode 100644 drivers/staging/rtl8192e/r8192E.h create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.c create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.h delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c create mode 100644 drivers/staging/rtl8192e/r8192E_dev.c create mode 100644 drivers/staging/rtl8192e/r8192E_dev.h delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.c delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.h create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.c create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.h create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.c create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.h create mode 100644 drivers/staging/rtl8192e/r8192E_phy.c create mode 100644 drivers/staging/rtl8192e/r8192E_phy.h create mode 100644 drivers/staging/rtl8192e/r8192E_phyreg.h delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.c delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.h delete mode 100644 drivers/staging/rtl8192e/r8192_pm.c delete mode 100644 drivers/staging/rtl8192e/r8192_pm.h delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h delete mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.c delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.h create mode 100644 drivers/staging/rtl8192e/rtl819x_BA.h create mode 100644 drivers/staging/rtl8192e/rtl819x_BAProc.c create mode 100644 drivers/staging/rtl8192e/rtl819x_HT.h create mode 100644 drivers/staging/rtl8192e/rtl819x_HTProc.c create mode 100644 drivers/staging/rtl8192e/rtl819x_Qos.h create mode 100644 drivers/staging/rtl8192e/rtl819x_TS.h create mode 100644 drivers/staging/rtl8192e/rtl819x_TSProc.c create mode 100644 drivers/staging/rtl8192e/rtl_cam.c create mode 100644 drivers/staging/rtl8192e/rtl_cam.h create mode 100644 drivers/staging/rtl8192e/rtl_core.c create mode 100644 drivers/staging/rtl8192e/rtl_core.h rename drivers/staging/rtl8192e/{ieee80211 => }/rtl_crypto.h (74%) create mode 100644 drivers/staging/rtl8192e/rtl_debug.c create mode 100644 drivers/staging/rtl8192e/rtl_debug.h create mode 100644 drivers/staging/rtl8192e/rtl_dm.c create mode 100644 drivers/staging/rtl8192e/rtl_dm.h create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.c create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.h create mode 100644 drivers/staging/rtl8192e/rtl_ethtool.c create mode 100644 drivers/staging/rtl8192e/rtl_pci.c create mode 100644 drivers/staging/rtl8192e/rtl_pci.h create mode 100644 drivers/staging/rtl8192e/rtl_pm.c create mode 100644 drivers/staging/rtl8192e/rtl_pm.h create mode 100644 drivers/staging/rtl8192e/rtl_ps.c create mode 100644 drivers/staging/rtl8192e/rtl_ps.h create mode 100644 drivers/staging/rtl8192e/rtl_wx.c create mode 100644 drivers/staging/rtl8192e/rtl_wx.h create mode 100644 drivers/staging/rtl8192e/rtllib.h rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.c => rtllib_crypt.c} (63%) rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.h => rtllib_crypt.h} (74%) rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} (67%) rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} (71%) rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_wep.c => rtllib_crypt_wep.c} (71%) create mode 100644 drivers/staging/rtl8192e/rtllib_endianfree.h create mode 100644 drivers/staging/rtl8192e/rtllib_module.c create mode 100644 drivers/staging/rtl8192e/rtllib_rx.c create mode 100644 drivers/staging/rtl8192e/rtllib_softmac.c rename drivers/staging/rtl8192e/{ieee80211/ieee80211_softmac_wx.c => rtllib_softmac_wx.c} (50%) create mode 100644 drivers/staging/rtl8192e/rtllib_tx.c create mode 100644 drivers/staging/rtl8192e/rtllib_wx.c create mode 100644 drivers/staging/rts5139/Kconfig create mode 100644 drivers/staging/rts5139/Makefile create mode 100644 drivers/staging/rts5139/TODO create mode 100644 drivers/staging/rts5139/debug.h create mode 100644 drivers/staging/rts5139/ms.c create mode 100644 drivers/staging/rts5139/ms.h create mode 100644 drivers/staging/rts5139/ms_mg.c create mode 100644 drivers/staging/rts5139/ms_mg.h create mode 100644 drivers/staging/rts5139/rts51x.c create mode 100644 drivers/staging/rts5139/rts51x.h create mode 100644 drivers/staging/rts5139/rts51x_card.c create mode 100644 drivers/staging/rts5139/rts51x_card.h create mode 100644 drivers/staging/rts5139/rts51x_chip.c create mode 100644 drivers/staging/rts5139/rts51x_chip.h create mode 100644 drivers/staging/rts5139/rts51x_fop.c create mode 100644 drivers/staging/rts5139/rts51x_fop.h create mode 100644 drivers/staging/rts5139/rts51x_scsi.c create mode 100644 drivers/staging/rts5139/rts51x_scsi.h create mode 100644 drivers/staging/rts5139/rts51x_sys.h create mode 100644 drivers/staging/rts5139/rts51x_transport.c create mode 100644 drivers/staging/rts5139/rts51x_transport.h create mode 100644 drivers/staging/rts5139/sd.c create mode 100644 drivers/staging/rts5139/sd.h create mode 100644 drivers/staging/rts5139/sd_cprm.c create mode 100644 drivers/staging/rts5139/sd_cprm.h create mode 100644 drivers/staging/rts5139/trace.h create mode 100644 drivers/staging/rts5139/xd.c create mode 100644 drivers/staging/rts5139/xd.h create mode 100644 drivers/staging/usbip/usbip_protocol.txt Merging bkl-config/config $ git merge bkl-config/config Already up-to-date. Merging tmem/linux-next $ git merge tmem/linux-next Auto-merging include/linux/swap.h Auto-merging mm/Kconfig Auto-merging mm/swapfile.c Merge made by recursive. .../ABI/testing/sysfs-kernel-mm-frontswap | 16 + Documentation/vm/frontswap.txt | 210 ++++++++++++ include/linux/frontswap.h | 92 ++++++ include/linux/swap.h | 2 + include/linux/swapfile.h | 13 + mm/Kconfig | 17 + mm/Makefile | 1 + mm/frontswap.c | 335 ++++++++++++++++++++ mm/page_io.c | 12 + mm/swapfile.c | 65 +++- 10 files changed, 751 insertions(+), 12 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap create mode 100644 Documentation/vm/frontswap.txt create mode 100644 include/linux/frontswap.h create mode 100644 include/linux/swapfile.h create mode 100644 mm/frontswap.c Merging writeback/next $ git merge writeback/next Already up-to-date. Merging arm-dt/devicetree/arm-next $ git merge arm-dt/devicetree/arm-next Already up-to-date. Merging moduleh/module.h-split $ git merge moduleh/module.h-split Auto-merging arch/arm/common/scoop.c Auto-merging arch/arm/kernel/setup.c Auto-merging arch/arm/mach-bcmring/mm.c CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c Auto-merging arch/arm/mach-imx/mach-mx31lilly.c Auto-merging arch/arm/mach-imx/mach-mx31lite.c Auto-merging arch/arm/mach-imx/mach-mx31moboard.c Auto-merging arch/arm/mach-ixp2000/core.c Auto-merging arch/arm/mach-ixp4xx/common-pci.c Auto-merging arch/arm/mach-msm/io.c Auto-merging arch/arm/mach-omap1/board-ams-delta.c Auto-merging arch/arm/mach-omap1/board-sx1.c Auto-merging arch/arm/mach-omap1/board-voiceblue.c Auto-merging arch/arm/mach-omap2/board-omap3evm.c Auto-merging arch/arm/mach-s3c2410/mach-h1940.c Auto-merging arch/arm/mach-sa1100/jornada720.c Auto-merging arch/arm/mm/init.c Auto-merging arch/arm/plat-samsung/dev-ts.c Auto-merging arch/arm/plat-samsung/platformdata.c Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c Auto-merging arch/mips/bcm47xx/gpio.c Auto-merging arch/mips/bcm47xx/setup.c Auto-merging arch/mips/kernel/traps.c Auto-merging arch/powerpc/sysdev/fsl_rio.c Auto-merging arch/sparc/kernel/pcic.c Auto-merging arch/x86/kernel/cpu/amd.c Auto-merging drivers/ata/libata-eh.c Auto-merging drivers/base/power/main.c Auto-merging drivers/base/power/runtime.c Auto-merging drivers/bcma/core.c Auto-merging drivers/bcma/driver_chipcommon.c Auto-merging drivers/bcma/driver_pci.c Auto-merging drivers/bcma/main.c Auto-merging drivers/char/virtio_console.c Auto-merging drivers/clocksource/sh_cmt.c Auto-merging drivers/firmware/google/gsmi.c Auto-merging drivers/gpio/gpio-ep93xx.c Auto-merging drivers/hid/hid-axff.c Auto-merging drivers/hid/hid-debug.c Auto-merging drivers/hid/hid-picolcd.c Auto-merging drivers/hid/hid-sjoy.c Auto-merging drivers/hid/usbhid/hid-quirks.c Auto-merging drivers/input/input-mt.c Auto-merging drivers/input/input-polldev.c Auto-merging drivers/input/misc/ad714x.c Auto-merging drivers/leds/leds-asic3.c Auto-merging drivers/md/dm-raid.c Auto-merging drivers/md/md.c Auto-merging drivers/mfd/ab3550-core.c Auto-merging drivers/mfd/asic3.c Auto-merging drivers/mfd/max8997.c Auto-merging drivers/mfd/twl6030-irq.c Auto-merging drivers/mfd/wm8400-core.c Auto-merging drivers/misc/ab8500-pwm.c Auto-merging drivers/misc/ti-st/st_kim.c Auto-merging drivers/mmc/core/debugfs.c Auto-merging drivers/mmc/core/host.c Auto-merging drivers/mmc/core/mmc_ops.c Auto-merging drivers/mmc/core/sd.c Auto-merging drivers/mmc/core/sd_ops.c Auto-merging drivers/mmc/host/sdhci-tegra.c Auto-merging drivers/mmc/host/sh_mobile_sdhi.c Auto-merging drivers/mtd/ar7part.c Auto-merging drivers/mtd/cmdlinepart.c Auto-merging drivers/mtd/mtdsuper.c Auto-merging drivers/mtd/nand/cafe_nand.c Auto-merging drivers/mtd/nand/cmx270_nand.c Auto-merging drivers/mtd/nand/diskonchip.c Auto-merging drivers/mtd/nand/nand_bbt.c Auto-merging drivers/mtd/nand/omap2.c Auto-merging drivers/mtd/onenand/onenand_bbt.c Auto-merging drivers/mtd/redboot.c Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c Auto-merging drivers/pci/hotplug/pcihp_slot.c Auto-merging drivers/pci/setup-res.c Auto-merging drivers/power/max17042_battery.c Auto-merging drivers/power/max89Resolved 'arch/arm/mach-bcmring/mm.c' using previous resolution. Resolved 'include/linux/dmaengine.h' using previous resolution. 03_charger.c Auto-merging drivers/power/max8997_charger.c Auto-merging drivers/power/max8998_charger.c Auto-merging drivers/power/power_supply_sysfs.c Auto-merging drivers/regulator/88pm8607.c Auto-merging drivers/regulator/tps6586x-regulator.c Auto-merging drivers/rtc/interface.c Auto-merging drivers/s390/cio/qdio_debug.c Auto-merging drivers/ssb/main.c Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c Auto-merging drivers/staging/iio/industrialio-ring.c Auto-merging drivers/tty/serial/jsm/jsm_driver.c Auto-merging drivers/tty/serial/max3107-aava.c Auto-merging drivers/tty/serial/max3107.c Auto-merging drivers/uio/uio_pdrv_genirq.c Auto-merging drivers/usb/core/driver.c Auto-merging drivers/usb/gadget/composite.c Auto-merging drivers/usb/gadget/file_storage.c Auto-merging drivers/usb/gadget/fusb300_udc.c Auto-merging drivers/usb/host/xhci-hub.c Auto-merging drivers/usb/wusbcore/wa-hc.c Auto-merging drivers/video/atmel_lcdfb.c Auto-merging drivers/video/backlight/ep93xx_bl.c Auto-merging drivers/video/carminefb.c Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c Auto-merging drivers/video/msm/mdp.c Auto-merging drivers/w1/w1_family.c Auto-merging drivers/xen/balloon.c Auto-merging drivers/xen/swiotlb-xen.c Auto-merging drivers/xen/xen-selfballoon.c Auto-merging drivers/xen/xenbus/xenbus_probe.c Auto-merging fs/exofs/super.c Auto-merging fs/jfs/jfs_logmgr.c Auto-merging fs/logfs/super.c Auto-merging include/linux/bcma/bcma.h Auto-merging include/linux/blkdev.h Auto-merging include/linux/device.h Auto-merging include/linux/dmaengine.h CONFLICT (content): Merge conflict in include/linux/dmaengine.h Auto-merging include/linux/hid.h Auto-merging include/linux/mtd/mtd.h Auto-merging include/linux/pm_runtime.h Auto-merging include/linux/usb.h Auto-merging include/net/lib80211.h Auto-merging include/net/sock.h Auto-merging kernel/cgroup_freezer.c Auto-merging kernel/crash_dump.c Auto-merging kernel/cred.c Auto-merging kernel/exit.c Auto-merging kernel/fork.c Auto-merging kernel/freezer.c Auto-merging kernel/kthread.c Auto-merging kernel/lockdep.c Auto-merging kernel/pid.c Auto-merging kernel/power/hibernate.c Auto-merging kernel/power/main.c Auto-merging kernel/power/suspend.c Auto-merging kernel/rcupdate.c Auto-merging kernel/rcutiny.c Auto-merging kernel/rcutorture.c Auto-merging kernel/rcutree.c Auto-merging kernel/rcutree_trace.c Auto-merging kernel/rtmutex.c Auto-merging kernel/sched.c Auto-merging kernel/signal.c Auto-merging kernel/sys.c Auto-merging kernel/trace/blktrace.c Auto-merging mm/memcontrol.c Auto-merging mm/swapfile.c Auto-merging sound/core/control.c Auto-merging sound/usb/midi.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 71fdcef] Merge remote-tracking branch 'moduleh/module.h-split' $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/core_irongate.c | 1 + arch/alpha/kernel/pci-sysfs.c | 1 + arch/alpha/kernel/pci_iommu.c | 1 + arch/alpha/kernel/setup.c | 1 + arch/arm/common/it8152.c | 1 + arch/arm/common/scoop.c | 1 + arch/arm/kernel/armksyms.c | 2 +- arch/arm/kernel/bios32.c | 2 +- arch/arm/kernel/devtree.c | 2 +- arch/arm/kernel/elf.c | 2 +- arch/arm/kernel/io.c | 2 +- arch/arm/kernel/irq.c | 1 - arch/arm/kernel/leds.c | 3 +- arch/arm/kernel/perf_event.c | 2 +- arch/arm/kernel/pj4-cp0.c | 1 - arch/arm/kernel/process.c | 2 +- arch/arm/kernel/ptrace.c | 1 + arch/arm/kernel/return_address.c | 2 +- arch/arm/kernel/setup.c | 2 +- arch/arm/kernel/stacktrace.c | 2 +- arch/arm/kernel/sys_arm.c | 2 +- arch/arm/kernel/time.c | 2 +- arch/arm/kernel/unwind.c | 2 +- arch/arm/kernel/xscale-cp0.c | 1 - arch/arm/mach-at91/cpuidle.c | 1 + arch/arm/mach-bcmring/dma.c | 1 + arch/arm/mach-bcmring/mm.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/board-dm646x-evm.c | 1 + arch/arm/mach-davinci/cdce949.c | 1 + arch/arm/mach-davinci/cpufreq.c | 1 + arch/arm/mach-davinci/cpuidle.c | 1 + arch/arm/mach-ep93xx/core.c | 1 + arch/arm/mach-exynos4/dev-sysmmu.c | 1 + arch/arm/mach-imx/mach-mx31lilly.c | 1 + arch/arm/mach-imx/mach-mx31lite.c | 1 + arch/arm/mach-imx/mach-mx31moboard.c | 1 + arch/arm/mach-iop13xx/pci.c | 1 + arch/arm/mach-ixp2000/core.c | 1 + arch/arm/mach-ixp4xx/common-pci.c | 1 + arch/arm/mach-ixp4xx/common.c | 1 + arch/arm/mach-kirkwood/cpuidle.c | 1 + arch/arm/mach-msm/io.c | 1 + arch/arm/mach-netx/xc.c | 1 + arch/arm/mach-omap1/board-ams-delta.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + arch/arm/mach-omap1/board-voiceblue.c | 1 + arch/arm/mach-omap1/mailbox.c | 1 + arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/clockdomain.c | 1 + arch/arm/mach-omap2/display.c | 1 + arch/arm/mach-omap2/gpmc-onenand.c | 1 + arch/arm/mach-omap2/pm.c | 1 + arch/arm/mach-omap2/prcm.c | 1 + arch/arm/mach-omap2/usb-tusb6010.c | 2 + arch/arm/mach-omap2/voltage.c | 1 + arch/arm/mach-pxa/corgi.c | 1 + arch/arm/mach-pxa/poodle.c | 1 + arch/arm/mach-pxa/spitz.c | 1 + arch/arm/mach-s3c2410/mach-h1940.c | 1 + arch/arm/mach-s3c64xx/dev-audio.c | 1 + arch/arm/mach-sa1100/collie.c | 1 + arch/arm/mach-sa1100/jornada720.c | 1 + arch/arm/mach-shmobile/clock.c | 1 + arch/arm/mach-tegra/pcie.c | 1 + arch/arm/mm/fault-armv.c | 1 - arch/arm/mm/init.c | 1 + arch/arm/plat-iop/gpio.c | 1 + arch/arm/plat-iop/time.c | 1 + arch/arm/plat-omap/clock.c | 1 + arch/arm/plat-omap/mailbox.c | 1 + arch/arm/plat-s3c24xx/devs.c | 1 + arch/arm/plat-s5p/dev-ehci.c | 1 + arch/arm/plat-s5p/dev-onenand.c | 2 + arch/arm/plat-samsung/dev-adc.c | 2 + arch/arm/plat-samsung/dev-asocdma.c | 1 + arch/arm/plat-samsung/dev-backlight.c | 1 + arch/arm/plat-samsung/dev-ide.c | 2 + arch/arm/plat-samsung/dev-nand.c | 1 + arch/arm/plat-samsung/dev-pwm.c | 1 + arch/arm/plat-samsung/dev-rtc.c | 1 + arch/arm/plat-samsung/dev-ts.c | 2 + arch/arm/plat-samsung/dev-usb.c | 1 + arch/arm/plat-samsung/dev-wdt.c | 3 + arch/arm/plat-samsung/platformdata.c | 1 + arch/arm/vfp/vfpmodule.c | 1 - arch/avr32/mach-at32ap/clock.c | 1 + arch/avr32/mach-at32ap/cpufreq.c | 1 + arch/avr32/mach-at32ap/intc.c | 1 + arch/avr32/mach-at32ap/pio.c | 1 + arch/avr32/mm/dma-coherent.c | 1 + arch/blackfin/kernel/dma-mapping.c | 1 + arch/blackfin/kernel/perf_event.c | 1 + arch/blackfin/kernel/sys_bfin.c | 1 + arch/blackfin/mach-bf518/boards/ezbrd.c | 1 + arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 + arch/blackfin/mach-bf527/boards/ezkit.c | 1 + arch/blackfin/mach-bf527/boards/tll6527m.c | 1 + arch/blackfin/mach-bf537/boards/dnp5370.c | 1 + arch/blackfin/mach-common/cpufreq.c | 1 + arch/blackfin/mm/init.c | 1 + arch/ia64/hp/common/hwsw_iommu.c | 1 + arch/ia64/kernel/dma-mapping.c | 1 + arch/ia64/kernel/topology.c | 1 + arch/ia64/sn/kernel/io_init.c | 1 + arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 + arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 + arch/ia64/sn/pci/tioca_provider.c | 1 + arch/m68k/atari/time.c | 1 + arch/m68k/kernel/dma_mm.c | 1 + arch/m68k/kernel/dma_no.c | 1 + arch/mips/bcm47xx/gpio.c | 1 + arch/mips/bcm47xx/setup.c | 1 + arch/mips/cavium-octeon/csrc-octeon.c | 1 + arch/mips/cavium-octeon/dma-octeon.c | 1 + arch/mips/cavium-octeon/flash_setup.c | 1 + arch/mips/kernel/8250-platform.c | 1 - arch/mips/kernel/cpu-probe.c | 3 +- arch/mips/kernel/i8253.c | 2 +- arch/mips/kernel/init_task.c | 2 +- arch/mips/kernel/irq-msc01.c | 1 - arch/mips/kernel/irq.c | 1 - arch/mips/kernel/mips-mt.c | 2 +- arch/mips/kernel/mips_ksyms.c | 2 +- arch/mips/kernel/module.c | 1 - arch/mips/kernel/process.c | 2 +- arch/mips/kernel/prom.c | 2 +- arch/mips/kernel/reset.c | 2 +- arch/mips/kernel/rtlx.c | 1 - arch/mips/kernel/setup.c | 2 +- arch/mips/kernel/spinlock_test.c | 2 +- arch/mips/kernel/stacktrace.c | 2 +- arch/mips/kernel/time.c | 2 +- arch/mips/kernel/traps.c | 1 - arch/mips/kernel/unaligned.c | 1 - arch/mips/kernel/vpe.c | 1 - arch/mips/loongson/common/platform.c | 1 + arch/mips/pci/pci-ip27.c | 1 + arch/mips/pci/pci.c | 1 + arch/mips/powertv/pci/fixup-powertv.c | 1 + arch/mips/powertv/powertv-usb.c | 1 + arch/mips/rb532/gpio.c | 1 + arch/mips/rb532/setup.c | 1 + arch/mips/txx9/generic/spi_eeprom.c | 1 + arch/mips/txx9/rbtx4939/setup.c | 1 + arch/mips/vr41xx/common/giu.c | 1 + arch/mips/vr41xx/common/rtc.c | 1 + arch/parisc/kernel/drivers.c | 1 + arch/parisc/kernel/pci-dma.c | 1 + arch/parisc/kernel/setup.c | 1 + arch/parisc/lib/iomap.c | 1 + arch/powerpc/include/asm/lv1call.h | 1 + arch/powerpc/include/asm/machdep.h | 1 + arch/powerpc/include/asm/spu.h | 1 + arch/powerpc/kernel/btext.c | 2 +- arch/powerpc/kernel/clock.c | 2 +- arch/powerpc/kernel/cputable.c | 2 +- arch/powerpc/kernel/crash.c | 1 + arch/powerpc/kernel/dma-iommu.c | 1 + arch/powerpc/kernel/dma.c | 1 + arch/powerpc/kernel/firmware.c | 3 +- arch/powerpc/kernel/hw_breakpoint.c | 1 - arch/powerpc/kernel/ibmebus.c | 2 + arch/powerpc/kernel/init_task.c | 2 +- arch/powerpc/kernel/io-workarounds.c | 1 + arch/powerpc/kernel/io.c | 2 +- arch/powerpc/kernel/iomap.c | 1 + arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/kernel/isa-bridge.c | 1 + arch/powerpc/kernel/kvm.c | 1 + arch/powerpc/kernel/module.c | 1 - arch/powerpc/kernel/of_platform.c | 2 +- arch/powerpc/kernel/paca.c | 2 +- arch/powerpc/kernel/pci-common.c | 1 + arch/powerpc/kernel/pci_32.c | 1 + arch/powerpc/kernel/pci_64.c | 1 + arch/powerpc/kernel/pci_dn.c | 1 + arch/powerpc/kernel/pci_of_scan.c | 1 + arch/powerpc/kernel/pmc.c | 2 +- arch/powerpc/kernel/ppc_ksyms.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kernel/prom_parse.c | 1 - arch/powerpc/kernel/ptrace.c | 1 - arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/signal_64.c | 1 - arch/powerpc/kernel/smp.c | 2 +- arch/powerpc/kernel/stacktrace.c | 2 +- arch/powerpc/kernel/swsusp_64.c | 1 + arch/powerpc/kernel/sysfs.c | 2 +- arch/powerpc/kernel/time.c | 2 +- arch/powerpc/kernel/vdso.c | 1 - arch/powerpc/kernel/vio.c | 3 +- arch/powerpc/kvm/44x.c | 1 + arch/powerpc/kvm/book3s.c | 1 + arch/powerpc/kvm/book3s_exports.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 1 + arch/powerpc/kvm/book3s_hv_builtin.c | 1 + arch/powerpc/kvm/book3s_pr.c | 1 + arch/powerpc/kvm/powerpc.c | 1 - arch/powerpc/lib/checksum_wrappers_64.c | 2 +- arch/powerpc/lib/devres.c | 2 +- arch/powerpc/lib/locks.c | 2 +- arch/powerpc/lib/rheap.c | 2 +- arch/powerpc/mm/dma-noncoherent.c | 1 + arch/powerpc/mm/hash_utils_64.c | 1 + arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/mmu_context_hash32.c | 1 + arch/powerpc/mm/mmu_context_hash64.c | 2 +- arch/powerpc/mm/numa.c | 2 +- arch/powerpc/mm/pgtable_64.c | 1 + arch/powerpc/mm/slice.c | 2 +- arch/powerpc/mm/tlb_hash32.c | 1 + arch/powerpc/mm/tlb_nohash.c | 1 + arch/powerpc/platforms/44x/warp.c | 1 + arch/powerpc/platforms/512x/clock.c | 1 + arch/powerpc/platforms/52xx/mpc52xx_common.c | 1 + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 + arch/powerpc/platforms/83xx/suspend.c | 1 + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 - arch/powerpc/platforms/85xx/sbc8548.c | 1 - arch/powerpc/platforms/86xx/gef_gpio.c | 1 + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - arch/powerpc/platforms/cell/axon_msi.c | 1 + arch/powerpc/platforms/cell/beat.c | 2 +- arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 - arch/powerpc/platforms/cell/beat_wrapper.h | 1 + arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 + arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 + arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 + arch/powerpc/platforms/cell/cbe_regs.c | 2 +- arch/powerpc/platforms/cell/celleb_setup.c | 1 + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 + arch/powerpc/platforms/cell/interrupt.c | 2 +- arch/powerpc/platforms/cell/pmu.c | 1 + arch/powerpc/platforms/cell/qpace_setup.c | 1 + arch/powerpc/platforms/cell/setup.c | 1 + arch/powerpc/platforms/cell/smp.c | 1 - arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- arch/powerpc/platforms/cell/spu_fault.c | 2 +- arch/powerpc/platforms/cell/spu_manage.c | 2 +- arch/powerpc/platforms/cell/spu_notify.c | 3 +- arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 - arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 - arch/powerpc/platforms/cell/spufs/context.c | 2 +- arch/powerpc/platforms/cell/spufs/coredump.c | 1 - arch/powerpc/platforms/cell/spufs/fault.c | 1 - arch/powerpc/platforms/cell/spufs/file.c | 2 +- arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 - arch/powerpc/platforms/cell/spufs/sched.c | 1 - arch/powerpc/platforms/cell/spufs/switch.c | 2 +- arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +- arch/powerpc/platforms/embedded6xx/holly.c | 1 + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 + arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +- arch/powerpc/platforms/iseries/iommu.c | 2 +- arch/powerpc/platforms/iseries/ksyms.c | 2 +- arch/powerpc/platforms/iseries/lpardata.c | 1 - arch/powerpc/platforms/iseries/lpevents.c | 2 +- arch/powerpc/platforms/iseries/mf.c | 1 + arch/powerpc/platforms/iseries/pci.c | 1 - arch/powerpc/platforms/iseries/setup.c | 1 + arch/powerpc/platforms/iseries/smp.c | 1 - arch/powerpc/platforms/iseries/vio.c | 2 +- arch/powerpc/platforms/iseries/viopath.c | 2 +- arch/powerpc/platforms/maple/setup.c | 1 + arch/powerpc/platforms/pasemi/cpufreq.c | 1 + arch/powerpc/platforms/pasemi/dma_lib.c | 3 +- arch/powerpc/platforms/pasemi/setup.c | 1 + arch/powerpc/platforms/powermac/backlight.c | 1 + arch/powerpc/platforms/powermac/feature.c | 1 + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- arch/powerpc/platforms/powermac/nvram.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 1 - arch/powerpc/platforms/powermac/setup.c | 1 + arch/powerpc/platforms/ps3/exports.c | 2 - arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/ps3/mm.c | 2 +- arch/powerpc/platforms/ps3/os-area.c | 1 + arch/powerpc/platforms/ps3/setup.c | 1 + arch/powerpc/platforms/ps3/spu.c | 1 + arch/powerpc/platforms/ps3/system-bus.c | 2 +- arch/powerpc/platforms/pseries/eeh.c | 2 + arch/powerpc/platforms/pseries/eeh_event.c | 1 + arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 + arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 + arch/powerpc/platforms/pseries/hvconsole.c | 3 +- arch/powerpc/platforms/pseries/io_event_irq.c | 2 +- arch/powerpc/platforms/pseries/iommu.c | 1 + arch/powerpc/platforms/pseries/lpar.c | 1 + arch/powerpc/platforms/pseries/mobility.c | 1 + arch/powerpc/platforms/pseries/pci_dlpar.c | 1 + arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 + arch/powerpc/platforms/pseries/setup.c | 2 +- arch/powerpc/platforms/pseries/smp.c | 1 - arch/powerpc/platforms/pseries/suspend.c | 1 + arch/powerpc/sysdev/bestcomm/sram.c | 2 +- arch/powerpc/sysdev/cpm_common.c | 1 + arch/powerpc/sysdev/dcr.c | 1 + arch/powerpc/sysdev/fsl_gtm.c | 1 + arch/powerpc/sysdev/fsl_lbc.c | 3 +- arch/powerpc/sysdev/fsl_pmc.c | 1 + arch/powerpc/sysdev/fsl_rio.c | 2 +- arch/powerpc/sysdev/fsl_soc.c | 2 +- arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 + arch/powerpc/sysdev/mpc8xx_pic.c | 1 - arch/powerpc/sysdev/mv64x60_pci.c | 1 + arch/powerpc/sysdev/pmi.c | 1 + arch/powerpc/sysdev/ppc4xx_msi.c | 1 + arch/powerpc/sysdev/qe_lib/gpio.c | 1 + arch/powerpc/sysdev/qe_lib/ucc.c | 2 +- arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +- arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +- arch/powerpc/sysdev/qe_lib/usb.c | 1 + arch/powerpc/sysdev/rtc_cmos_setup.c | 1 + arch/powerpc/sysdev/scom.c | 1 + arch/powerpc/sysdev/simple_gpio.c | 1 - arch/powerpc/sysdev/tsi108_dev.c | 2 +- arch/powerpc/xmon/xmon.c | 2 +- arch/s390/crypto/sha_common.c | 1 + arch/s390/mm/init.c | 1 + arch/sh/drivers/dma/dma-sysfs.c | 1 + arch/sh/drivers/pci/pci.c | 1 + arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 + arch/sh/kernel/perf_event.c | 1 + arch/sh/kernel/topology.c | 1 + arch/sh/mm/init.c | 1 + arch/sparc/include/asm/termios.h | 1 - arch/sparc/kernel/auxio_32.c | 1 + arch/sparc/kernel/btext.c | 1 - arch/sparc/kernel/central.c | 1 + arch/sparc/kernel/cpu.c | 2 +- arch/sparc/kernel/cpumap.c | 2 +- arch/sparc/kernel/dma.c | 1 - arch/sparc/kernel/ebus.c | 2 +- arch/sparc/kernel/hvapi.c | 2 +- arch/sparc/kernel/idprom.c | 2 +- arch/sparc/kernel/iommu.c | 2 +- arch/sparc/kernel/irq_32.c | 1 + arch/sparc/kernel/irq_64.c | 1 - arch/sparc/kernel/ldc.c | 2 +- arch/sparc/kernel/leon_kernel.c | 1 - arch/sparc/kernel/leon_pci_grpci2.c | 1 - arch/sparc/kernel/nmi.c | 2 +- arch/sparc/kernel/of_device_32.c | 1 - arch/sparc/kernel/of_device_64.c | 3 +- arch/sparc/kernel/of_device_common.c | 2 +- arch/sparc/kernel/pci.c | 2 +- arch/sparc/kernel/pci_fire.c | 1 + arch/sparc/kernel/pci_psycho.c | 1 + arch/sparc/kernel/pci_sabre.c | 1 + arch/sparc/kernel/pci_schizo.c | 1 + arch/sparc/kernel/pci_sun4v.c | 1 + arch/sparc/kernel/pcic.c | 1 + arch/sparc/kernel/pcr.c | 3 +- arch/sparc/kernel/pmc.c | 1 + arch/sparc/kernel/power.c | 2 +- arch/sparc/kernel/process_64.c | 2 +- arch/sparc/kernel/prom_32.c | 1 - arch/sparc/kernel/prom_64.c | 1 - arch/sparc/kernel/prom_common.c | 2 +- arch/sparc/kernel/reboot.c | 2 +- arch/sparc/kernel/sbus.c | 1 + arch/sparc/kernel/setup_32.c | 1 + arch/sparc/kernel/setup_64.c | 1 + arch/sparc/kernel/smp_64.c | 2 +- arch/sparc/kernel/sparc_ksyms_64.c | 2 +- arch/sparc/kernel/stacktrace.c | 2 +- arch/sparc/kernel/sys_sparc32.c | 1 - arch/sparc/kernel/sys_sparc_64.c | 2 +- arch/sparc/kernel/time_64.c | 2 +- arch/sparc/kernel/traps_32.c | 1 + arch/sparc/kernel/unaligned_32.c | 1 - arch/sparc/kernel/vio.c | 1 + arch/sparc/kernel/viohs.c | 2 +- arch/sparc/mm/fault_32.c | 1 - arch/sparc/mm/generic_32.c | 1 + arch/sparc/mm/generic_64.c | 1 + arch/sparc/mm/highmem.c | 1 + arch/sparc/mm/hugetlbpage.c | 1 - arch/x86/crypto/aes_glue.c | 1 + arch/x86/crypto/aesni-intel_glue.c | 1 + arch/x86/kernel/cpu/amd.c | 1 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + arch/x86/kernel/devicetree.c | 1 + arch/x86/kernel/e820.c | 1 + arch/x86/kernel/hpet.c | 1 + arch/x86/kernel/irq.c | 1 + arch/x86/kernel/pci-dma.c | 1 + arch/x86/kernel/probe_roms.c | 4 +- arch/x86/kernel/rtc.c | 1 + arch/x86/kernel/smp.c | 1 + arch/x86/kernel/time.c | 1 + arch/x86/kernel/topology.c | 1 + arch/x86/kernel/vsyscall_64.c | 1 + arch/x86/pci/i386.c | 1 + arch/x86/pci/legacy.c | 1 + arch/x86/platform/efi/efi.c | 1 + arch/x86/platform/efi/efi_32.c | 1 + arch/x86/platform/mrst/vrtc.c | 1 + arch/x86/platform/olpc/olpc-xo1-pm.c | 1 + arch/x86/platform/uv/bios_uv.c | 1 + arch/x86/power/cpu.c | 1 + arch/x86/video/fbdev.c | 1 + block/blk-integrity.c | 1 + block/ioctl.c | 1 + crypto/async_tx/async_memcpy.c | 1 + crypto/async_tx/async_pq.c | 1 + crypto/async_tx/async_raid6_recov.c | 1 + crypto/async_tx/async_tx.c | 1 + crypto/async_tx/async_xor.c | 1 + crypto/async_tx/raid6test.c | 1 + crypto/crypto_wq.c | 1 + crypto/md4.c | 1 + crypto/proc.c | 1 + crypto/vmac.c | 1 + crypto/xcbc.c | 1 + drivers/acpi/acpica/hwsleep.c | 1 + drivers/acpi/ec_sys.c | 1 + drivers/acpi/sbshc.c | 1 + drivers/acpi/sysfs.c | 2 +- drivers/ata/libata-eh.c | 1 + drivers/ata/libata-pmp.c | 1 + drivers/ata/libata-scsi.c | 1 + drivers/ata/libata-sff.c | 1 + drivers/base/base.h | 1 + drivers/base/dma-coherent.c | 1 + drivers/base/dma-mapping.c | 1 + drivers/base/hypervisor.c | 1 + drivers/base/power/generic_ops.c | 1 + drivers/base/power/main.c | 1 + drivers/base/power/runtime.c | 1 + drivers/base/power/sysfs.c | 1 + drivers/base/power/trace.c | 1 + drivers/base/power/wakeup.c | 1 + drivers/base/transport_class.c | 1 + drivers/bcma/core.c | 1 + drivers/bcma/driver_chipcommon.c | 1 + drivers/bcma/driver_pci.c | 1 + drivers/bcma/host_pci.c | 1 + drivers/bcma/main.c | 1 + drivers/block/aoe/aoechr.c | 1 + drivers/block/ps3disk.c | 1 + drivers/block/ps3vram.c | 1 + drivers/block/virtio_blk.c | 1 + drivers/char/hw_random/virtio-rng.c | 1 + drivers/char/ramoops.c | 1 + drivers/char/ttyprintk.c | 1 + drivers/char/virtio_console.c | 1 + drivers/clocksource/sh_cmt.c | 1 + drivers/clocksource/sh_mtu2.c | 1 + drivers/clocksource/sh_tmu.c | 1 + drivers/cpufreq/cpufreq_stats.c | 1 + drivers/cpufreq/s3c64xx-cpufreq.c | 1 + drivers/crypto/mv_cesa.c | 1 + drivers/dca/dca-core.c | 1 + drivers/dca/dca-sysfs.c | 1 + drivers/dma/intel_mid_dma.c | 1 + drivers/dma/ipu/ipu_idmac.c | 1 + drivers/dma/ste_dma40.c | 1 + drivers/edac/mce_amd_inj.c | 1 + drivers/firewire/core-iso.c | 1 + drivers/firmware/google/gsmi.c | 1 + drivers/firmware/sigma.c | 1 + drivers/gpio/gpio-74x164.c | 1 + drivers/gpio/gpio-ep93xx.c | 1 + drivers/gpio/gpio-mc33880.c | 1 + drivers/gpio/gpio-mcp23s08.c | 1 + drivers/gpio/gpio-ml-ioh.c | 1 + drivers/gpio/gpio-mpc5200.c | 1 + drivers/gpio/gpio-mxc.c | 1 + drivers/gpio/gpio-mxs.c | 1 + drivers/gpio/gpio-pcf857x.c | 1 + drivers/gpio/gpio-pch.c | 1 + drivers/gpio/gpio-xilinx.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + drivers/hid/hid-axff.c | 1 + drivers/hid/hid-debug.c | 1 + drivers/hid/hid-dr.c | 1 + drivers/hid/hid-emsff.c | 1 + drivers/hid/hid-gaff.c | 1 + drivers/hid/hid-holtekff.c | 1 + drivers/hid/hid-picolcd.c | 1 + drivers/hid/hid-pl.c | 1 + drivers/hid/hid-roccat-common.c | 1 + drivers/hid/hid-roccat.c | 1 + drivers/hid/hid-sjoy.c | 1 + drivers/hid/hid-tmff.c | 1 + drivers/hid/hid-zpff.c | 1 + drivers/hid/usbhid/hid-quirks.c | 1 + drivers/hwmon/ultra45_env.c | 1 + drivers/i2c/busses/i2c-pxa-pci.c | 1 + drivers/i2c/busses/i2c-sh7760.c | 1 + drivers/i2c/busses/i2c-tegra.c | 1 + drivers/i2c/i2c-boardinfo.c | 1 + drivers/ide/buddha.c | 1 + drivers/ide/cmd640.c | 1 + drivers/ide/ide-acpi.c | 1 + drivers/ide/ide-atapi.c | 1 + drivers/ide/ide-disk_proc.c | 1 + drivers/ide/ide-dma-sff.c | 1 + drivers/ide/ide-dma.c | 1 + drivers/ide/ide-eh.c | 1 + drivers/ide/ide-floppy_proc.c | 1 + drivers/ide/ide-io-std.c | 1 + drivers/ide/ide-ioctls.c | 1 + drivers/ide/ide-legacy.c | 1 + drivers/ide/ide-lib.c | 1 + drivers/ide/ide-pnp.c | 1 + drivers/ide/ide-taskfile.c | 1 + drivers/ide/ide-xfer-mode.c | 1 + drivers/ide/macide.c | 1 + drivers/ide/pmac.c | 1 + drivers/ide/q40ide.c | 1 + drivers/ide/setup-pci.c | 1 + drivers/ide/tc86c001.c | 1 + drivers/idle/intel_idle.c | 1 + drivers/infiniband/core/cm.c | 1 + drivers/infiniband/core/fmr_pool.c | 1 + drivers/infiniband/core/mad.c | 1 + drivers/infiniband/core/multicast.c | 1 + drivers/infiniband/core/packer.c | 1 + drivers/infiniband/core/sysfs.c | 1 + drivers/infiniband/core/ud_header.c | 1 + drivers/infiniband/core/umem.c | 1 + drivers/infiniband/core/uverbs_marshall.c | 1 + drivers/infiniband/core/verbs.c | 1 + drivers/infiniband/hw/ipath/ipath_diag.c | 1 + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 + drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + drivers/infiniband/hw/mthca/mthca_catas.c | 1 + drivers/infiniband/hw/mthca/mthca_cmd.c | 1 + drivers/infiniband/hw/mthca/mthca_provider.c | 2 + drivers/infiniband/hw/qib/qib_diag.c | 1 + drivers/infiniband/hw/qib/qib_file_ops.c | 1 + drivers/infiniband/hw/qib/qib_iba7220.c | 1 + drivers/infiniband/hw/qib/qib_iba7322.c | 1 + drivers/infiniband/hw/qib/qib_pcie.c | 1 + drivers/infiniband/hw/qib/qib_sd7220.c | 1 + drivers/infiniband/hw/qib/qib_verbs.c | 1 + drivers/input/input-compat.c | 1 + drivers/input/input-mt.c | 1 + drivers/input/input-polldev.c | 1 + drivers/input/joystick/as5011.c | 1 + drivers/input/keyboard/nomadik-ske-keypad.c | 1 + drivers/input/keyboard/tnetv107x-keypad.c | 1 + drivers/input/misc/ad714x.c | 1 + drivers/input/misc/adxl34x.c | 1 + drivers/input/misc/ati_remote2.c | 1 + drivers/input/misc/cma3000_d0x.c | 1 + drivers/input/misc/dm355evm_keys.c | 1 + drivers/input/sparse-keymap.c | 1 + drivers/input/touchscreen/ad7877.c | 1 + drivers/input/touchscreen/ad7879-spi.c | 1 + drivers/input/touchscreen/ad7879.c | 1 + drivers/input/touchscreen/ads7846.c | 1 + drivers/input/touchscreen/bu21013_ts.c | 1 + drivers/isdn/capi/kcapi_proc.c | 1 + drivers/leds/dell-led.c | 1 + drivers/leds/leds-88pm860x.c | 1 + drivers/leds/leds-asic3.c | 1 + drivers/leds/leds-atmel-pwm.c | 1 + drivers/leds/leds-cobalt-raq.c | 1 + drivers/leds/leds-fsg.c | 1 + drivers/leds/leds-gpio.c | 1 + drivers/leds/leds-lm3530.c | 1 + drivers/leds/leds-locomo.c | 1 + drivers/leds/leds-lt3593.c | 1 + drivers/leds/leds-net48xx.c | 1 + drivers/leds/leds-net5501.c | 1 + drivers/leds/leds-ns2.c | 1 + drivers/leds/leds-s3c24xx.c | 1 + drivers/leds/leds-wm831x-status.c | 1 + drivers/leds/leds-wm8350.c | 1 + drivers/leds/leds-wrap.c | 1 + drivers/lguest/lguest_device.c | 1 + drivers/md/dm-exception-store.c | 1 + drivers/md/dm-log-userspace-base.c | 1 + drivers/md/dm-path-selector.c | 1 + drivers/md/dm-raid.c | 1 + drivers/md/dm-round-robin.c | 1 + drivers/md/dm-service-time.c | 1 + drivers/md/dm-snap-persistent.c | 1 + drivers/md/dm-snap-transient.c | 1 + drivers/md/dm-uevent.c | 1 + drivers/md/faulty.c | 1 + drivers/md/linear.c | 1 + drivers/md/md.c | 1 + drivers/md/multipath.c | 1 + drivers/md/raid0.c | 1 + drivers/md/raid1.c | 1 + drivers/md/raid10.c | 1 + drivers/md/raid5.c | 1 + drivers/media/common/saa7146_core.c | 1 + drivers/media/common/saa7146_fops.c | 1 + drivers/media/common/saa7146_hlp.c | 1 + drivers/media/common/saa7146_video.c | 1 + drivers/media/common/tuners/tuner-types.c | 1 + drivers/media/dvb/frontends/dibx000_common.c | 1 + drivers/media/dvb/siano/sms-cards.c | 1 + drivers/media/dvb/siano/smsendian.c | 1 + drivers/media/dvb/siano/smssdio.c | 1 + drivers/media/dvb/siano/smsusb.c | 1 + drivers/media/media-device.c | 1 + drivers/media/radio/radio-timb.c | 1 + drivers/media/radio/radio-wl1273.c | 1 + drivers/media/radio/si4713-i2c.c | 1 + drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 + drivers/media/rc/ir-jvc-decoder.c | 1 + drivers/media/rc/ir-lirc-codec.c | 1 + drivers/media/rc/ir-nec-decoder.c | 1 + drivers/media/rc/ir-raw.c | 2 + drivers/media/rc/ir-rc5-decoder.c | 1 + drivers/media/rc/ir-rc5-sz-decoder.c | 1 + drivers/media/rc/ir-rc6-decoder.c | 1 + drivers/media/rc/ir-sony-decoder.c | 1 + drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 + drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 + drivers/media/rc/keymaps/rc-anysee.c | 1 + drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 + drivers/media/rc/keymaps/rc-asus-pc39.c | 1 + drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 + drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 + drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 + drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 + .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 + drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 + drivers/media/rc/keymaps/rc-avermedia.c | 1 + drivers/media/rc/keymaps/rc-avertv-303.c | 1 + drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 + drivers/media/rc/keymaps/rc-behold-columbus.c | 1 + drivers/media/rc/keymaps/rc-behold.c | 1 + drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 + drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 + drivers/media/rc/keymaps/rc-cinergy.c | 1 + drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 + drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 + drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 + drivers/media/rc/keymaps/rc-digittrade.c | 1 + drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 + drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 + drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 + drivers/media/rc/keymaps/rc-em-terratec.c | 1 + drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 + drivers/media/rc/keymaps/rc-encore-enltv.c | 1 + drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 + drivers/media/rc/keymaps/rc-evga-indtube.c | 1 + drivers/media/rc/keymaps/rc-eztv.c | 1 + drivers/media/rc/keymaps/rc-flydvb.c | 1 + drivers/media/rc/keymaps/rc-flyvideo.c | 1 + drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 + drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 + drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 + drivers/media/rc/keymaps/rc-gotview7135.c | 1 + drivers/media/rc/keymaps/rc-hauppauge.c | 1 + drivers/media/rc/keymaps/rc-imon-mce.c | 1 + drivers/media/rc/keymaps/rc-imon-pad.c | 1 + drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 + drivers/media/rc/keymaps/rc-kaiomy.c | 1 + drivers/media/rc/keymaps/rc-kworld-315u.c | 1 + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 + drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 + drivers/media/rc/keymaps/rc-lirc.c | 1 + drivers/media/rc/keymaps/rc-lme2510.c | 1 + drivers/media/rc/keymaps/rc-manli.c | 1 + drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 + drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 + drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 + drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 + drivers/media/rc/keymaps/rc-nebula.c | 1 + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 + drivers/media/rc/keymaps/rc-norwood.c | 1 + drivers/media/rc/keymaps/rc-npgtech.c | 1 + drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 + drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 + drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 + drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 + drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 + drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 + drivers/media/rc/keymaps/rc-pixelview-new.c | 1 + drivers/media/rc/keymaps/rc-pixelview.c | 1 + .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 + drivers/media/rc/keymaps/rc-proteus-2309.c | 1 + drivers/media/rc/keymaps/rc-purpletv.c | 1 + drivers/media/rc/keymaps/rc-pv951.c | 1 + drivers/media/rc/keymaps/rc-rc6-mce.c | 1 + .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 + drivers/media/rc/keymaps/rc-streamzap.c | 1 + drivers/media/rc/keymaps/rc-tbs-nec.c | 1 + drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 + drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 + drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 + drivers/media/rc/keymaps/rc-terratec-slim.c | 1 + drivers/media/rc/keymaps/rc-tevii-nec.c | 1 + drivers/media/rc/keymaps/rc-tivo.c | 1 + drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 + drivers/media/rc/keymaps/rc-trekstor.c | 1 + drivers/media/rc/keymaps/rc-tt-1500.c | 1 + drivers/media/rc/keymaps/rc-twinhan1027.c | 1 + drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 + drivers/media/rc/keymaps/rc-videomate-s350.c | 1 + drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 + drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 + drivers/media/rc/keymaps/rc-winfast.c | 1 + drivers/media/rc/rc-main.c | 1 + drivers/media/video/adp1653.c | 1 + drivers/media/video/ak881x.c | 1 + drivers/media/video/cpia2/cpia2_usb.c | 1 + drivers/media/video/cx25840/cx25840-ir.c | 1 + drivers/media/video/davinci/dm355_ccdc.c | 1 + drivers/media/video/davinci/dm644x_ccdc.c | 1 + drivers/media/video/hdpvr/hdpvr-i2c.c | 1 + drivers/media/video/hexium_gemini.c | 1 + drivers/media/video/hexium_orion.c | 1 + drivers/media/video/imx074.c | 1 + drivers/media/video/m5mols/m5mols_core.c | 1 + drivers/media/video/mt9m001.c | 1 + drivers/media/video/mt9m111.c | 1 + drivers/media/video/mt9t031.c | 1 + drivers/media/video/mt9v011.c | 1 + drivers/media/video/mt9v022.c | 1 + drivers/media/video/mt9v032.c | 1 + drivers/media/video/mxb.c | 1 + drivers/media/video/noon010pc30.c | 1 + drivers/media/video/omap24xxcam.c | 1 + drivers/media/video/ov6650.c | 1 + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 1 + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 + drivers/media/video/rj54n1cb0c.c | 1 + drivers/media/video/sh_mobile_csi2.c | 1 + drivers/media/video/sh_vou.c | 1 + drivers/media/video/sr030pc30.c | 1 + drivers/media/video/tcm825x.c | 1 + drivers/media/video/timblogiw.c | 1 + drivers/media/video/tvp514x.c | 1 + drivers/media/video/tvp5150.c | 1 + drivers/media/video/tvp7002.c | 1 + drivers/media/video/usbvision/usbvision-cards.c | 1 + drivers/media/video/v4l2-ctrls.c | 1 + drivers/media/video/v4l2-device.c | 1 + drivers/media/video/v4l2-event.c | 1 + drivers/media/video/v4l2-fh.c | 1 + drivers/media/video/v4l2-int-device.c | 1 + drivers/media/video/v4l2-subdev.c | 1 + drivers/memstick/core/memstick.c | 1 + drivers/memstick/core/mspro_block.c | 1 + drivers/memstick/host/jmb38x_ms.c | 1 + drivers/memstick/host/tifm_ms.c | 1 + drivers/message/i2o/pci.c | 1 + drivers/mfd/ab3100-core.c | 1 + drivers/mfd/ab3550-core.c | 1 + drivers/mfd/ab8500-debugfs.c | 1 + drivers/mfd/ab8500-sysctrl.c | 1 + drivers/mfd/abx500-core.c | 1 + drivers/mfd/asic3.c | 1 + drivers/mfd/dm355evm_msp.c | 1 + drivers/mfd/max8997.c | 1 + drivers/mfd/mfd-core.c | 1 + drivers/mfd/pcf50633-irq.c | 1 + drivers/mfd/tmio_core.c | 1 + drivers/mfd/twl-core.c | 1 + drivers/mfd/twl6030-irq.c | 1 + drivers/mfd/wl1273-core.c | 1 + drivers/mfd/wm8400-core.c | 1 + drivers/misc/ab8500-pwm.c | 1 + drivers/misc/atmel-ssc.c | 1 + drivers/misc/atmel_tclib.c | 1 + drivers/misc/bh1780gli.c | 1 + drivers/misc/kgdbts.c | 1 + drivers/misc/ti-st/st_kim.c | 1 + drivers/misc/tifm_7xx1.c | 1 + drivers/misc/tifm_core.c | 1 + drivers/mmc/card/mmc_test.c | 1 + drivers/mmc/core/bus.c | 2 + drivers/mmc/core/debugfs.c | 1 + drivers/mmc/core/host.c | 1 + drivers/mmc/core/mmc.c | 1 + drivers/mmc/core/mmc_ops.c | 1 + drivers/mmc/core/quirks.c | 1 + drivers/mmc/core/sd.c | 1 + drivers/mmc/core/sd_ops.c | 1 + drivers/mmc/core/sdio_bus.c | 1 + drivers/mmc/core/sdio_io.c | 1 + drivers/mmc/core/sdio_irq.c | 1 + drivers/mmc/host/mmc_spi.c | 1 + drivers/mmc/host/mxs-mmc.c | 1 + drivers/mmc/host/sdhci-of-esdhc.c | 1 + drivers/mmc/host/sdhci-of-hlwd.c | 1 + drivers/mmc/host/sdhci-pci.c | 1 + drivers/mmc/host/sdhci-pltfm.c | 1 + drivers/mmc/host/sdhci-pxav2.c | 1 + drivers/mmc/host/sdhci-pxav3.c | 1 + drivers/mmc/host/sdhci-spear.c | 1 + drivers/mmc/host/sdhci-tegra.c | 1 + drivers/mmc/host/sdhci.c | 1 + drivers/mmc/host/sdricoh_cs.c | 1 + drivers/mmc/host/sh_mmcif.c | 1 + drivers/mmc/host/sh_mobile_sdhi.c | 1 + drivers/mmc/host/tifm_sd.c | 1 + drivers/mmc/host/via-sdmmc.c | 1 + drivers/mtd/ar7part.c | 1 + drivers/mtd/cmdlinepart.c | 1 + drivers/mtd/lpddr/lpddr_cmds.c | 1 + drivers/mtd/mtdblock_ro.c | 1 + drivers/mtd/mtdsuper.c | 1 + drivers/mtd/nand/cafe_nand.c | 1 + drivers/mtd/nand/cmx270_nand.c | 1 + drivers/mtd/nand/diskonchip.c | 1 + drivers/mtd/nand/nand_bbt.c | 1 + drivers/mtd/nand/omap2.c | 1 + drivers/mtd/nand/sm_common.c | 1 + drivers/mtd/onenand/onenand_bbt.c | 1 + drivers/mtd/redboot.c | 1 + drivers/mtd/rfd_ftl.c | 1 + drivers/mtd/ubi/vmt.c | 1 + drivers/net/ethernet/mellanox/mlx4/alloc.c | 1 + drivers/net/ethernet/mellanox/mlx4/catas.c | 1 + drivers/net/ethernet/mellanox/mlx4/cmd.c | 1 + drivers/net/ethernet/mellanox/mlx4/cq.c | 1 + drivers/net/ethernet/mellanox/mlx4/eq.c | 1 + drivers/net/ethernet/mellanox/mlx4/fw.c | 1 + drivers/net/ethernet/mellanox/mlx4/intf.c | 1 + drivers/net/ethernet/mellanox/mlx4/mr.c | 1 + drivers/net/ethernet/mellanox/mlx4/pd.c | 1 + drivers/net/ethernet/mellanox/mlx4/port.c | 1 + drivers/net/ethernet/mellanox/mlx4/qp.c | 1 + drivers/net/ethernet/mellanox/mlx4/srq.c | 1 + drivers/net/phy/realtek.c | 1 + drivers/net/wireless/b43/pcmcia.c | 1 + drivers/of/of_pci.c | 1 + drivers/of/of_pci_irq.c | 1 + drivers/of/of_spi.c | 1 + drivers/parisc/ccio-dma.c | 1 + drivers/parisc/sba_iommu.c | 1 + drivers/pci/hotplug-pci.c | 1 + drivers/pci/hotplug/pciehp_acpi.c | 1 + drivers/pci/hotplug/pcihp_slot.c | 1 + drivers/pci/hotplug/rpadlpar_core.c | 1 + drivers/pci/htirq.c | 1 + drivers/pci/iov.c | 1 + drivers/pci/irq.c | 1 + drivers/pci/msi.c | 1 + drivers/pci/pci-sysfs.c | 1 + drivers/pci/quirks.c | 1 + drivers/pci/rom.c | 1 + drivers/pci/setup-res.c | 1 + drivers/pci/slot.c | 1 + drivers/pci/vpd.c | 1 + drivers/pcmcia/db1xxx_ss.c | 1 + drivers/pcmcia/pxa2xx_cm_x255.c | 1 + drivers/pcmcia/pxa2xx_cm_x270.c | 1 + drivers/platform/x86/intel_scu_ipc.c | 1 + drivers/platform/x86/msi-wmi.c | 1 + drivers/platform/x86/wmi.c | 1 + drivers/power/max17042_battery.c | 1 + drivers/power/max8903_charger.c | 1 + drivers/power/max8997_charger.c | 1 + drivers/power/max8998_charger.c | 1 + drivers/power/power_supply_sysfs.c | 1 + drivers/ps3/ps3stor_lib.c | 1 + drivers/ps3/sys-manager-core.c | 1 + drivers/rapidio/switches/idt_gen2.c | 1 + drivers/regulator/88pm8607.c | 1 + drivers/regulator/ab8500.c | 1 + drivers/regulator/bq24022.c | 1 + drivers/regulator/da903x.c | 1 + drivers/regulator/db8500-prcmu.c | 1 + drivers/regulator/dummy.c | 1 + drivers/regulator/fixed.c | 1 + drivers/regulator/lp3971.c | 1 + drivers/regulator/lp3972.c | 1 + drivers/regulator/max8925-regulator.c | 1 + drivers/regulator/max8997.c | 1 + drivers/regulator/mc13783-regulator.c | 1 + drivers/regulator/mc13892-regulator.c | 1 + drivers/regulator/mc13xxx-regulator-core.c | 1 + drivers/regulator/tps6586x-regulator.c | 1 + drivers/regulator/userspace-consumer.c | 1 + drivers/regulator/virtual.c | 1 + drivers/regulator/wm8400-regulator.c | 1 + drivers/rtc/interface.c | 1 + drivers/rtc/rtc-dm355evm.c | 1 + drivers/rtc/rtc-ds1305.c | 1 + drivers/rtc/rtc-ds1511.c | 1 + drivers/rtc/rtc-ds1553.c | 1 + drivers/rtc/rtc-ds1672.c | 1 + drivers/rtc/rtc-ds1742.c | 1 + drivers/rtc/rtc-em3027.c | 1 + drivers/rtc/rtc-isl12022.c | 1 + drivers/rtc/rtc-mv.c | 1 + drivers/rtc/rtc-pcf2123.c | 1 + drivers/rtc/rtc-pcf8563.c | 1 + drivers/rtc/rtc-rs5c348.c | 1 + drivers/rtc/rtc-rs5c372.c | 1 + drivers/rtc/rtc-stk17ta8.c | 1 + drivers/rtc/rtc-tx4939.c | 1 + drivers/rtc/rtc-x1205.c | 1 + drivers/s390/char/fs3270.c | 1 + drivers/s390/char/sclp_cpi_sys.c | 1 + drivers/s390/char/vmur.c | 1 + drivers/s390/cio/chp.c | 2 + drivers/s390/cio/qdio_debug.c | 2 + drivers/s390/kvm/kvm_virtio.c | 1 + drivers/s390/scsi/zfcp_ccw.c | 1 + drivers/s390/scsi/zfcp_dbf.c | 1 + drivers/s390/scsi/zfcp_scsi.c | 1 + drivers/scsi/a2091.c | 1 + drivers/scsi/a3000.c | 1 + drivers/scsi/aacraid/aachba.c | 1 + drivers/scsi/bfa/bfad_debugfs.c | 1 + drivers/scsi/bfa/bfad_im.c | 2 + drivers/scsi/device_handler/scsi_dh.c | 1 + drivers/scsi/device_handler/scsi_dh_alua.c | 1 + drivers/scsi/device_handler/scsi_dh_emc.c | 1 + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 + drivers/scsi/device_handler/scsi_dh_rdac.c | 1 + drivers/scsi/gvp11.c | 1 + drivers/scsi/libfc/fc_disc.c | 1 + drivers/scsi/libfc/fc_elsct.c | 1 + drivers/scsi/libfc/fc_exch.c | 1 + drivers/scsi/libfc/fc_libfc.c | 1 + drivers/scsi/libfc/fc_lport.c | 1 + drivers/scsi/libfc/fc_npiv.c | 1 + drivers/scsi/libfc/fc_rport.c | 1 + drivers/scsi/libsas/sas_scsi_host.c | 1 + drivers/scsi/libsas/sas_task.c | 1 + drivers/scsi/libsrp.c | 1 + drivers/scsi/lpfc/lpfc_attr.c | 1 + drivers/scsi/lpfc/lpfc_debugfs.c | 1 + drivers/scsi/lpfc/lpfc_init.c | 1 + drivers/scsi/lpfc/lpfc_scsi.c | 1 + drivers/scsi/mac53c94.c | 1 + drivers/scsi/megaraid/megaraid_mbox.c | 1 + drivers/scsi/osd/osd_initiator.c | 1 + drivers/scsi/ps3rom.c | 1 + drivers/scsi/scsi_lib.c | 1 + drivers/scsi/scsi_lib_dma.c | 1 + drivers/scsi/scsi_pm.c | 1 + drivers/scsi/sr_ioctl.c | 1 + drivers/sfi/sfi_core.h | 3 + drivers/sh/intc/core.c | 1 + drivers/sh/intc/virq.c | 1 + drivers/sh/maple/maple.c | 1 + drivers/spi/spi-altera.c | 1 + drivers/spi/spi-au1550.c | 1 + drivers/spi/spi-bitbang.c | 1 + drivers/spi/spi-butterfly.c | 1 + drivers/spi/spi-dw-mmio.c | 1 + drivers/spi/spi-dw-pci.c | 1 + drivers/spi/spi-dw.c | 1 + drivers/spi/spi-gpio.c | 1 + drivers/spi/spi-oc-tiny.c | 1 + drivers/spi/spi-omap-uwire.c | 1 + drivers/spi/spi-orion.c | 1 + drivers/spi/spi-pxa2xx-pci.c | 1 + drivers/spi/spi-s3c24xx.c | 1 + drivers/spi/spi-sh-msiof.c | 1 + drivers/spi/spi-sh-sci.c | 1 + drivers/spi/spi-ti-ssp.c | 1 + drivers/spi/spi-tle62x0.c | 1 + drivers/spi/spi-txx9.c | 1 + drivers/spi/spi.c | 1 + drivers/ssb/b43_pci_bridge.c | 1 + drivers/ssb/driver_chipcommon.c | 1 + drivers/ssb/driver_chipcommon_pmu.c | 1 + drivers/ssb/driver_gige.c | 1 + drivers/ssb/driver_pcicore.c | 1 + drivers/ssb/embedded.c | 1 + drivers/ssb/main.c | 1 + drivers/ssb/pcihost_wrapper.c | 1 + drivers/staging/brcm80211/brcmutil/wifi.c | 1 + drivers/staging/iio/industrialio-ring.c | 1 + .../staging/intel_sst/intel_sst_drv_interface.c | 1 + drivers/staging/line6/audio.c | 1 + drivers/staging/usbip/usbip_event.c | 1 + drivers/tty/hvc/hvc_iseries.c | 1 + drivers/tty/hvc/hvc_vio.c | 1 + drivers/tty/serial/jsm/jsm_driver.c | 2 +- drivers/tty/serial/kgdboc.c | 1 + drivers/tty/serial/max3100.c | 1 + drivers/tty/serial/max3107-aava.c | 1 + drivers/tty/serial/max3107.c | 1 + drivers/tty/serial/nwpserial.c | 1 + drivers/tty/serial/timbuart.c | 1 + drivers/tty/serial/xilinx_uartps.c | 1 + drivers/tty/vt/vc_screen.c | 1 + drivers/uio/uio_pdrv.c | 1 + drivers/uio/uio_pdrv_genirq.c | 1 + drivers/usb/c67x00/c67x00-drv.c | 1 + drivers/usb/core/driver.c | 1 + drivers/usb/core/notify.c | 1 + drivers/usb/gadget/cdc2.c | 1 + drivers/usb/gadget/composite.c | 1 + drivers/usb/gadget/dbgp.c | 1 + drivers/usb/gadget/f_fs.c | 1 + drivers/usb/gadget/f_obex.c | 1 + drivers/usb/gadget/f_sourcesink.c | 1 + drivers/usb/gadget/file_storage.c | 1 + drivers/usb/gadget/fusb300_udc.c | 1 + drivers/usb/gadget/gmidi.c | 1 + drivers/usb/gadget/u_serial.c | 1 + drivers/usb/host/fsl-mph-dr-of.c | 1 + drivers/usb/host/isp1760-if.c | 1 + drivers/usb/host/pci-quirks.c | 1 + drivers/usb/host/whci/debug.c | 1 + drivers/usb/host/whci/hcd.c | 1 + drivers/usb/host/xhci-hub.c | 1 + drivers/usb/host/xhci-pci.c | 1 + drivers/usb/mon/mon_bin.c | 1 + drivers/usb/mon/mon_stat.c | 1 + drivers/usb/mon/mon_text.c | 1 + drivers/usb/otg/gpio_vbus.c | 1 + drivers/usb/otg/otg.c | 1 + drivers/usb/otg/ulpi.c | 1 + drivers/usb/serial/aircable.c | 1 + drivers/usb/serial/qcserial.c | 1 + drivers/usb/storage/option_ms.c | 1 + drivers/usb/storage/protocol.c | 1 + drivers/usb/storage/sierra_ms.c | 1 + drivers/usb/storage/transport.c | 1 + drivers/usb/storage/uas.c | 1 + drivers/usb/wusbcore/devconnect.c | 1 + drivers/usb/wusbcore/mmc.c | 1 + drivers/usb/wusbcore/rh.c | 1 + drivers/usb/wusbcore/security.c | 1 + drivers/usb/wusbcore/wa-hc.c | 1 + drivers/usb/wusbcore/wa-rpipe.c | 1 + drivers/usb/wusbcore/wa-xfer.c | 1 + drivers/uwb/est.c | 1 + drivers/uwb/i1480/dfu/dfu.c | 1 + drivers/uwb/ie.c | 1 + drivers/uwb/lc-dev.c | 2 + drivers/uwb/neh.c | 1 + drivers/uwb/pal.c | 1 + drivers/uwb/radio.c | 1 + drivers/uwb/reset.c | 1 + drivers/uwb/rsv.c | 1 + drivers/uwb/scan.c | 1 + drivers/uwb/umc-bus.c | 1 + drivers/uwb/umc-dev.c | 1 + drivers/uwb/umc-drv.c | 1 + drivers/uwb/whci.c | 1 + drivers/video/atmel_lcdfb.c | 1 + drivers/video/backlight/88pm860x_bl.c | 1 + drivers/video/backlight/adp5520_bl.c | 1 + drivers/video/backlight/ams369fg06.c | 1 + drivers/video/backlight/da903x_bl.c | 1 + drivers/video/backlight/ep93xx_bl.c | 1 + drivers/video/backlight/l4f00242t03.c | 1 + drivers/video/backlight/ld9040.c | 1 + drivers/video/backlight/lms283gf05.c | 1 + drivers/video/backlight/max8925_bl.c | 1 + drivers/video/backlight/s6e63m0.c | 1 + drivers/video/backlight/wm831x_bl.c | 1 + drivers/video/carminefb.c | 1 + drivers/video/cobalt_lcdfb.c | 1 + drivers/video/ep93xx-fb.c | 1 + drivers/video/fb_ddc.c | 3 +- drivers/video/fb_notify.c | 1 + drivers/video/mb862xx/mb862xx-i2c.c | 1 + drivers/video/mb862xx/mb862xxfbdrv.c | 1 + drivers/video/msm/mdp.c | 1 + drivers/video/omap/lcd_mipid.c | 1 + drivers/video/omap/omapfb_main.c | 1 + drivers/video/omap2/dss/dispc.c | 1 + drivers/video/omap2/dss/dpi.c | 1 + drivers/video/omap2/dss/dsi.c | 1 + drivers/video/omap2/dss/dss.c | 1 + drivers/video/omap2/dss/rfbi.c | 1 + drivers/video/omap2/dss/sdi.c | 1 + drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 + drivers/video/savage/savagefb_accel.c | 1 + drivers/video/sh_mipi_dsi.c | 1 + drivers/video/sh_mobile_lcdcfb.c | 1 + drivers/video/via/via-gpio.c | 1 + drivers/video/w100fb.c | 1 + drivers/virtio/virtio.c | 1 + drivers/virtio/virtio_balloon.c | 1 + drivers/virtio/virtio_ring.c | 1 + drivers/w1/w1_family.c | 1 + drivers/xen/balloon.c | 1 + drivers/xen/manage.c | 1 + drivers/xen/swiotlb-xen.c | 1 + drivers/xen/xen-pciback/conf_space.c | 1 + drivers/xen/xen-selfballoon.c | 2 + drivers/xen/xenbus/xenbus_client.c | 1 + drivers/xen/xenbus/xenbus_probe.c | 1 + drivers/xen/xenbus/xenbus_probe_backend.c | 1 + drivers/xen/xenbus/xenbus_probe_frontend.c | 1 + drivers/zorro/proc.c | 1 + fs/bio-integrity.c | 1 + fs/exofs/super.c | 1 + fs/gfs2/ops_fstype.c | 1 + fs/ioprio.c | 1 + fs/jfs/jfs_logmgr.c | 1 + fs/logfs/super.c | 1 + fs/nfsd/nfssvc.c | 1 + fs/proc/vmcore.c | 1 + include/acpi/platform/aclinux.h | 2 +- include/drm/drmP.h | 3 +- include/linux/bcma/bcma.h | 7 +- include/linux/blkdev.h | 2 +- include/linux/cpuidle.h | 3 +- include/linux/crypto.h | 6 -- include/linux/device.h | 15 ++- include/linux/device_cgroup.h | 1 - include/linux/dmaengine.h | 2 + include/linux/export.h | 89 ++++++++++++++++++++ include/linux/firmware.h | 2 +- include/linux/ftrace.h | 2 +- include/linux/gameport.h | 17 ++-- include/linux/hid.h | 9 +- include/linux/i2c.h | 10 +- include/linux/ipmi.h | 3 +- include/linux/ipmi_smi.h | 1 - include/linux/mdio-bitbang.h | 3 +- include/linux/module.h | 68 +--------------- include/linux/mtd/mtd.h | 3 +- include/linux/of_platform.h | 1 - include/linux/pci_hotplug.h | 10 +-- include/linux/pm_runtime.h | 1 + include/linux/regulator/driver.h | 1 + include/linux/serio.h | 20 +++-- include/linux/ssb/ssb.h | 7 +- include/linux/stop_machine.h | 1 + include/linux/sunrpc/svc_xprt.h | 3 +- include/linux/sysdev.h | 1 - include/linux/textsearch.h | 3 +- include/linux/uio_driver.h | 12 ++-- include/linux/usb.h | 9 +- include/linux/uwb.h | 1 + include/linux/uwb/umc.h | 7 +- include/linux/vermagic.h | 1 - include/linux/vlynq.h | 3 +- include/media/saa7146.h | 3 +- include/media/v4l2-int-device.h | 3 +- include/net/inet_timewait_sock.h | 1 - include/net/lib80211.h | 3 +- include/net/sch_generic.h | 1 - include/net/sock.h | 2 +- include/sound/core.h | 2 +- include/trace/define_trace.h | 2 +- include/trace/events/module.h | 2 +- include/xen/xenbus.h | 1 + kernel/async.c | 2 +- kernel/audit.c | 2 +- kernel/auditsc.c | 2 +- kernel/capability.c | 2 +- kernel/cgroup_freezer.c | 2 +- kernel/compat.c | 1 + kernel/cpu.c | 2 +- kernel/cpuset.c | 2 +- kernel/crash_dump.c | 2 +- kernel/cred.c | 2 +- kernel/debug/kdb/kdb_debugger.c | 1 + kernel/dma.c | 2 +- kernel/events/core.c | 1 + kernel/exit.c | 3 +- kernel/fork.c | 3 +- kernel/freezer.c | 2 +- kernel/futex.c | 2 +- kernel/groups.c | 2 +- kernel/hrtimer.c | 2 +- kernel/hung_task.c | 2 +- kernel/irq_work.c | 4 +- kernel/kfifo.c | 2 +- kernel/kprobes.c | 2 +- kernel/ksysfs.c | 3 +- kernel/kthread.c | 2 +- kernel/latencytop.c | 2 +- kernel/lockdep.c | 2 +- kernel/lockdep_proc.c | 2 +- kernel/module.c | 2 +- kernel/mutex-debug.c | 2 +- kernel/mutex.c | 2 +- kernel/notifier.c | 2 +- kernel/nsproxy.c | 2 +- kernel/padata.c | 2 +- kernel/params.c | 4 +- kernel/pid.c | 2 +- kernel/posix-timers.c | 2 +- kernel/power/hibernate.c | 1 + kernel/power/main.c | 1 + kernel/power/suspend.c | 2 + kernel/profile.c | 2 +- kernel/ptrace.c | 2 +- kernel/range.c | 2 +- kernel/rcupdate.c | 2 +- kernel/rcutiny.c | 4 +- kernel/rcutorture.c | 3 +- kernel/rcutree.c | 2 +- kernel/rcutree_trace.c | 3 +- kernel/relay.c | 2 +- kernel/resource.c | 2 +- kernel/rtmutex-debug.c | 2 +- kernel/rtmutex-tester.c | 2 +- kernel/rtmutex.c | 2 +- kernel/rwsem.c | 2 +- kernel/sched.c | 2 +- kernel/sched_clock.c | 2 +- kernel/semaphore.c | 2 +- kernel/signal.c | 2 +- kernel/smp.c | 2 +- kernel/softirq.c | 2 +- kernel/spinlock.c | 2 +- kernel/srcu.c | 2 +- kernel/stacktrace.c | 2 +- kernel/stop_machine.c | 2 +- kernel/sys.c | 3 +- kernel/sysctl.c | 2 +- kernel/time.c | 2 +- kernel/time/posix-clock.c | 1 + kernel/timer.c | 2 +- kernel/trace/blktrace.c | 1 + kernel/trace/ftrace.c | 1 + kernel/trace/trace_syscalls.c | 1 + kernel/up.c | 2 +- kernel/user-return-notifier.c | 2 +- kernel/user.c | 2 +- kernel/user_namespace.c | 2 +- kernel/utsname.c | 2 +- kernel/utsname_sysctl.c | 2 +- kernel/wait.c | 2 +- kernel/watchdog.c | 3 +- kernel/workqueue.c | 2 +- lib/dma-debug.c | 1 + lib/raid6/algos.c | 1 + lib/raid6/mktables.c | 1 + lib/raid6/recov.c | 1 + mm/fremap.c | 1 - mm/memcontrol.c | 1 + mm/memory-failure.c | 1 + mm/mmzone.c | 1 - mm/quicklist.c | 1 - mm/sparse-vmemmap.c | 1 - mm/swap_state.c | 1 - mm/swapfile.c | 1 - net/caif/cfpkt_skbuff.c | 1 + net/netfilter/ipset/pfxlen.c | 1 + net/rfkill/input.c | 1 + security/selinux/netlink.c | 1 + sound/core/control.c | 1 + sound/core/device.c | 1 + sound/core/hwdep.c | 1 + sound/core/info.c | 1 + sound/core/info_oss.c | 1 + sound/core/init.c | 1 + sound/core/isadma.c | 1 + sound/core/jack.c | 1 + sound/core/memory.c | 1 + sound/core/misc.c | 1 + sound/core/oss/mixer_oss.c | 1 + sound/core/rawmidi.c | 1 + sound/core/seq/oss/seq_oss.c | 2 +- sound/core/seq/oss/seq_oss_init.c | 2 +- sound/core/seq/oss/seq_oss_synth.c | 1 + sound/core/seq/seq.c | 2 +- sound/core/seq/seq_clientmgr.c | 1 + sound/core/seq/seq_device.c | 1 + sound/core/seq/seq_dummy.c | 2 +- sound/core/seq/seq_info.c | 1 + sound/core/seq/seq_lock.c | 1 + sound/core/seq/seq_memory.c | 1 + sound/core/seq/seq_midi.c | 2 +- sound/core/seq/seq_midi_emul.c | 1 + sound/core/seq/seq_midi_event.c | 1 + sound/core/seq/seq_ports.c | 1 + sound/core/seq/seq_system.c | 1 + sound/core/seq/seq_virmidi.c | 1 + sound/core/sound.c | 2 +- sound/core/sound_oss.c | 1 + sound/core/timer.c | 2 +- sound/core/vmaster.c | 1 + sound/drivers/mpu401/mpu401.c | 2 +- sound/drivers/mpu401/mpu401_uart.c | 1 + sound/drivers/mtpav.c | 1 + sound/drivers/mts64.c | 1 + sound/drivers/opl3/opl3_lib.c | 1 + sound/drivers/opl3/opl3_oss.c | 1 + sound/drivers/opl3/opl3_seq.c | 1 + sound/drivers/opl3/opl3_synth.c | 1 + sound/drivers/opl4/opl4_lib.c | 1 + sound/drivers/opl4/opl4_proc.c | 1 + sound/drivers/opl4/opl4_seq.c | 1 + sound/drivers/portman2x4.c | 1 + sound/drivers/serial-u16550.c | 2 +- sound/drivers/virmidi.c | 2 +- sound/firewire/iso-resources.c | 1 + sound/firewire/packets-buffer.c | 1 + sound/i2c/i2c.c | 1 + sound/i2c/other/ak4xxx-adda.c | 1 + sound/i2c/other/pt2258.c | 1 + sound/i2c/other/tea575x-tuner.c | 1 + sound/i2c/tea6330t.c | 1 + sound/isa/sb/emu8000.c | 1 + sound/isa/sb/emu8000_callback.c | 1 + sound/isa/sb/emu8000_patch.c | 1 + sound/isa/sb/emu8000_synth.c | 1 + sound/isa/wavefront/wavefront_fx.c | 1 + sound/isa/wavefront/wavefront_synth.c | 1 + sound/pci/als4000.c | 2 +- sound/pci/asihpi/hpioctl.c | 1 + sound/pci/ctxfi/xfi.c | 1 + sound/pci/oxygen/oxygen_io.c | 1 + sound/soc/blackfin/bf5xx-sport.c | 1 + sound/soc/tegra/tegra_asoc_utils.c | 1 + sound/synth/emux/emux.c | 1 + sound/synth/emux/emux_oss.c | 1 + sound/synth/emux/emux_seq.c | 2 +- sound/synth/emux/emux_synth.c | 1 + sound/synth/emux/soundfont.c | 1 + sound/synth/util_mem.c | 1 + sound/usb/6fire/firmware.c | 1 + sound/usb/midi.c | 1 + virt/kvm/iommu.c | 2 + 1322 files changed, 1453 insertions(+), 424 deletions(-) create mode 100644 include/linux/export.h $ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch Applying: dm: use export.h instead of module.h where possible $ git reset HEAD^ Unstaged changes after reset: M drivers/md/persistent-data/dm-btree-remove.c M drivers/md/persistent-data/dm-btree.c M drivers/md/persistent-data/dm-space-map-disk.c M drivers/md/persistent-data/dm-transaction-manager.c $ git add . $ git commit -v -a --amend [master 88628b5] Merge remote-tracking branch 'moduleh/module.h-split' $ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch Applying: block: bsg-lib.c needs export.h not module.h $ git reset HEAD^ Unstaged changes after reset: M block/bsg-lib.c $ git add . $ git commit -v -a --amend [master 99eb539] Merge remote-tracking branch 'moduleh/module.h-split' $ git am -3 ../patches/0001-PM-EXPORT_SYMBOL-needs-export.h.patch Applying: PM: EXPORT_SYMBOL needs export.h $ git reset HEAD^ Unstaged changes after reset: M drivers/base/power/common.c $ git add . $ git commit -v -a --amend [master b21bbd3] Merge remote-tracking branch 'moduleh/module.h-split' Merging kvmtool/master $ git merge kvmtool/master Resolved 'include/net/9p/9p.h' using previous resolution. Auto-merging MAINTAINERS Auto-merging include/net/9p/9p.h CONFLICT (content): Merge conflict in include/net/9p/9p.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9cb9083] Merge remote-tracking branch 'kvmtool/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 8 + tools/kvm/.gitignore | 10 + tools/kvm/CREDITS-Git | 30 + tools/kvm/Documentation/kvm-balloon.txt | 24 + tools/kvm/Documentation/kvm-debug.txt | 16 + tools/kvm/Documentation/kvm-list.txt | 16 + tools/kvm/Documentation/kvm-pause.txt | 16 + tools/kvm/Documentation/kvm-resume.txt | 16 + tools/kvm/Documentation/kvm-run.txt | 62 ++ tools/kvm/Documentation/kvm-setup.txt | 15 + tools/kvm/Documentation/kvm-stat.txt | 19 + tools/kvm/Documentation/kvm-stop.txt | 16 + tools/kvm/Documentation/kvm-version.txt | 21 + tools/kvm/Makefile | 284 +++++++ tools/kvm/README | 109 +++ tools/kvm/bios.c | 157 ++++ tools/kvm/bios/.gitignore | 3 + tools/kvm/bios/bios-rom.S | 12 + tools/kvm/bios/e820.c | 73 ++ tools/kvm/bios/entry.S | 90 +++ tools/kvm/bios/gen-offsets.sh | 14 + tools/kvm/bios/int10.c | 151 ++++ tools/kvm/bios/int15.c | 18 + tools/kvm/bios/local.S | 7 + tools/kvm/bios/macro.S | 25 + tools/kvm/bios/rom.ld.S | 17 + tools/kvm/builtin-balloon.c | 75 ++ tools/kvm/builtin-debug.c | 66 ++ tools/kvm/builtin-help.c | 61 ++ tools/kvm/builtin-list.c | 66 ++ tools/kvm/builtin-pause.c | 66 ++ tools/kvm/builtin-resume.c | 66 ++ tools/kvm/builtin-run.c | 749 ++++++++++++++++++ tools/kvm/builtin-setup.c | 197 +++++ tools/kvm/builtin-stat.c | 79 ++ tools/kvm/builtin-stop.c | 66 ++ tools/kvm/builtin-version.c | 15 + tools/kvm/code16gcc.h | 15 + tools/kvm/command-list.txt | 14 + tools/kvm/config/feature-tests.mak | 148 ++++ tools/kvm/config/utilities.mak | 188 +++++ tools/kvm/cpuid.c | 51 ++ tools/kvm/disk/blk.c | 39 + tools/kvm/disk/core.c | 222 ++++++ tools/kvm/disk/qcow.c | 1099 +++++++++++++++++++++++++++ tools/kvm/disk/raw.c | 82 ++ tools/kvm/framebuffer.c | 68 ++ tools/kvm/guest/init.c | 40 + tools/kvm/guest_compat.c | 104 +++ tools/kvm/hw/i8042.c | 348 +++++++++ tools/kvm/hw/rtc.c | 87 +++ tools/kvm/hw/serial.c | 358 +++++++++ tools/kvm/hw/vesa.c | 77 ++ tools/kvm/include/asm/hweight.h | 8 + tools/kvm/include/kvm/8250-serial.h | 10 + tools/kvm/include/kvm/apic.h | 17 + tools/kvm/include/kvm/assembly.h | 24 + tools/kvm/include/kvm/barrier.h | 15 + tools/kvm/include/kvm/bios-export.h | 13 + tools/kvm/include/kvm/bios.h | 83 ++ tools/kvm/include/kvm/boot-protocol.h | 16 + tools/kvm/include/kvm/brlock.h | 41 + tools/kvm/include/kvm/builtin-balloon.h | 7 + tools/kvm/include/kvm/builtin-debug.h | 7 + tools/kvm/include/kvm/builtin-help.h | 6 + tools/kvm/include/kvm/builtin-list.h | 7 + tools/kvm/include/kvm/builtin-pause.h | 7 + tools/kvm/include/kvm/builtin-resume.h | 7 + tools/kvm/include/kvm/builtin-run.h | 7 + tools/kvm/include/kvm/builtin-setup.h | 7 + tools/kvm/include/kvm/builtin-stat.h | 7 + tools/kvm/include/kvm/builtin-stop.h | 7 + tools/kvm/include/kvm/builtin-version.h | 6 + tools/kvm/include/kvm/compiler.h | 6 + tools/kvm/include/kvm/cpufeature.h | 41 + tools/kvm/include/kvm/disk-image.h | 73 ++ tools/kvm/include/kvm/e820.h | 12 + tools/kvm/include/kvm/framebuffer.h | 34 + tools/kvm/include/kvm/guest_compat.h | 9 + tools/kvm/include/kvm/i8042.h | 12 + tools/kvm/include/kvm/interrupt.h | 26 + tools/kvm/include/kvm/ioeventfd.h | 27 + tools/kvm/include/kvm/ioport.h | 65 ++ tools/kvm/include/kvm/irq.h | 29 + tools/kvm/include/kvm/kvm-cmd.h | 17 + tools/kvm/include/kvm/kvm-cpu.h | 44 ++ tools/kvm/include/kvm/kvm.h | 109 +++ tools/kvm/include/kvm/mptable.h | 8 + tools/kvm/include/kvm/mutex.h | 33 + tools/kvm/include/kvm/parse-options.h | 213 ++++++ tools/kvm/include/kvm/pci.h | 74 ++ tools/kvm/include/kvm/qcow.h | 122 +++ tools/kvm/include/kvm/rbtree-interval.h | 27 + tools/kvm/include/kvm/read-write.h | 32 + tools/kvm/include/kvm/rtc.h | 6 + tools/kvm/include/kvm/rwsem.h | 39 + tools/kvm/include/kvm/sdl.h | 17 + tools/kvm/include/kvm/segment.h | 16 + tools/kvm/include/kvm/strbuf.h | 6 + tools/kvm/include/kvm/symbol.h | 22 + tools/kvm/include/kvm/term.h | 17 + tools/kvm/include/kvm/threadpool.h | 37 + tools/kvm/include/kvm/types.h | 7 + tools/kvm/include/kvm/uip.h | 356 +++++++++ tools/kvm/include/kvm/util.h | 78 ++ tools/kvm/include/kvm/vesa.h | 18 + tools/kvm/include/kvm/virtio-9p.h | 75 ++ tools/kvm/include/kvm/virtio-balloon.h | 8 + tools/kvm/include/kvm/virtio-blk.h | 12 + tools/kvm/include/kvm/virtio-console.h | 9 + tools/kvm/include/kvm/virtio-net.h | 21 + tools/kvm/include/kvm/virtio-pci-dev.h | 24 + tools/kvm/include/kvm/virtio-pci.h | 59 ++ tools/kvm/include/kvm/virtio-rng.h | 9 + tools/kvm/include/kvm/virtio.h | 65 ++ tools/kvm/include/kvm/vnc.h | 14 + tools/kvm/include/linux/bitops.h | 33 + tools/kvm/include/linux/byteorder.h | 7 + tools/kvm/include/linux/kernel.h | 39 + tools/kvm/include/linux/module.h | 6 + tools/kvm/include/linux/prefetch.h | 6 + tools/kvm/include/linux/types.h | 50 ++ tools/kvm/interrupt.c | 27 + tools/kvm/ioeventfd.c | 128 ++++ tools/kvm/ioport.c | 192 +++++ tools/kvm/irq.c | 193 +++++ tools/kvm/kvm-cmd.c | 91 +++ tools/kvm/kvm-cpu.c | 509 +++++++++++++ tools/kvm/kvm.c | 751 ++++++++++++++++++ tools/kvm/main.c | 14 + tools/kvm/mmio.c | 132 ++++ tools/kvm/mptable.c | 284 +++++++ tools/kvm/net/uip/arp.c | 30 + tools/kvm/net/uip/buf.c | 114 +++ tools/kvm/net/uip/core.c | 190 +++++ tools/kvm/net/uip/csum.c | 92 +++ tools/kvm/net/uip/dhcp.c | 195 +++++ tools/kvm/net/uip/icmp.c | 29 + tools/kvm/net/uip/ipv4.c | 29 + tools/kvm/net/uip/tcp.c | 317 ++++++++ tools/kvm/net/uip/udp.c | 236 ++++++ tools/kvm/pci.c | 170 +++++ tools/kvm/read-write.c | 318 ++++++++ tools/kvm/symbol.c | 98 +++ tools/kvm/term.c | 127 +++ tools/kvm/tests/Makefile | 19 + tools/kvm/tests/boot/Makefile | 13 + tools/kvm/tests/boot/init.c | 11 + tools/kvm/tests/kernel/.gitignore | 2 + tools/kvm/tests/kernel/Makefile | 20 + tools/kvm/tests/kernel/README | 16 + tools/kvm/tests/kernel/kernel.S | 8 + tools/kvm/tests/pit/.gitignore | 2 + tools/kvm/tests/pit/Makefile | 20 + tools/kvm/tests/pit/README | 16 + tools/kvm/tests/pit/tick.S | 109 +++ tools/kvm/threadpool.c | 146 ++++ tools/kvm/ui/sdl.c | 158 ++++ tools/kvm/ui/vnc.c | 218 ++++++ tools/kvm/util.c | 101 +++ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + tools/kvm/util/generate-cmdlist.sh | 23 + tools/kvm/util/kvm-ifup-vbr0 | 6 + tools/kvm/util/parse-options.c | 631 +++++++++++++++ tools/kvm/util/rbtree-interval.c | 90 +++ tools/kvm/util/set_private_br.sh | 51 ++ tools/kvm/util/strbuf.c | 13 + tools/kvm/virtio/9p-pdu.c | 287 +++++++ tools/kvm/virtio/9p.c | 1263 +++++++++++++++++++++++++++++++ tools/kvm/virtio/balloon.c | 288 +++++++ tools/kvm/virtio/blk.c | 247 ++++++ tools/kvm/virtio/console.c | 196 +++++ tools/kvm/virtio/core.c | 123 +++ tools/kvm/virtio/net.c | 406 ++++++++++ tools/kvm/virtio/pci.c | 313 ++++++++ tools/kvm/virtio/rng.c | 183 +++++ 176 files changed, 17331 insertions(+), 0 deletions(-) create mode 100644 tools/kvm/.gitignore create mode 100644 tools/kvm/CREDITS-Git create mode 100644 tools/kvm/Documentation/kvm-balloon.txt create mode 100644 tools/kvm/Documentation/kvm-debug.txt create mode 100644 tools/kvm/Documentation/kvm-list.txt create mode 100644 tools/kvm/Documentation/kvm-pause.txt create mode 100644 tools/kvm/Documentation/kvm-resume.txt create mode 100644 tools/kvm/Documentation/kvm-run.txt create mode 100644 tools/kvm/Documentation/kvm-setup.txt create mode 100644 tools/kvm/Documentation/kvm-stat.txt create mode 100644 tools/kvm/Documentation/kvm-stop.txt create mode 100644 tools/kvm/Documentation/kvm-version.txt create mode 100644 tools/kvm/Makefile create mode 100644 tools/kvm/README create mode 100644 tools/kvm/bios.c create mode 100644 tools/kvm/bios/.gitignore create mode 100644 tools/kvm/bios/bios-rom.S create mode 100644 tools/kvm/bios/e820.c create mode 100644 tools/kvm/bios/entry.S create mode 100644 tools/kvm/bios/gen-offsets.sh create mode 100644 tools/kvm/bios/int10.c create mode 100644 tools/kvm/bios/int15.c create mode 100644 tools/kvm/bios/local.S create mode 100644 tools/kvm/bios/macro.S create mode 100644 tools/kvm/bios/rom.ld.S create mode 100644 tools/kvm/builtin-balloon.c create mode 100644 tools/kvm/builtin-debug.c create mode 100644 tools/kvm/builtin-help.c create mode 100644 tools/kvm/builtin-list.c create mode 100644 tools/kvm/builtin-pause.c create mode 100644 tools/kvm/builtin-resume.c create mode 100644 tools/kvm/builtin-run.c create mode 100644 tools/kvm/builtin-setup.c create mode 100644 tools/kvm/builtin-stat.c create mode 100644 tools/kvm/builtin-stop.c create mode 100644 tools/kvm/builtin-version.c create mode 100644 tools/kvm/code16gcc.h create mode 100644 tools/kvm/command-list.txt create mode 100644 tools/kvm/config/feature-tests.mak create mode 100644 tools/kvm/config/utilities.mak create mode 100644 tools/kvm/cpuid.c create mode 100644 tools/kvm/disk/blk.c create mode 100644 tools/kvm/disk/core.c create mode 100644 tools/kvm/disk/qcow.c create mode 100644 tools/kvm/disk/raw.c create mode 100644 tools/kvm/framebuffer.c create mode 100644 tools/kvm/guest/init.c create mode 100644 tools/kvm/guest_compat.c create mode 100644 tools/kvm/hw/i8042.c create mode 100644 tools/kvm/hw/rtc.c create mode 100644 tools/kvm/hw/serial.c create mode 100644 tools/kvm/hw/vesa.c create mode 100644 tools/kvm/include/asm/hweight.h create mode 100644 tools/kvm/include/kvm/8250-serial.h create mode 100644 tools/kvm/include/kvm/apic.h create mode 100644 tools/kvm/include/kvm/assembly.h create mode 100644 tools/kvm/include/kvm/barrier.h create mode 100644 tools/kvm/include/kvm/bios-export.h create mode 100644 tools/kvm/include/kvm/bios.h create mode 100644 tools/kvm/include/kvm/boot-protocol.h create mode 100644 tools/kvm/include/kvm/brlock.h create mode 100644 tools/kvm/include/kvm/builtin-balloon.h create mode 100644 tools/kvm/include/kvm/builtin-debug.h create mode 100644 tools/kvm/include/kvm/builtin-help.h create mode 100644 tools/kvm/include/kvm/builtin-list.h create mode 100644 tools/kvm/include/kvm/builtin-pause.h create mode 100644 tools/kvm/include/kvm/builtin-resume.h create mode 100644 tools/kvm/include/kvm/builtin-run.h create mode 100644 tools/kvm/include/kvm/builtin-setup.h create mode 100644 tools/kvm/include/kvm/builtin-stat.h create mode 100644 tools/kvm/include/kvm/builtin-stop.h create mode 100644 tools/kvm/include/kvm/builtin-version.h create mode 100644 tools/kvm/include/kvm/compiler.h create mode 100644 tools/kvm/include/kvm/cpufeature.h create mode 100644 tools/kvm/include/kvm/disk-image.h create mode 100644 tools/kvm/include/kvm/e820.h create mode 100644 tools/kvm/include/kvm/framebuffer.h create mode 100644 tools/kvm/include/kvm/guest_compat.h create mode 100644 tools/kvm/include/kvm/i8042.h create mode 100644 tools/kvm/include/kvm/interrupt.h create mode 100644 tools/kvm/include/kvm/ioeventfd.h create mode 100644 tools/kvm/include/kvm/ioport.h create mode 100644 tools/kvm/include/kvm/irq.h create mode 100644 tools/kvm/include/kvm/kvm-cmd.h create mode 100644 tools/kvm/include/kvm/kvm-cpu.h create mode 100644 tools/kvm/include/kvm/kvm.h create mode 100644 tools/kvm/include/kvm/mptable.h create mode 100644 tools/kvm/include/kvm/mutex.h create mode 100644 tools/kvm/include/kvm/parse-options.h create mode 100644 tools/kvm/include/kvm/pci.h create mode 100644 tools/kvm/include/kvm/qcow.h create mode 100644 tools/kvm/include/kvm/rbtree-interval.h create mode 100644 tools/kvm/include/kvm/read-write.h create mode 100644 tools/kvm/include/kvm/rtc.h create mode 100644 tools/kvm/include/kvm/rwsem.h create mode 100644 tools/kvm/include/kvm/sdl.h create mode 100644 tools/kvm/include/kvm/segment.h create mode 100644 tools/kvm/include/kvm/strbuf.h create mode 100644 tools/kvm/include/kvm/symbol.h create mode 100644 tools/kvm/include/kvm/term.h create mode 100644 tools/kvm/include/kvm/threadpool.h create mode 100644 tools/kvm/include/kvm/types.h create mode 100644 tools/kvm/include/kvm/uip.h create mode 100644 tools/kvm/include/kvm/util.h create mode 100644 tools/kvm/include/kvm/vesa.h create mode 100644 tools/kvm/include/kvm/virtio-9p.h create mode 100644 tools/kvm/include/kvm/virtio-balloon.h create mode 100644 tools/kvm/include/kvm/virtio-blk.h create mode 100644 tools/kvm/include/kvm/virtio-console.h create mode 100644 tools/kvm/include/kvm/virtio-net.h create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h create mode 100644 tools/kvm/include/kvm/virtio-pci.h create mode 100644 tools/kvm/include/kvm/virtio-rng.h create mode 100644 tools/kvm/include/kvm/virtio.h create mode 100644 tools/kvm/include/kvm/vnc.h create mode 100644 tools/kvm/include/linux/bitops.h create mode 100644 tools/kvm/include/linux/byteorder.h create mode 100644 tools/kvm/include/linux/kernel.h create mode 100644 tools/kvm/include/linux/module.h create mode 100644 tools/kvm/include/linux/prefetch.h create mode 100644 tools/kvm/include/linux/types.h create mode 100644 tools/kvm/interrupt.c create mode 100644 tools/kvm/ioeventfd.c create mode 100644 tools/kvm/ioport.c create mode 100644 tools/kvm/irq.c create mode 100644 tools/kvm/kvm-cmd.c create mode 100644 tools/kvm/kvm-cpu.c create mode 100644 tools/kvm/kvm.c create mode 100644 tools/kvm/main.c create mode 100644 tools/kvm/mmio.c create mode 100644 tools/kvm/mptable.c create mode 100644 tools/kvm/net/uip/arp.c create mode 100644 tools/kvm/net/uip/buf.c create mode 100644 tools/kvm/net/uip/core.c create mode 100644 tools/kvm/net/uip/csum.c create mode 100644 tools/kvm/net/uip/dhcp.c create mode 100644 tools/kvm/net/uip/icmp.c create mode 100644 tools/kvm/net/uip/ipv4.c create mode 100644 tools/kvm/net/uip/tcp.c create mode 100644 tools/kvm/net/uip/udp.c create mode 100644 tools/kvm/pci.c create mode 100644 tools/kvm/read-write.c create mode 100644 tools/kvm/symbol.c create mode 100644 tools/kvm/term.c create mode 100644 tools/kvm/tests/Makefile create mode 100644 tools/kvm/tests/boot/Makefile create mode 100644 tools/kvm/tests/boot/init.c create mode 100644 tools/kvm/tests/kernel/.gitignore create mode 100644 tools/kvm/tests/kernel/Makefile create mode 100644 tools/kvm/tests/kernel/README create mode 100644 tools/kvm/tests/kernel/kernel.S create mode 100644 tools/kvm/tests/pit/.gitignore create mode 100644 tools/kvm/tests/pit/Makefile create mode 100644 tools/kvm/tests/pit/README create mode 100644 tools/kvm/tests/pit/tick.S create mode 100644 tools/kvm/threadpool.c create mode 100644 tools/kvm/ui/sdl.c create mode 100644 tools/kvm/ui/vnc.c create mode 100644 tools/kvm/util.c create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN create mode 100755 tools/kvm/util/generate-cmdlist.sh create mode 100755 tools/kvm/util/kvm-ifup-vbr0 create mode 100644 tools/kvm/util/parse-options.c create mode 100644 tools/kvm/util/rbtree-interval.c create mode 100755 tools/kvm/util/set_private_br.sh create mode 100644 tools/kvm/util/strbuf.c create mode 100644 tools/kvm/virtio/9p-pdu.c create mode 100644 tools/kvm/virtio/9p.c create mode 100644 tools/kvm/virtio/balloon.c create mode 100644 tools/kvm/virtio/blk.c create mode 100644 tools/kvm/virtio/console.c create mode 100644 tools/kvm/virtio/core.c create mode 100644 tools/kvm/virtio/net.c create mode 100644 tools/kvm/virtio/pci.c create mode 100644 tools/kvm/virtio/rng.c Merging scsi-post-merge/merge-base:master $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm From ../next * [new branch] quilt/akpm -> akpm $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base From ../next * [new branch] quilt/akpm-base -> akpm-base $ git checkout akpm Switched to branch 'akpm' $ git rebase --onto master akpm-base First, rewinding head to replay your work on top of it... Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch Applying: When no floppy is found the module code can be released while a timer Applying: Fix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on Applying: Fix the following memory leak: Applying: The parameter's origin type is long. On an i386 architecture, it can Applying: Since the commit below which added O_PATH support to the *at() calls, the Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error: Applying: This makes the iris driver use the platform API, so it is properly exposed Applying: On x86_32 casting the unsigned int result of get_random_int() to long may Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new Applying: Cc: Ed Wildgoose Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic Applying: The x86 timer interrupt handler is the only handler not traced in the Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit Applying: Don't allow everybody to use a modem. Applying: The address limit is already set in flush_old_exec() so this Applying: A call to va_copy() should always be followed by a call to va_end() in the Applying: Don't dereference em if it's NULL or an error pointer. Applying: Some messing with error codes to return 0 on out id's and match Applying: kbuf is a buffer that is local to this function, so all of the error paths Applying: fb_set_suspend() must be called with the console semaphore held, which Applying: hwmon was using an idr with a NULL pointer, so convert to an Applying: A straightforward looking use of idr for a device id. Applying: This patchset aims at addressing /proc/stat issue which has been Applying: update_ts_time_stat currently updates idle time even if we are in iowait Applying: get_cpu_{idle,iowait}_time_us update idle/iowait counters unconditionally Applying: show_stat handler of the /proc/stat file relies on kstat_cpu(cpu) Applying: The address limit is already set in flush_old_exec() so this Applying: The address limit is already set in flush_old_exec() so this Applying: Add new check (assert_init) to make sure objects are initialized and Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned, Applying: The address limit is already set in flush_old_exec() so those calls to Applying: When do pci remove/rescan on system that have more iommus, got Applying: The current implementation of dmi_name_in_vendors() is an invitation to Applying: For headers that get exported to userland and make use of u32 style Applying: Fix sparse warnings of right shift bigger than source value size: Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() : Applying: Some mangling of errors was necessary to maintain current interface. Applying: This does involve additional use of the spin lock in idr.c. Is this an Applying: Instead of open coding this function use kstrtoul_from_user() directly. Applying: brd_make_request() always returns 0, which doesn't make much sense. Applying: The address limit is already set in flush_old_exec() so this assignment of Applying: Unbreak the alpha build. Applying: Unbreak alpha build. Applying: Unbreak alpha build. Applying: When we get corruption reports, it's useful to see if the kernel was Applying: When we get corruption reports, it's useful to see if the kernel was Applying: The basic idea behind cross memory attach is to allow MPI programs doing Applying: - Add x86_64 specific wire up Applying: > You might get some speed benefit by optimising for the small copies Applying: acct_isolated of compaction uses page_lru_base_type which returns only Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally, Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So, Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless, Applying: unmap_and_move() is one a big messy function. Clean it up. Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was Applying: per-task block plug can reduce block queue lock contention and increase Applying: The tracing ring-buffer used this function briefly, but not anymore. Applying: After selecting a task to kill, the oom killer iterates all processes and Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly Applying: When we get a bad_page bug report, it's useful to see what modules the Applying: Without swap, anonymous pages are not scanned. As such, they should not Applying: fix comment Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and Applying: Some kernel components pin user space memory (infiniband and perf) (by Applying: Add comments to explain the page statistics field in the mm_struct. Applying: add missing ; Applying: Testing from the XFS folk revealed that there is still too much I/O from Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO Applying: Direct reclaim should never writeback pages. For now, handle the Applying: Direct reclaim should never writeback pages. Warn if an attempt is made. Applying: It is preferable that no dirty pages are dispatched for cleaning from the Applying: Workloads that are allocating frequently and writing files place a large Applying: When direct reclaim encounters a dirty page, it gets recycled around the Applying: It's possible a zone watermark is ok when entering the balance_pgdat() Applying: printk_ratelimit() should not be used, because it shares ratelimiting Applying: memchr_inv() is mainly used to check whether the whole buffer is filled Applying: Use newly introduced memchr_inv() for page verification. Applying: A shrinker function can return -1, means that it cannot do anything Applying: Use atomic-long operations instead of looping around cmpxchg(). Applying: massage atomic.h inclusions Applying: The /proc/vmallocinfo shows information about vmalloc allocations in Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once") Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages Applying: SPARC32 require access to the start address. Add a new helper Applying: With the NO_BOOTMEM symbol added architectures may now use the following Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1, Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single Applying: This adds THP support to mremap (decreases the number of split_huge_page() Applying: coding-style nitpicking Applying: Cc: Andrea Arcangeli Applying: Signed-off-by: Andrew Morton Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled. This Applying: reduce ifdeffery Applying: Signed-off-by: Andy Shevchenko Applying: Make the security_inode_init_security() initxattrs arg const, to match the Applying: The current implementation of the /dev/hpet driver couples opening the Applying: smp_call_function() only lets all other CPUs execute a specific function, Applying: auto_demotion_disable is called only for online CPUs. For hotplugged Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning: Applying: Strict user copy checks are only really supported on x86_32 even though Applying: The help text for this config is duplicated across the x86, parisc, and Applying: s/lib-/obj-/ for usercopy.o Applying: After an "unexpected" reboot, I found this Oops in my logs: Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the Applying: Add axis correction for HP EliteBook 2730p. Applying: Add axis correction for HP EliteBook 8540w. Applying: Add axis correction for HP ProBook 6555b. Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of Applying: Signed-off-by: Ilkka Koskinen Applying: Signed-off-by: Ilkka Koskinen Applying: Change exported functions to use the device given as parameter Applying: Signed-off-by: Ilkka Koskinen Applying: We are enabling some power features on medfield. To test suspend-2-RAM Applying: We are enabling some power features on medfield. To test suspend-2-RAM Applying: We are enabling some power features on medfield. To test suspend-2-RAM Applying: Cc: Al Viro Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware Applying: include linux/module.h Applying: The memory for struct led_trigger should be kfreed in the Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(), Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify Applying: don't include asm/msr.h Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN. Applying: One can get this information from minix/inode.c, but adding the Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses Applying: Before calling schedule_timeout(), task state should be changed. Applying: Signed-off-by: Bob Liu Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global Applying: If somebody is touching data too early, it might be easier to diagnose a Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL. Applying: Force this on for -next/mm testing purposes. Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by Applying: After merging the akpm tree, today's linux-next build (lost of them) Applying: The discovered bit in PGCCSR register indicates if the device has been Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device. Applying: When I tried to send a patch to remove it, Andi told me we still need to Applying: Signed-off-by: WANG Cong Applying: Signed-off-by: WANG Cong Applying: Signed-off-by: WANG Cong Applying: This is only an error, no need to use KERN_CRIT log level. Applying: Signed-off-by: WANG Cong Applying: ERROR: code indent should use tabs where possible Applying: A default echo function has been provided so it is no longer an error when Applying: This client driver allows you to use a GPIO pin as a source for PPS Applying: remove unneeded cast of void* Applying: Straightforward. As an aside, the ida_init calls are not needed as far as Applying: Simply creates one point to call the w1 interface. Applying: Adds a nolock function to the w1 interface to avoid locking the Applying: Fixes the deadlock when inserting and removing the ds2780. $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm From ../rebase-tmp + 9b198e5...f521b31 akpm -> akpm (forced update) $ rm -rf ../rebase-tmp Merging akpm $ git merge --no-ff akpm Removing arch/sparc/lib/usercopy.c Removing drivers/leds/leds-alix2.c Merge made by recursive. Documentation/DocBook/debugobjects.tmpl | 50 + Documentation/feature-removal-schedule.txt | 35 - Documentation/kernel-parameters.txt | 8 + Documentation/rapidio/tsi721.txt | 49 + .../trace/postprocess/trace-vmscan-postprocess.pl | 8 +- MAINTAINERS | 1 + arch/arm/include/asm/processor.h | 1 - arch/arm/mach-ux500/mbox-db5500.c | 2 +- arch/ia64/include/asm/processor.h | 1 - arch/parisc/Kconfig | 1 + arch/parisc/Kconfig.debug | 14 - arch/parisc/include/asm/processor.h | 2 - arch/parisc/kernel/process.c | 1 - arch/powerpc/include/asm/systbl.h | 2 + arch/powerpc/include/asm/unistd.h | 4 +- arch/s390/Kconfig | 1 + arch/s390/Kconfig.debug | 14 - arch/s390/lib/Makefile | 1 - arch/sparc/kernel/process_32.c | 3 +- arch/sparc/kernel/process_64.c | 3 - arch/sparc/lib/Makefile | 1 - arch/sparc/lib/usercopy.c | 8 - arch/tile/Kconfig | 8 +- arch/tile/include/asm/uaccess.h | 7 +- arch/tile/lib/uaccess.c | 8 - arch/unicore32/include/asm/processor.h | 1 - arch/x86/Kconfig | 15 + arch/x86/Kconfig.debug | 14 - arch/x86/ia32/ia32entry.S | 2 + arch/x86/include/asm/irq_vectors.h | 50 + arch/x86/include/asm/uaccess_64.h | 12 +- arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/apic/apic.c | 7 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 + arch/x86/kernel/cpu/mcheck/threshold.c | 3 + arch/x86/kernel/e820.c | 59 +- arch/x86/kernel/irq.c | 6 +- arch/x86/kernel/irq_work.c | 3 + arch/x86/kernel/smp.c | 7 + arch/x86/kernel/syscall_table_32.S | 2 + arch/x86/kernel/time.c | 15 +- arch/x86/kernel/traps.c | 3 + arch/x86/lib/usercopy_32.c | 6 - arch/x86/mm/mmap.c | 4 +- arch/x86/mm/tlb.c | 3 + arch/x86/platform/Makefile | 1 + arch/x86/platform/geode/Makefile | 1 + arch/x86/platform/geode/alix.c | 142 ++ arch/x86/platform/iris/iris.c | 67 +- drivers/base/node.c | 6 +- drivers/block/brd.c | 2 +- drivers/block/floppy.c | 8 +- drivers/block/nbd.c | 69 +- drivers/char/hpet.c | 56 +- drivers/cpufreq/cpufreq_conservative.c | 4 +- drivers/cpufreq/cpufreq_ondemand.c | 4 +- drivers/firmware/dmi_scan.c | 6 +- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 34 +- drivers/gpu/vga/vgaarb.c | 18 +- drivers/hwmon/hwmon.c | 32 +- drivers/hwmon/ibmaem.c | 47 +- drivers/idle/intel_idle.c | 59 +- drivers/infiniband/core/umem.c | 6 +- drivers/infiniband/hw/ipath/ipath_user_pages.c | 6 +- drivers/infiniband/hw/qib/qib_user_pages.c | 4 +- drivers/iommu/dmar.c | 7 +- drivers/iommu/intel-iommu.c | 177 ++- drivers/leds/Kconfig | 20 +- drivers/leds/Makefile | 2 +- drivers/leds/led-triggers.c | 5 +- drivers/leds/leds-alix2.c | 239 -- drivers/leds/leds-renesas-tpu.c | 344 +++ drivers/misc/lis3lv02d/lis3lv02d.c | 389 ++-- drivers/misc/lis3lv02d/lis3lv02d.h | 9 +- drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 11 +- drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +- drivers/oprofile/oprofilefs.c | 5 +- drivers/platform/x86/Kconfig | 2 +- drivers/platform/x86/acerhdf.c | 1 + drivers/platform/x86/hp_accel.c | 10 +- drivers/power/ds2780_battery.c | 86 +- drivers/pps/clients/Kconfig | 9 + drivers/pps/clients/Makefile | 1 + drivers/pps/clients/pps-gpio.c | 227 ++ drivers/pps/clients/pps-ktimer.c | 12 - drivers/pps/clients/pps_parport.c | 9 - drivers/pps/kapi.c | 20 +- drivers/rapidio/Kconfig | 6 +- drivers/rapidio/Makefile | 1 + drivers/rapidio/devices/Kconfig | 10 + drivers/rapidio/devices/Makefile | 5 + drivers/rapidio/devices/tsi721.c | 2337 ++++++++++++++++++++ drivers/rapidio/devices/tsi721.h | 762 +++++++ drivers/rapidio/rio-scan.c | 4 +- drivers/rtc/class.c | 32 +- drivers/scsi/aacraid/commctrl.c | 1 + drivers/scsi/megaraid.c | 8 +- drivers/scsi/osd/osd_uld.c | 22 +- drivers/scsi/sd.c | 32 +- drivers/scsi/sg.c | 25 +- drivers/staging/rts5139/ms.c | 1 + drivers/staging/rts5139/rts51x_scsi.c | 1 + drivers/staging/rts5139/xd.c | 1 + drivers/video/fbmem.c | 24 +- drivers/w1/slaves/w1_ds2760.c | 48 +- drivers/w1/slaves/w1_ds2780.c | 96 +- drivers/w1/slaves/w1_ds2780.h | 2 + fs/Kconfig | 2 +- fs/aio.c | 4 +- fs/btrfs/inode.c | 3 +- fs/compat.c | 7 +- fs/eventpoll.c | 25 +- fs/ext4/ext4.h | 7 +- fs/ext4/ialloc.c | 4 +- fs/ext4/inode.c | 6 +- fs/logfs/logfs.h | 1 - fs/logfs/super.c | 22 - fs/namei.c | 19 +- fs/ocfs2/ocfs2.h | 47 + fs/ocfs2/quota_local.c | 10 +- fs/proc/proc_sysctl.c | 1 + fs/proc/stat.c | 41 +- fs/proc/task_mmu.c | 2 + fs/read_write.c | 8 +- fs/stat.c | 5 +- fs/xfs/xfs_aops.c | 8 +- include/asm-generic/cputime.h | 4 +- include/linux/cgroup.h | 2 +- include/linux/compat.h | 3 +- include/linux/debugobjects.h | 6 + include/linux/dmar.h | 5 + include/linux/fs.h | 9 +- include/linux/hpet.h | 1 + include/linux/huge_mm.h | 5 + include/linux/jiffies.h | 2 +- include/linux/leds-renesas-tpu.h | 14 + include/linux/magic.h | 10 +- include/linux/memblock.h | 1 + include/linux/memcontrol.h | 37 +- include/linux/mm.h | 1 + include/linux/mm_types.h | 11 +- include/linux/mmzone.h | 13 + include/linux/namei.h | 1 + include/linux/pps-gpio.h | 32 + include/linux/rio_ids.h | 1 + include/linux/security.h | 2 +- include/linux/shrinker.h | 2 +- include/linux/string.h | 1 + include/linux/swap.h | 7 +- include/linux/syscalls.h | 13 + include/linux/sysdev.h | 14 + include/linux/vmalloc.h | 1 + include/linux/writeback.h | 2 - include/scsi/scsi_netlink.h | 2 +- include/trace/events/irq_vectors.h | 56 + include/trace/events/vmscan.h | 8 +- init/Kconfig | 4 +- init/do_mounts.c | 48 +- ipc/shm.c | 2 +- kernel/audit.c | 5 +- kernel/cgroup.c | 18 +- kernel/events/core.c | 6 +- kernel/kprobes.c | 2 +- kernel/printk.c | 7 + kernel/sched.c | 1 + kernel/sys_ni.c | 4 + kernel/time.c | 2 +- kernel/time/tick-sched.c | 45 +- kernel/timer.c | 54 +- lib/Kconfig.debug | 18 + lib/Makefile | 1 + lib/crc32.c | 370 +++- lib/crc32defs.h | 16 +- lib/debugobjects.c | 33 + lib/gen_crc32table.c | 59 +- lib/kstrtox.c | 75 +- lib/kstrtox.h | 8 + lib/radix-tree.c | 10 +- lib/string.c | 54 + {arch/s390/lib => lib}/usercopy.c | 0 lib/vsprintf.c | 33 +- mm/Kconfig | 3 + mm/Makefile | 3 +- mm/compaction.c | 24 +- mm/debug-pagealloc.c | 12 +- mm/huge_memory.c | 45 + mm/memblock.c | 6 + mm/memcontrol.c | 994 +++++----- mm/mempolicy.c | 4 +- mm/migrate.c | 75 +- mm/mremap.c | 42 +- mm/oom_kill.c | 5 +- mm/page-writeback.c | 122 +- mm/page_alloc.c | 1 + mm/page_cgroup.c | 3 +- mm/process_vm_access.c | 496 +++++ mm/slab.c | 8 +- mm/slub.c | 49 +- mm/vmalloc.c | 65 +- mm/vmscan.c | 225 ++- mm/vmstat.c | 1 + security/keys/compat.c | 2 +- security/keys/keyctl.c | 2 +- security/selinux/selinuxfs.c | 14 +- 206 files changed, 7394 insertions(+), 2204 deletions(-) create mode 100644 Documentation/rapidio/tsi721.txt delete mode 100644 arch/sparc/lib/usercopy.c create mode 100644 arch/x86/platform/geode/Makefile create mode 100644 arch/x86/platform/geode/alix.c delete mode 100644 drivers/leds/leds-alix2.c create mode 100644 drivers/leds/leds-renesas-tpu.c create mode 100644 drivers/pps/clients/pps-gpio.c create mode 100644 drivers/rapidio/devices/Kconfig create mode 100644 drivers/rapidio/devices/Makefile create mode 100644 drivers/rapidio/devices/tsi721.c create mode 100644 drivers/rapidio/devices/tsi721.h create mode 100644 include/linux/leds-renesas-tpu.h create mode 100644 include/linux/pps-gpio.h create mode 100644 include/trace/events/irq_vectors.h create mode 100644 lib/kstrtox.h rename {arch/s390/lib => lib}/usercopy.c (100%) create mode 100644 mm/process_vm_access.c $ git am -3 ../patches/0001-sparc-Remove-another-reference-to-nfsservctl.patch Applying: sparc: Remove another reference to nfsservctl