$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 6847e15 Linux 2.6.31-rc3 Merging origin/master $ git merge origin/master Updating 6847e15..e9e961c Fast forward arch/x86/kernel/apic/es7000_32.c | 3 +- arch/x86/kernel/apic/numaq_32.c | 3 +- arch/x86/kernel/pvclock.c | 2 +- arch/x86/mm/fault.c | 2 +- drivers/i2c/busses/i2c-davinci.c | 26 +++++-- drivers/i2c/busses/i2c-omap.c | 6 +- drivers/i2c/busses/i2c-sh_mobile.c | 2 +- drivers/i2c/busses/i2c-simtec.c | 2 +- drivers/net/8139too.c | 1 + drivers/net/arm/ixp4xx_eth.c | 4 +- drivers/net/atlx/atl2.c | 2 +- drivers/net/cs89x0.c | 7 +- drivers/net/ehea/ehea_main.c | 2 + drivers/net/fec.c | 1 + drivers/net/gianfar.c | 2 + drivers/net/igb/igb_main.c | 77 +++++++++---------- drivers/net/isa-skeleton.c | 5 +- drivers/net/mlx4/cmd.c | 5 +- drivers/net/mlx4/main.c | 6 +- drivers/net/phy/phy_device.c | 4 +- drivers/net/plip.c | 3 + drivers/net/ps3_gelic_net.c | 1 + drivers/net/ps3_gelic_wireless.c | 1 + drivers/net/smc91x.c | 1 + drivers/net/smsc911x.c | 1 + drivers/net/sunvnet.c | 2 + drivers/net/usb/kaweth.c | 3 + drivers/net/usb/pegasus.c | 3 + drivers/net/via-rhine.c | 1 + drivers/net/wireless/orinoco/main.c | 3 +- fs/dlm/lock.c | 2 +- fs/dlm/lowcomms.c | 4 +- fs/dlm/plock.c | 17 +++-- fs/gfs2/trace_gfs2.h | 8 +- include/linux/clockchips.h | 9 -- include/linux/skbuff.h | 4 +- include/trace/events/block.h | 6 +- include/trace/events/ext4.h | 6 +- include/trace/events/irq.h | 6 +- include/trace/events/jbd2.h | 6 +- include/trace/events/kmem.h | 6 +- include/trace/events/lockdep.h | 6 +- include/trace/events/sched.h | 6 +- include/trace/events/skb.h | 6 +- include/trace/events/workqueue.h | 6 +- kernel/futex.c | 1 + kernel/hrtimer.c | 110 ++++++++++++++++------------ kernel/time/clockevents.c | 11 --- kernel/trace/ftrace.c | 5 +- net/core/sock.c | 19 ++++- net/ipv4/ip_gre.c | 4 +- net/ipv4/ip_output.c | 1 - net/ipv6/ip6_output.c | 1 - net/ipv6/sit.c | 1 + samples/trace_events/trace-events-sample.h | 37 +++++---- 55 files changed, 267 insertions(+), 202 deletions(-) Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/mach-ep93xx/dma-m2p.c | 1 + arch/arm/mach-kirkwood/mpp.h | 2 +- arch/arm/mach-mx3/Kconfig | 8 + arch/arm/mach-mx3/Makefile | 1 + arch/arm/mach-mx3/armadillo5x0.c | 63 ++++++++ arch/arm/mach-mx3/devices.c | 1 - arch/arm/mach-mx3/pcm037.c | 183 ++++++++++++++++++++++--- arch/arm/mach-mx3/pcm037.h | 11 ++ arch/arm/mach-mx3/pcm037_eet.c | 204 +++++++++++++++++++++++++++ arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 6 +- arch/arm/mach-pxa/pxa3xx.c | 2 +- arch/arm/mach-u300/core.c | 4 +- arch/arm/plat-mxc/include/mach/iomux-mx3.h | 2 + arch/arm/plat-pxa/gpio.c | 9 +- drivers/mmc/host/pxamci.c | 4 +- drivers/video/backlight/pwm_bl.c | 2 + 16 files changed, 468 insertions(+), 35 deletions(-) create mode 100644 arch/arm/mach-mx3/pcm037.h create mode 100644 arch/arm/mach-mx3/pcm037_eet.c Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Already up-to-date. 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. arch/x86/include/asm/io_apic.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 14 +++----------- arch/x86/pci/i386.c | 7 +++++++ 3 files changed, 12 insertions(+), 11 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Merge made by recursive. drivers/base/base.h | 5 +++++ drivers/base/core.c | 20 ++++++++++++++------ drivers/base/dd.c | 31 +++++++++++++++++++++++++++++-- fs/sysfs/dir.c | 2 ++ include/linux/device.h | 16 ++++------------ 5 files changed, 54 insertions(+), 20 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/host/ehci-orion.c | 2 +- drivers/usb/host/ohci-omap.c | 1 + drivers/usb/host/xhci-dbg.c | 4 ++-- drivers/usb/serial/cp210x.c | 3 +++ drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio.h | 7 +++++++ drivers/usb/serial/option.c | 10 ++++++++-- drivers/usb/storage/transport.c | 2 +- 8 files changed, 24 insertions(+), 6 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Auto-merging drivers/input/misc/pcspkr.c Merge made by recursive. drivers/input/evdev.c | 3 +-- drivers/input/joydev.c | 2 +- drivers/input/joystick/xpad.c | 26 +++++++++++++------------- drivers/input/keyboard/atkbd.c | 16 ++++++++++++++++ drivers/input/misc/pcspkr.c | 8 ++++++-- drivers/input/misc/wistron_btns.c | 9 +++++++++ 6 files changed, 46 insertions(+), 18 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 8 +- arch/arm/Kconfig | 18 + arch/arm/Makefile | 1 + arch/arm/common/vic.c | 99 ++- arch/arm/configs/nhk8815_defconfig | 1316 ++++++++++++++++++++ arch/arm/include/asm/mach/mmc.h | 2 + arch/arm/include/asm/pgtable.h | 20 +- arch/arm/kernel/crunch.c | 13 +- arch/arm/mach-at91/Kconfig | 49 +- arch/arm/mach-at91/Makefile | 6 + arch/arm/mach-at91/Makefile.boot | 4 + arch/arm/mach-at91/at91sam9261.c | 22 +- arch/arm/mach-at91/at91sam9g45.c | 360 ++++++ arch/arm/mach-at91/at91sam9g45_devices.c | 1230 ++++++++++++++++++ arch/arm/mach-at91/board-sam9261ek.c | 14 + arch/arm/mach-at91/board-sam9g20ek.c | 1 + arch/arm/mach-at91/board-sam9m10g45ek.c | 389 ++++++ arch/arm/mach-at91/board-sam9rlek.c | 79 ++ arch/arm/mach-at91/clock.c | 66 +- arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/gpio.c | 15 - arch/arm/mach-at91/include/mach/at91sam9261.h | 3 + arch/arm/mach-at91/include/mach/at91sam9g45.h | 138 ++ .../mach-at91/include/mach/at91sam9g45_matrix.h | 153 +++ arch/arm/mach-at91/include/mach/board.h | 8 +- arch/arm/mach-at91/include/mach/cpu.h | 23 + arch/arm/mach-at91/include/mach/hardware.h | 4 +- arch/arm/mach-at91/include/mach/timex.h | 10 + arch/arm/mach-at91/pm.c | 3 +- arch/arm/mach-ep93xx/adssphere.c | 11 +- arch/arm/mach-ep93xx/clock.c | 127 ++- arch/arm/mach-ep93xx/core.c | 79 +- arch/arm/mach-ep93xx/edb93xx.c | 10 +- arch/arm/mach-ep93xx/gesbc9312.c | 11 +- arch/arm/mach-ep93xx/gpio.c | 64 +- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 97 +- arch/arm/mach-ep93xx/include/mach/hardware.h | 17 +- arch/arm/mach-ep93xx/include/mach/io.h | 17 +- arch/arm/mach-ep93xx/include/mach/platform.h | 16 + arch/arm/mach-ep93xx/include/mach/system.h | 12 +- arch/arm/mach-ep93xx/include/mach/ts72xx.h | 1 - arch/arm/mach-ep93xx/micro9.c | 11 +- arch/arm/mach-ep93xx/ts72xx.c | 15 +- arch/arm/mach-integrator/integrator_cp.c | 2 + arch/arm/mach-nomadik/Kconfig | 21 + arch/arm/mach-nomadik/Makefile | 19 + arch/arm/mach-nomadik/Makefile.boot | 4 + arch/arm/mach-nomadik/board-nhk8815.c | 111 ++ arch/arm/mach-nomadik/clock.c | 45 + arch/arm/mach-nomadik/clock.h | 14 + arch/arm/mach-nomadik/cpu-8815.c | 139 ++ arch/arm/mach-nomadik/gpio.c | 396 ++++++ arch/arm/mach-nomadik/i2c-8815nhk.c | 65 + arch/arm/mach-nomadik/include/mach/clkdev.h | 7 + arch/arm/mach-nomadik/include/mach/debug-macro.S | 22 + arch/arm/mach-nomadik/include/mach/entry-macro.S | 43 + arch/arm/mach-nomadik/include/mach/gpio.h | 71 ++ arch/arm/mach-nomadik/include/mach/hardware.h | 90 ++ arch/arm/mach-nomadik/include/mach/io.h | 22 + arch/arm/mach-nomadik/include/mach/irqs.h | 82 ++ arch/arm/mach-nomadik/include/mach/memory.h | 28 + arch/arm/mach-nomadik/include/mach/mtu.h | 45 + arch/arm/mach-nomadik/include/mach/setup.h | 22 + arch/arm/mach-nomadik/include/mach/system.h | 45 + arch/arm/mach-nomadik/include/mach/timex.h | 6 + arch/arm/mach-nomadik/include/mach/uncompress.h | 63 + arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 + arch/arm/mach-nomadik/timer.c | 164 +++ arch/arm/mach-omap1/mcbsp.c | 1 - arch/arm/mach-omap2/mcbsp.c | 1 - arch/arm/mach-realview/core.c | 7 + arch/arm/mach-realview/include/mach/gpio.h | 6 + arch/arm/mach-realview/realview_eb.c | 22 +- arch/arm/mach-realview/realview_pb1176.c | 22 +- arch/arm/mach-realview/realview_pb11mp.c | 22 +- arch/arm/mach-realview/realview_pba8.c | 22 +- arch/arm/mach-realview/realview_pbx.c | 22 +- arch/arm/mach-u300/mmc.c | 2 + arch/arm/mach-versatile/core.c | 17 +- arch/arm/mach-versatile/include/mach/gpio.h | 6 + arch/arm/mach-versatile/include/mach/irqs.h | 11 +- arch/arm/mach-versatile/versatile_pb.c | 17 +- arch/arm/mm/Kconfig | 2 +- arch/arm/mm/proc-macros.S | 6 - arch/arm/plat-stmp3xxx/pinmux.c | 1 - arch/arm/tools/mach-types | 37 +- drivers/mmc/host/mmci.c | 71 +- drivers/mmc/host/mmci.h | 2 + drivers/mtd/nand/ts7250.c | 5 +- drivers/net/Kconfig | 2 +- drivers/spi/amba-pl022.c | 2 - drivers/video/Kconfig | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 36 - 93 files changed, 6119 insertions(+), 297 deletions(-) create mode 100644 arch/arm/configs/nhk8815_defconfig create mode 100644 arch/arm/mach-at91/at91sam9g45.c create mode 100644 arch/arm/mach-at91/at91sam9g45_devices.c create mode 100644 arch/arm/mach-at91/board-sam9m10g45ek.c create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h create mode 100644 arch/arm/mach-nomadik/Kconfig create mode 100644 arch/arm/mach-nomadik/Makefile create mode 100644 arch/arm/mach-nomadik/Makefile.boot create mode 100644 arch/arm/mach-nomadik/board-nhk8815.c create mode 100644 arch/arm/mach-nomadik/clock.c create mode 100644 arch/arm/mach-nomadik/clock.h create mode 100644 arch/arm/mach-nomadik/cpu-8815.c create mode 100644 arch/arm/mach-nomadik/gpio.c create mode 100644 arch/arm/mach-nomadik/i2c-8815nhk.c create mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h create mode 100644 arch/arm/mach-nomadik/include/mach/debug-macro.S create mode 100644 arch/arm/mach-nomadik/include/mach/entry-macro.S create mode 100644 arch/arm/mach-nomadik/include/mach/gpio.h create mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h create mode 100644 arch/arm/mach-nomadik/include/mach/io.h create mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h create mode 100644 arch/arm/mach-nomadik/include/mach/memory.h create mode 100644 arch/arm/mach-nomadik/include/mach/mtu.h create mode 100644 arch/arm/mach-nomadik/include/mach/setup.h create mode 100644 arch/arm/mach-nomadik/include/mach/system.h create mode 100644 arch/arm/mach-nomadik/include/mach/timex.h create mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h create mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h create mode 100644 arch/arm/mach-nomadik/timer.c create mode 100644 arch/arm/mach-realview/include/mach/gpio.h create mode 100644 arch/arm/mach-versatile/include/mach/gpio.h Merging davinci/for-next $ git merge davinci/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) Merging pxa/for-next $ git merge pxa/for-next Removing arch/arm/configs/littleton_defconfig Removing arch/arm/configs/zylonite_defconfig Auto-merging drivers/video/pxafb.c Merge made by recursive. arch/arm/configs/littleton_defconfig | 783 --------------- arch/arm/configs/pxa3xx_defconfig | 1332 ++++++++++++++++++++++++++ arch/arm/configs/zylonite_defconfig | 736 -------------- arch/arm/mach-pxa/Kconfig | 1 + arch/arm/mach-pxa/cm-x270.c | 54 +- arch/arm/mach-pxa/cm-x300.c | 71 +-- arch/arm/mach-pxa/colibri-pxa300.c | 1 + arch/arm/mach-pxa/colibri-pxa320.c | 33 + arch/arm/mach-pxa/colibri-pxa3xx.c | 52 +- arch/arm/mach-pxa/corgi.c | 75 +-- arch/arm/mach-pxa/csb726.c | 54 +- arch/arm/mach-pxa/devices.c | 27 + arch/arm/mach-pxa/devices.h | 2 + arch/arm/mach-pxa/em-x270.c | 39 +- arch/arm/mach-pxa/gumstix.c | 5 +- arch/arm/mach-pxa/idp.c | 5 +- arch/arm/mach-pxa/imote2.c | 3 + arch/arm/mach-pxa/include/mach/colibri.h | 6 + arch/arm/mach-pxa/include/mach/irqs.h | 4 +- arch/arm/mach-pxa/include/mach/mmc.h | 5 + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 4 +- arch/arm/mach-pxa/littleton.c | 43 +- arch/arm/mach-pxa/lubbock.c | 13 +- arch/arm/mach-pxa/magician.c | 49 +- arch/arm/mach-pxa/mainstone.c | 11 +- arch/arm/mach-pxa/mioa701.c | 84 +-- arch/arm/mach-pxa/palmld.c | 80 +-- arch/arm/mach-pxa/palmt5.c | 80 +-- arch/arm/mach-pxa/palmte2.c | 80 +-- arch/arm/mach-pxa/palmtx.c | 80 +-- arch/arm/mach-pxa/palmz72.c | 88 +-- arch/arm/mach-pxa/pcm990-baseboard.c | 67 +- arch/arm/mach-pxa/poodle.c | 53 +- arch/arm/mach-pxa/pxa300.c | 2 + arch/arm/mach-pxa/pxa320.c | 2 + arch/arm/mach-pxa/spitz.c | 62 +-- arch/arm/mach-pxa/tosa.c | 82 +-- arch/arm/mach-pxa/trizeps4.c | 3 + arch/arm/mach-pxa/zylonite.c | 3 + drivers/mmc/host/pxamci.c | 81 ++- drivers/video/pxafb.c | 8 +- 41 files changed, 1758 insertions(+), 2505 deletions(-) delete mode 100644 arch/arm/configs/littleton_defconfig create mode 100644 arch/arm/configs/pxa3xx_defconfig delete mode 100644 arch/arm/configs/zylonite_defconfig Merging thumb-2/thumb-2 $ git merge thumb-2/thumb-2 Auto-merging arch/arm/Kconfig Auto-merging arch/arm/Makefile Merge made by recursive. arch/arm/Kconfig | 15 +++ arch/arm/Kconfig.debug | 1 + arch/arm/Makefile | 11 ++- arch/arm/boot/Makefile | 9 ++- arch/arm/boot/compressed/head.S | 170 +++++++++++++++++++++-------------- arch/arm/include/asm/assembler.h | 84 ++++++++++++++++++ arch/arm/include/asm/elf.h | 3 + arch/arm/include/asm/futex.h | 1 + arch/arm/include/asm/memory.h | 6 ++ arch/arm/include/asm/uaccess.h | 7 +- arch/arm/include/asm/unified.h | 126 ++++++++++++++++++++++++++ arch/arm/kernel/entry-armv.S | 169 +++++++++++++++++++++-------------- arch/arm/kernel/entry-common.S | 28 ++---- arch/arm/kernel/entry-header.S | 92 ++++++++++++++++++- arch/arm/kernel/head-common.S | 15 ++- arch/arm/kernel/head-nommu.S | 11 ++- arch/arm/kernel/head.S | 28 ++++--- arch/arm/kernel/module.c | 53 +++++++++++ arch/arm/kernel/process.c | 2 +- arch/arm/kernel/setup.c | 28 +++++-- arch/arm/kernel/unwind.c | 4 + arch/arm/lib/ashldi3.S | 4 +- arch/arm/lib/ashrdi3.S | 4 +- arch/arm/lib/backtrace.S | 8 ++- arch/arm/lib/clear_user.S | 15 ++-- arch/arm/lib/copy_from_user.S | 19 ++-- arch/arm/lib/copy_template.S | 24 +++++- arch/arm/lib/copy_to_user.S | 19 ++-- arch/arm/lib/csumpartialcopyuser.S | 48 +++-------- arch/arm/lib/div64.S | 4 +- arch/arm/lib/findbit.S | 34 ++++++-- arch/arm/lib/getuser.S | 5 + arch/arm/lib/io-writesw-armv4.S | 5 +- arch/arm/lib/lshrdi3.S | 4 +- arch/arm/lib/memcpy.S | 7 +- arch/arm/lib/memmove.S | 28 +++--- arch/arm/lib/putuser.S | 15 +++ arch/arm/lib/sha1.S | 2 + arch/arm/lib/strncpy_from_user.S | 2 +- arch/arm/lib/strnlen_user.S | 2 +- arch/arm/mach-realview/platsmp.c | 18 ++--- arch/arm/mm/alignment.c | 20 +++- arch/arm/mm/cache-v7.S | 16 +++- arch/arm/mm/proc-v7.S | 5 +- arch/arm/vfp/entry.S | 2 + arch/arm/vfp/vfphw.S | 48 +++++++---- 46 files changed, 893 insertions(+), 328 deletions(-) create mode 100644 arch/arm/include/asm/unified.h Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Merge made by recursive. arch/cris/include/arch-v10/arch/mmu.h | 9 +++++---- arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- arch/cris/include/asm/pgtable.h | 2 ++ 3 files changed, 13 insertions(+), 8 deletions(-) Merging ia64/test $ git merge ia64/test Merge made by recursive. arch/ia64/include/asm/fpu.h | 2 ++ arch/ia64/include/asm/xen/hypervisor.h | 1 + arch/ia64/kernel/dma-mapping.c | 8 ++++++++ arch/ia64/kernel/setup.c | 6 ++++++ 4 files changed, 17 insertions(+), 0 deletions(-) Merging m68k/for-next $ git merge m68k/for-next Auto-merging drivers/rtc/Kconfig Auto-merging drivers/rtc/Makefile Merge made by recursive. drivers/rtc/Kconfig | 19 +++ drivers/rtc/Makefile | 2 + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ 4 files changed, 511 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-msm6242.c create mode 100644 drivers/rtc/rtc-rp5c01.c Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/checksum_mm.h Removing arch/m68k/include/asm/checksum_no.h Removing arch/m68k/include/asm/dma_mm.h Removing arch/m68k/include/asm/dma_no.h Removing arch/m68k/include/asm/elia.h Removing arch/m68k/include/asm/hardirq_mm.h Removing arch/m68k/include/asm/hardirq_no.h Removing arch/m68k/include/asm/irq_mm.h Removing arch/m68k/include/asm/irq_no.h Removing arch/m68k/include/asm/processor_mm.h Removing arch/m68k/include/asm/processor_no.h Auto-merging drivers/net/fec.c Merge made by recursive. arch/m68k/include/asm/checksum.h | 173 +++++++- arch/m68k/include/asm/checksum_mm.h | 148 ------- arch/m68k/include/asm/checksum_no.h | 132 ------ arch/m68k/include/asm/dma.h | 492 +++++++++++++++++++++- arch/m68k/include/asm/dma_mm.h | 16 - arch/m68k/include/asm/dma_no.h | 494 --------------------- arch/m68k/include/asm/elia.h | 41 -- arch/m68k/include/asm/gpio.h | 238 ++++++++++ arch/m68k/include/asm/hardirq.h | 13 +- arch/m68k/include/asm/hardirq_mm.h | 16 - arch/m68k/include/asm/hardirq_no.h | 27 -- arch/m68k/include/asm/irq.h | 135 ++++++- arch/m68k/include/asm/irq_mm.h | 126 ------ arch/m68k/include/asm/irq_no.h | 26 -- arch/m68k/include/asm/m5206sim.h | 33 +- arch/m68k/include/asm/m520xsim.h | 77 +++- arch/m68k/include/asm/m523xsim.h | 77 ++++ arch/m68k/include/asm/m5249sim.h | 54 ++- arch/m68k/include/asm/m5272sim.h | 62 +++- arch/m68k/include/asm/m527xsim.h | 169 +++++++ arch/m68k/include/asm/m528xsim.h | 151 +++++++ arch/m68k/include/asm/m5307sim.h | 32 +- arch/m68k/include/asm/m532xsim.h | 198 ++++----- arch/m68k/include/asm/m5407sim.h | 28 +- arch/m68k/include/asm/mcfgpio.h | 40 ++ arch/m68k/include/asm/mcfintc.h | 89 ++++ arch/m68k/include/asm/mcfsim.h | 93 +---- arch/m68k/include/asm/mcfsmc.h | 6 +- arch/m68k/include/asm/nettel.h | 4 +- arch/m68k/include/asm/pinmux.h | 30 ++ arch/m68k/include/asm/processor.h | 171 +++++++- arch/m68k/include/asm/processor_mm.h | 130 ------ arch/m68k/include/asm/processor_no.h | 143 ------ arch/m68knommu/Kconfig | 6 + arch/m68knommu/kernel/irq.c | 26 -- arch/m68knommu/kernel/time.c | 2 +- arch/m68knommu/lib/checksum.c | 11 +- arch/m68knommu/platform/5206/Makefile | 2 +- arch/m68knommu/platform/5206/config.c | 56 +-- arch/m68knommu/platform/5206/gpio.c | 49 ++ arch/m68knommu/platform/5206e/Makefile | 2 +- arch/m68knommu/platform/5206e/config.c | 58 +-- arch/m68knommu/platform/5206e/gpio.c | 49 ++ arch/m68knommu/platform/520x/Makefile | 2 +- arch/m68knommu/platform/520x/config.c | 30 -- arch/m68knommu/platform/520x/gpio.c | 211 +++++++++ arch/m68knommu/platform/523x/Makefile | 2 +- arch/m68knommu/platform/523x/config.c | 63 --- arch/m68knommu/platform/523x/gpio.c | 283 ++++++++++++ arch/m68knommu/platform/5249/Makefile | 2 +- arch/m68knommu/platform/5249/config.c | 49 +-- arch/m68knommu/platform/5249/gpio.c | 65 +++ arch/m68knommu/platform/5249/intc2.c | 59 +++ arch/m68knommu/platform/5272/Makefile | 2 +- arch/m68knommu/platform/5272/config.c | 78 +--- arch/m68knommu/platform/5272/gpio.c | 81 ++++ arch/m68knommu/platform/5272/intc.c | 138 ++++++ arch/m68knommu/platform/527x/Makefile | 2 +- arch/m68knommu/platform/527x/config.c | 49 -- arch/m68knommu/platform/527x/gpio.c | 607 ++++++++++++++++++++++++++ arch/m68knommu/platform/528x/Makefile | 2 +- arch/m68knommu/platform/528x/config.c | 51 +-- arch/m68knommu/platform/528x/gpio.c | 438 +++++++++++++++++++ arch/m68knommu/platform/5307/Makefile | 2 +- arch/m68knommu/platform/5307/config.c | 65 +-- arch/m68knommu/platform/5307/gpio.c | 49 ++ arch/m68knommu/platform/532x/Makefile | 2 +- arch/m68knommu/platform/532x/config.c | 53 +--- arch/m68knommu/platform/532x/gpio.c | 337 ++++++++++++++ arch/m68knommu/platform/5407/Makefile | 2 +- arch/m68knommu/platform/5407/config.c | 68 +-- arch/m68knommu/platform/5407/gpio.c | 49 ++ arch/m68knommu/platform/68328/ints.c | 72 ++-- arch/m68knommu/platform/68360/ints.c | 44 ++- arch/m68knommu/platform/coldfire/Makefile | 21 +- arch/m68knommu/platform/coldfire/gpio.c | 127 ++++++ arch/m68knommu/platform/coldfire/intc-2.c | 93 ++++ arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ arch/m68knommu/platform/coldfire/intc.c | 153 +++++++ arch/m68knommu/platform/coldfire/pinmux.c | 28 ++ arch/m68knommu/platform/coldfire/pit.c | 8 - arch/m68knommu/platform/coldfire/timers.c | 18 +- arch/m68knommu/platform/coldfire/vectors.c | 20 +- drivers/net/fec.c | 18 +- 84 files changed, 5180 insertions(+), 2266 deletions(-) delete mode 100644 arch/m68k/include/asm/checksum_mm.h delete mode 100644 arch/m68k/include/asm/checksum_no.h delete mode 100644 arch/m68k/include/asm/dma_mm.h delete mode 100644 arch/m68k/include/asm/dma_no.h delete mode 100644 arch/m68k/include/asm/elia.h create mode 100644 arch/m68k/include/asm/gpio.h delete mode 100644 arch/m68k/include/asm/hardirq_mm.h delete mode 100644 arch/m68k/include/asm/hardirq_no.h delete mode 100644 arch/m68k/include/asm/irq_mm.h delete mode 100644 arch/m68k/include/asm/irq_no.h create mode 100644 arch/m68k/include/asm/mcfgpio.h create mode 100644 arch/m68k/include/asm/mcfintc.h create mode 100644 arch/m68k/include/asm/pinmux.h delete mode 100644 arch/m68k/include/asm/processor_mm.h delete mode 100644 arch/m68k/include/asm/processor_no.h create mode 100644 arch/m68knommu/platform/5206/gpio.c create mode 100644 arch/m68knommu/platform/5206e/gpio.c create mode 100644 arch/m68knommu/platform/520x/gpio.c create mode 100644 arch/m68knommu/platform/523x/gpio.c create mode 100644 arch/m68knommu/platform/5249/gpio.c create mode 100644 arch/m68knommu/platform/5249/intc2.c create mode 100644 arch/m68knommu/platform/5272/gpio.c create mode 100644 arch/m68knommu/platform/5272/intc.c create mode 100644 arch/m68knommu/platform/527x/gpio.c create mode 100644 arch/m68knommu/platform/528x/gpio.c create mode 100644 arch/m68knommu/platform/5307/gpio.c create mode 100644 arch/m68knommu/platform/532x/gpio.c create mode 100644 arch/m68knommu/platform/5407/gpio.c create mode 100644 arch/m68knommu/platform/coldfire/gpio.c create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c create mode 100644 arch/m68knommu/platform/coldfire/intc.c create mode 100644 arch/m68knommu/platform/coldfire/pinmux.c Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/include/asm/io.h | 1 - arch/microblaze/include/asm/tlb.h | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Resolved 'arch/mips/cavium-octeon/dma-octeon.c' using previous resolution. Resolved 'arch/mips/cavium-octeon/executive/cvmx-helper-errata.c' using previous resolution. Resolved 'arch/mips/mm/tlbex.c' using previous resolution. Resolved 'arch/mips/sibyte/swarm/setup.c' using previous resolution. Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. Resolved 'drivers/char/hw_random/Makefile' using previous resolution. Resolved 'drivers/dma/txx9dmac.c' using previous resolution. Auto-merging arch/mips/Kconfig Auto-merging arch/mips/cavium-octeon/dma-octeon.c CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c Auto-merging arch/mips/cavium-octeon/octeon-irq.c Auto-merging arch/mips/include/asm/cpu-features.h Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h Auto-merging arch/mips/mm/c-r4k.c Auto-merging arch/mips/mm/tlbex.c CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c Auto-merging arch/mips/sibyte/Kconfig Auto-merging arch/mips/sibyte/swarm/setup.c CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c Auto-merging drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig Auto-merging drivers/char/hw_random/Makefile CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile Auto-merging drivers/dma/txx9dmac.c CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 25a4634] Merge commit 'mips/mips-for-linux-next' $ git diff -M --stat --summary HEAD^.. arch/mips/cavium-octeon/Makefile | 4 + arch/mips/cavium-octeon/msi.c | 288 +++++++ arch/mips/cavium-octeon/pci-common.c | 137 ++++ arch/mips/cavium-octeon/pci-common.h | 39 + arch/mips/cavium-octeon/pci.c | 568 ++++++++++++++ arch/mips/cavium-octeon/pcie.c | 1370 ++++++++++++++++++++++++++++++++++ 6 files changed, 2406 insertions(+), 0 deletions(-) create mode 100644 arch/mips/cavium-octeon/msi.c create mode 100644 arch/mips/cavium-octeon/pci-common.c create mode 100644 arch/mips/cavium-octeon/pci-common.h create mode 100644 arch/mips/cavium-octeon/pci.c create mode 100644 arch/mips/cavium-octeon/pcie.c Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Removing arch/s390/power/Makefile Removing arch/s390/power/suspend.c Removing arch/s390/power/swsusp.c Removing arch/s390/power/swsusp_64.c Merge made by recursive. arch/s390/Kconfig | 1 - arch/s390/Makefile | 3 +- arch/s390/include/asm/atomic.h | 205 +++++++++---- arch/s390/include/asm/checksum.h | 25 +-- arch/s390/include/asm/chsc.h | 28 ++ arch/s390/include/asm/cio.h | 223 +------------- .../cio/scsw.c => arch/s390/include/asm/scsw.h | 345 +++++++++++++------- arch/s390/include/asm/timex.h | 16 +- arch/s390/kernel/Makefile | 4 +- arch/s390/kernel/early.c | 6 +- arch/s390/kernel/head.S | 2 +- arch/s390/kernel/mcount.S | 147 +-------- arch/s390/kernel/mcount64.S | 78 +++++ arch/s390/kernel/smp.c | 7 +- arch/s390/kernel/suspend.c | 73 ++++ arch/s390/{power => kernel}/swsusp_asm64.S | 37 +-- arch/s390/kernel/time.c | 9 +- arch/s390/kernel/vdso64/clock_gettime.S | 11 +- arch/s390/power/Makefile | 8 - arch/s390/power/suspend.c | 40 --- arch/s390/power/swsusp.c | 30 -- arch/s390/power/swsusp_64.c | 17 - drivers/s390/block/dasd.c | 21 +- drivers/s390/block/dasd_alias.c | 3 +- drivers/s390/block/dasd_diag.c | 3 +- drivers/s390/block/dasd_eckd.c | 45 +-- drivers/s390/block/dasd_eer.c | 2 +- drivers/s390/block/dasd_fba.c | 7 +- drivers/s390/block/dasd_int.h | 11 +- drivers/s390/cio/Makefile | 2 +- drivers/s390/cio/chsc.h | 24 -- drivers/s390/cio/qdio_main.c | 4 +- net/iucv/iucv.c | 14 + 33 files changed, 678 insertions(+), 773 deletions(-) rename drivers/s390/cio/scsw.c => arch/s390/include/asm/scsw.h (70%) create mode 100644 arch/s390/kernel/mcount64.S create mode 100644 arch/s390/kernel/suspend.c rename arch/s390/{power => kernel}/swsusp_asm64.S (86%) delete mode 100644 arch/s390/power/Makefile delete mode 100644 arch/s390/power/suspend.c delete mode 100644 arch/s390/power/swsusp.c delete mode 100644 arch/s390/power/swsusp_64.c Merging sh/master $ git merge sh/master Removing arch/sh/boot/compressed/misc_32.c Removing arch/sh/boot/compressed/misc_64.c Removing arch/sh/boot/compressed/piggy.S Auto-merging drivers/video/Kconfig Merge made by recursive. arch/sh/Kconfig | 7 + arch/sh/Kconfig.debug | 11 ++- arch/sh/Makefile | 4 + arch/sh/boot/compressed/.gitignore | 1 + arch/sh/boot/compressed/Makefile | 25 +++- arch/sh/boot/compressed/misc.c | 149 +++++++++++++++++++++ arch/sh/boot/compressed/misc_32.c | 206 ---------------------------- arch/sh/boot/compressed/misc_64.c | 210 ----------------------------- arch/sh/boot/compressed/piggy.S | 8 - arch/sh/boot/compressed/vmlinux.scr | 10 ++ arch/sh/include/asm/ftrace.h | 7 +- arch/sh/include/asm/hwblk.h | 61 +++++++++ arch/sh/include/asm/lmb.h | 6 + arch/sh/include/asm/suspend.h | 9 ++ arch/sh/include/asm/syscall_32.h | 1 + arch/sh/include/asm/thread_info.h | 11 +- arch/sh/include/cpu-sh4/cpu/sh7722.h | 14 ++ arch/sh/kernel/Makefile_32 | 2 + arch/sh/kernel/asm-offsets.c | 1 + arch/sh/kernel/cpu/Makefile | 2 +- arch/sh/kernel/cpu/hwblk.c | 130 ++++++++++++++++++ arch/sh/kernel/cpu/sh4a/Makefile | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 60 +++++---- arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c | 106 +++++++++++++++ arch/sh/kernel/cpu/shmobile/Makefile | 1 + arch/sh/kernel/cpu/shmobile/cpuidle.c | 102 ++++++++++++++ arch/sh/kernel/cpu/shmobile/pm.c | 26 ++-- arch/sh/kernel/entry-common.S | 18 ++- arch/sh/kernel/ftrace.c | 190 ++++++++++++++++++++++++++ arch/sh/kernel/irq.c | 17 --- arch/sh/kernel/process_32.c | 5 +- arch/sh/kernel/ptrace_32.c | 8 + arch/sh/kernel/setup.c | 71 +++++++--- arch/sh/kernel/sh_ksyms_32.c | 4 +- arch/sh/kernel/time.c | 2 + arch/sh/kernel/vmlinux.lds.S | 87 ++----------- arch/sh/lib/Makefile | 2 +- arch/sh/lib/mcount.S | 228 +++++++++++++++++++++++++++++++- arch/sh/mm/fault_32.c | 164 +++++++++++++++-------- arch/sh/mm/numa.c | 36 ++++-- drivers/usb/gadget/m66592-udc.c | 34 ++--- drivers/usb/gadget/m66592-udc.h | 1 - drivers/video/Kconfig | 2 +- drivers/video/sh_mobile_lcdcfb.c | 16 +-- 44 files changed, 1339 insertions(+), 718 deletions(-) create mode 100644 arch/sh/boot/compressed/.gitignore create mode 100644 arch/sh/boot/compressed/misc.c delete mode 100644 arch/sh/boot/compressed/misc_32.c delete mode 100644 arch/sh/boot/compressed/misc_64.c delete mode 100644 arch/sh/boot/compressed/piggy.S create mode 100644 arch/sh/boot/compressed/vmlinux.scr create mode 100644 arch/sh/include/asm/hwblk.h create mode 100644 arch/sh/include/asm/lmb.h create mode 100644 arch/sh/kernel/cpu/hwblk.c create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c create mode 100644 arch/sh/kernel/cpu/shmobile/cpuidle.c Merging sparc/master $ git merge sparc/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/cifs_debug.c | 8 +++++++- fs/cifs/cifsglob.h | 2 ++ fs/cifs/cifssmb.c | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Resolved 'fs/configfs/dir.c' using previous resolution. Auto-merging fs/configfs/dir.c CONFLICT (content): Merge conflict in fs/configfs/dir.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c27cd6a] Merge commit 'configfs/linux-next' $ git diff -M --stat --summary HEAD^.. Merging ext4/next $ git merge ext4/next Merge made by recursive. fs/ext4/mballoc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Auto-merging fs/fuse/dev.c Merge made by recursive. fs/fuse/dev.c | 10 +++++----- fs/fuse/fuse_i.h | 12 ++++++------ fs/fuse/inode.c | 14 ++++++++++++++ include/linux/fuse.h | 29 +++++++++++++++++++++++++++-- 4 files changed, 52 insertions(+), 13 deletions(-) Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/aops.c | 39 +++++++++++++++++++++ fs/gfs2/glock.c | 99 ++++++++++++++++++++++++++++++------------------------ fs/gfs2/rgrp.c | 23 +++++-------- fs/gfs2/super.c | 39 ++++++++++++++-------- fs/gfs2/super.h | 4 ++ 5 files changed, 132 insertions(+), 72 deletions(-) Merging jfs/next $ git merge jfs/next Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/nfssvc.c Merge made by recursive. fs/nfsd/nfs4proc.c | 47 +++++++++++++++-- fs/nfsd/nfs4state.c | 10 ++-- fs/nfsd/nfssvc.c | 19 +++++-- include/linux/nfs4.h | 2 +- include/linux/nfsd/nfsd.h | 3 + include/linux/sunrpc/svc.h | 2 - net/sunrpc/svcsock.c | 84 ++++++++++++++++++++---------- net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +- 8 files changed, 124 insertions(+), 47 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Merge made by recursive. fs/Kconfig | 27 +-------------------------- fs/nilfs2/Kconfig | 25 +++++++++++++++++++++++++ fs/nilfs2/super.c | 27 +++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 fs/nilfs2/Kconfig Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/dlm/dlmrecovery.c | 2 +- fs/ocfs2/file.c | 4 +++- fs/ocfs2/journal.c | 8 +++++++- fs/ocfs2/journal.h | 1 + fs/ocfs2/super.c | 4 +++- 5 files changed, 15 insertions(+), 4 deletions(-) Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'net/9p/protocol.c' using previous resolution. Auto-merging net/9p/protocol.c CONFLICT (content): Merge conflict in net/9p/protocol.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0343187] Merge commit 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Auto-merging fs/xfs/linux-2.6/xfs_super.c Auto-merging fs/xfs/xfs_inode.h Merge made by recursive. fs/xfs/linux-2.6/xfs_super.c | 2 +- fs/xfs/linux-2.6/xfs_sync.c | 15 --------------- fs/xfs/linux-2.6/xfs_sync.h | 1 - fs/xfs/xfs_bmap.c | 2 +- fs/xfs/xfs_bmap.h | 11 ----------- fs/xfs/xfs_bmap_btree.c | 20 ++++++++++---------- fs/xfs/xfs_bmap_btree.h | 1 - fs/xfs/xfs_btree.c | 42 +----------------------------------------- fs/xfs/xfs_btree.h | 15 --------------- fs/xfs/xfs_inode.c | 8 ++++---- fs/xfs/xfs_inode.h | 5 ----- fs/xfs/xfs_inum.h | 1 - fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_itable.h | 5 ----- fs/xfs/xfs_log_priv.h | 2 -- fs/xfs/xfs_log_recover.c | 2 +- fs/xfs/xfs_mount.c | 2 +- fs/xfs/xfs_mount.h | 3 --- fs/xfs/xfs_mru_cache.c | 29 ----------------------------- fs/xfs/xfs_mru_cache.h | 1 - fs/xfs/xfs_rw.h | 6 ------ fs/xfs/xfs_vnodeops.c | 2 +- 22 files changed, 21 insertions(+), 156 deletions(-) Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 $ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 Resolved 'fs/reiserfs/journal.c' using previous resolution. Resolved 'fs/reiserfs/super.c' using previous resolution. Auto-merging fs/reiserfs/dir.c Auto-merging fs/reiserfs/do_balan.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/reiserfs/journal.c CONFLICT (content): Merge conflict in fs/reiserfs/journal.c Auto-merging fs/reiserfs/resize.c Auto-merging fs/reiserfs/super.c CONFLICT (content): Merge conflict in fs/reiserfs/super.c Auto-merging fs/reiserfs/xattr.c Auto-merging include/linux/reiserfs_fs.h Auto-merging include/linux/reiserfs_fs_sb.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 49b04a3] Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6' $ git diff -M --stat --summary HEAD^.. fs/reiserfs/Makefile | 2 +- fs/reiserfs/bitmap.c | 4 ++ fs/reiserfs/dir.c | 8 +++ fs/reiserfs/do_balan.c | 17 ++---- fs/reiserfs/fix_node.c | 19 ++++++-- fs/reiserfs/inode.c | 73 ++++++++++++++++++--------- fs/reiserfs/ioctl.c | 6 ++- fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ fs/reiserfs/lock.c | 89 ++++++++++++++++++++++++++++++++ fs/reiserfs/namei.c | 13 ++++- fs/reiserfs/prints.c | 4 -- fs/reiserfs/resize.c | 2 + fs/reiserfs/stree.c | 53 ++++++++++++++++--- fs/reiserfs/super.c | 55 +++++++++++++++++--- fs/reiserfs/xattr.c | 4 +- include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- include/linux/reiserfs_fs_sb.h | 20 +++++++ 17 files changed, 441 insertions(+), 105 deletions(-) create mode 100644 fs/reiserfs/lock.c Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Merge made by recursive. arch/alpha/include/asm/pci.h | 1 - arch/arm/include/asm/pci.h | 2 - arch/frv/mb93090-mb00/pci-frv.c | 10 ++--- arch/h8300/include/asm/pci.h | 1 - arch/ia64/include/asm/pci.h | 14 +++++++- arch/mips/include/asm/pci.h | 2 - arch/mn10300/include/asm/pci.h | 13 +++++++- arch/parisc/include/asm/pci.h | 1 - arch/powerpc/include/asm/pci.h | 1 - arch/sh/include/asm/pci.h | 1 - arch/sparc/include/asm/pci_32.h | 1 - arch/sparc/include/asm/pci_64.h | 1 - arch/um/include/asm/pci.h | 1 - arch/x86/include/asm/pci.h | 1 - arch/x86/pci/amd_bus.c | 64 +----------------------------------- arch/x86/pci/common.c | 69 +++++++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 3 +- drivers/pci/setup-res.c | 1 + drivers/pcmcia/yenta_socket.c | 16 ++++---- include/asm-generic/pci.h | 13 +++++++- 20 files changed, 120 insertions(+), 96 deletions(-) Merging hid/for-next $ git merge hid/for-next Auto-merging drivers/hid/usbhid/hid-core.c Auto-merging drivers/hid/usbhid/hiddev.c Merge made by recursive. drivers/hid/Kconfig | 29 +-- drivers/hid/Makefile | 6 +- drivers/hid/hid-a4tech.c | 4 +- drivers/hid/hid-apple.c | 4 +- drivers/hid/hid-belkin.c | 4 +- drivers/hid/hid-cherry.c | 4 +- drivers/hid/hid-chicony.c | 4 +- drivers/hid/hid-core.c | 59 +++++-- drivers/hid/hid-cypress.c | 4 +- drivers/hid/hid-debug.c | 438 ++++++++++++++++++++++++++++++++++------- drivers/hid/hid-ezkey.c | 4 +- drivers/hid/hid-gyration.c | 4 +- drivers/hid/hid-ids.h | 4 + drivers/hid/hid-input.c | 13 +-- drivers/hid/hid-kensington.c | 4 +- drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lg.c | 6 +- drivers/hid/hid-lgff.c | 6 +- drivers/hid/hid-microsoft.c | 4 +- drivers/hid/hid-monterey.c | 4 +- drivers/hid/hid-ntrig.c | 37 +++- drivers/hid/hid-petalynx.c | 4 +- drivers/hid/hid-pl.c | 4 +- drivers/hid/hid-samsung.c | 43 ++++- drivers/hid/hid-sjoy.c | 4 +- drivers/hid/hid-sony.c | 4 +- drivers/hid/hid-sunplus.c | 4 +- drivers/hid/hid-tmff.c | 10 +- drivers/hid/hid-topseed.c | 4 +- drivers/hid/hid-twinhan.c | 147 ++++++++++++++ drivers/hid/hid-wacom.c | 4 +- drivers/hid/hid-zpff.c | 4 +- drivers/hid/usbhid/hid-core.c | 9 +- drivers/hid/usbhid/hiddev.c | 4 +- include/linux/hid-debug.h | 48 ++++-- include/linux/hid.h | 22 +-- 36 files changed, 742 insertions(+), 219 deletions(-) create mode 100644 drivers/hid/hid-twinhan.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/busses/i2c-taos-evm.c | 45 +++++++++++++++++++----------------- drivers/i2c/chips/tsl2550.c | 17 ++++++++----- include/linux/i2c-id.h | 11 --------- include/linux/i2c.h | 2 - 4 files changed, 34 insertions(+), 41 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/tmp421 | 36 +++++ drivers/hwmon/Kconfig | 10 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/hwmon-vid.c | 10 +- drivers/hwmon/pc87427.c | 6 +- drivers/hwmon/tmp421.c | 347 ++++++++++++++++++++++++++++++++++++++++++++ drivers/hwmon/vt1211.c | 6 +- 7 files changed, 409 insertions(+), 7 deletions(-) create mode 100644 Documentation/hwmon/tmp421 create mode 100644 drivers/hwmon/tmp421.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merging drivers/media/radio/radio-si470x.c Auto-merging drivers/media/video/bt8xx/bttv-driver.c Auto-merging drivers/media/video/pwc/pwc.h Merge made by recursive. Documentation/video4linux/CARDLIST.em28xx | 2 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/dib0070.c | 2 +- drivers/media/dvb/frontends/mt312.c | 7 +- drivers/media/dvb/frontends/stv0900_sw.c | 2 +- drivers/media/dvb/frontends/zl10036.c | 2 +- drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- drivers/media/radio/radio-si470x.c | 381 ++++++++++++++------------- drivers/media/video/adv7343.c | 1 - drivers/media/video/bt8xx/bttv-driver.c | 12 +- drivers/media/video/cx18/cx18-cards.c | 2 +- drivers/media/video/cx18/cx18-driver.c | 41 +++- drivers/media/video/cx18/cx18-fileops.c | 2 +- drivers/media/video/cx18/cx18-ioctl.c | 2 +- drivers/media/video/cx231xx/cx231xx-video.c | 4 +- drivers/media/video/cx23885/cx23885.h | 2 +- drivers/media/video/em28xx/em28xx-cards.c | 2 + drivers/media/video/ivtv/ivtv-driver.c | 2 +- drivers/media/video/meye.c | 3 +- drivers/media/video/pwc/pwc.h | 6 - drivers/media/video/saa7134/saa7134-video.c | 2 +- drivers/media/video/uvc/uvc_ctrl.c | 205 ++++++++------- drivers/media/video/uvc/uvc_driver.c | 139 +++++----- drivers/media/video/uvc/uvc_v4l2.c | 14 +- drivers/media/video/uvc/uvc_video.c | 30 ++- drivers/media/video/uvc/uvcvideo.h | 160 +----------- drivers/media/video/v4l2-ioctl.c | 23 ++- include/linux/usb/video.h | 164 ++++++++++++ include/linux/videodev2.h | 39 ++-- include/media/v4l2-subdev.h | 3 + 32 files changed, 666 insertions(+), 596 deletions(-) create mode 100644 include/linux/usb/video.h Merging quota/for_next $ git merge quota/for_next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Auto-merging drivers/ata/libata-eh.c Merge made by recursive. drivers/ata/libata-eh.c | 6 ++++-- drivers/ata/sata_sil.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/core/mad.c | 6 +---- drivers/infiniband/core/sa_query.c | 7 +---- drivers/infiniband/core/uverbs_main.c | 4 +-- drivers/infiniband/hw/ehca/ehca_main.c | 8 +++--- drivers/infiniband/hw/mthca/mthca_config_reg.h | 2 - drivers/infiniband/hw/mthca/mthca_reset.c | 1 - drivers/infiniband/ulp/ipoib/ipoib.h | 1 - drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 - drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 - drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 7 +----- drivers/net/mlx4/cq.c | 1 - drivers/net/mlx4/eq.c | 1 - drivers/net/mlx4/icm.c | 1 - drivers/net/mlx4/main.c | 26 +++++++---------------- drivers/net/mlx4/mcg.c | 1 - drivers/net/mlx4/mr.c | 1 - drivers/net/mlx4/pd.c | 1 - drivers/net/mlx4/profile.c | 2 - drivers/net/mlx4/qp.c | 2 - drivers/net/mlx4/reset.c | 1 - drivers/net/mlx4/srq.c | 2 - 21 files changed, 17 insertions(+), 60 deletions(-) Merging acpi/test $ git merge acpi/test Merge made by recursive. arch/ia64/hp/common/sba_iommu.c | 7 +- arch/x86/kernel/reboot.c | 2 +- drivers/acpi/Kconfig | 17 ++- drivers/acpi/Makefile | 2 + drivers/acpi/acpi_memhotplug.c | 51 ++--- drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/acpica/acconfig.h | 10 +- drivers/acpi/acpica/acdebug.h | 4 - drivers/acpi/acpica/acglobal.h | 36 ++-- drivers/acpi/acpica/achware.h | 8 + drivers/acpi/acpica/acinterp.h | 4 +- drivers/acpi/acpica/aclocal.h | 13 ++ drivers/acpi/acpica/acmacros.h | 2 + drivers/acpi/acpica/acnamesp.h | 2 + drivers/acpi/acpica/acutils.h | 30 ++- drivers/acpi/acpica/amlcode.h | 1 + drivers/acpi/acpica/evevent.c | 13 +- drivers/acpi/acpica/evgpe.c | 8 +- drivers/acpi/acpica/evgpeblk.c | 4 +- drivers/acpi/acpica/evrgnini.c | 45 +---- drivers/acpi/acpica/exdump.c | 6 +- drivers/acpi/acpica/exfield.c | 82 +++++--- drivers/acpi/acpica/exfldio.c | 7 +- drivers/acpi/acpica/exutils.c | 53 +++-- drivers/acpi/acpica/hwgpe.c | 34 ++-- drivers/acpi/acpica/hwregs.c | 206 +++++++++++++++++- drivers/acpi/acpica/hwsleep.c | 24 +-- drivers/acpi/acpica/hwtimer.c | 2 +- drivers/acpi/acpica/hwxface.c | 180 ++++++++++------- drivers/acpi/acpica/nsalloc.c | 88 ++++++--- drivers/acpi/acpica/nsdumpdv.c | 7 +- drivers/acpi/acpica/nsload.c | 3 +- drivers/acpi/acpica/nspredef.c | 396 +++++++++++++++++++---------------- drivers/acpi/acpica/nsutils.c | 5 +- drivers/acpi/acpica/nsxfeval.c | 23 ++- drivers/acpi/acpica/nsxfname.c | 237 ++++++++++++++++----- drivers/acpi/acpica/tbutils.c | 82 +++++++- drivers/acpi/acpica/uteval.c | 375 ++++----------------------------- drivers/acpi/acpica/utglobal.c | 11 +- drivers/acpi/acpica/utids.c | 382 +++++++++++++++++++++++++++++++++ drivers/acpi/acpica/utmisc.c | 85 +++++++- drivers/acpi/bus.c | 2 +- drivers/acpi/container.c | 11 +- drivers/acpi/dock.c | 8 +- drivers/acpi/ec.c | 118 ++++------- drivers/acpi/glue.c | 8 +- drivers/acpi/processor_aggregator.c | 389 ++++++++++++++++++++++++++++++++++ drivers/acpi/processor_core.c | 244 ++++++++++----------- drivers/acpi/processor_idle.c | 10 +- drivers/acpi/processor_thermal.c | 3 +- drivers/acpi/processor_throttling.c | 3 +- drivers/acpi/scan.c | 160 +++++++++------ drivers/acpi/sleep.c | 14 -- drivers/char/agp/hp-agp.c | 9 +- drivers/ide/ide-acpi.c | 5 +- drivers/pci/hotplug/acpiphp_ibm.c | 12 +- drivers/platform/x86/sony-laptop.c | 7 +- drivers/pnp/pnpacpi/core.c | 6 +- include/acpi/acpi_bus.h | 14 +- include/acpi/acpixf.h | 10 +- include/acpi/actbl.h | 19 ++- include/acpi/actbl1.h | 8 +- include/acpi/actypes.h | 92 ++++---- 63 files changed, 2386 insertions(+), 1315 deletions(-) create mode 100644 drivers/acpi/acpica/utids.c create mode 100644 drivers/acpi/processor_aggregator.c 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 kvm/master $ git merge kvm/master Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/include/asm/msr-index.h Removing arch/x86/kvm/kvm_svm.h Removing virt/kvm/kvm_trace.c Merge made by recursive. Documentation/kernel-parameters.txt | 39 ++ Documentation/kvm/api.txt | 683 ++++++++++++++++++++++++++++++++ arch/ia64/include/asm/kvm_host.h | 4 +- arch/ia64/kvm/Kconfig | 11 +- arch/ia64/kvm/kvm-ia64.c | 85 ++--- arch/ia64/kvm/mmio.c | 6 +- arch/ia64/kvm/vcpu.c | 10 +- arch/ia64/kvm/vcpu.h | 13 +- arch/powerpc/include/asm/kvm_host.h | 4 +- arch/powerpc/kvm/44x.c | 4 +- arch/powerpc/kvm/44x_tlb.c | 11 +- arch/powerpc/kvm/Kconfig | 14 +- arch/powerpc/kvm/Makefile | 4 +- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/kvm/e500.c | 7 +- arch/powerpc/kvm/e500_emulate.c | 3 + arch/powerpc/kvm/e500_tlb.c | 26 +- arch/powerpc/kvm/e500_tlb.h | 6 +- arch/powerpc/kvm/emulate.c | 7 +- arch/powerpc/kvm/powerpc.c | 32 +- arch/powerpc/kvm/trace.h | 104 +++++ arch/s390/include/asm/kvm_host.h | 15 +- arch/s390/kvm/Kconfig | 9 +- arch/s390/kvm/gaccess.h | 23 +- arch/s390/kvm/intercept.c | 18 +- arch/s390/kvm/interrupt.c | 8 +- arch/s390/kvm/kvm-s390.c | 78 ++--- arch/s390/kvm/kvm-s390.h | 32 ++- arch/s390/kvm/sigp.c | 60 ++-- arch/x86/include/asm/apicdef.h | 2 + arch/x86/include/asm/kvm.h | 10 + arch/x86/include/asm/kvm_host.h | 50 ++-- arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/vmx.h | 8 + arch/x86/kvm/Kconfig | 21 +- arch/x86/kvm/Makefile | 35 +- arch/x86/kvm/i8254.c | 159 +++++--- arch/x86/kvm/i8254.h | 5 +- arch/x86/kvm/i8259.c | 58 ++- arch/x86/kvm/kvm_cache_regs.h | 9 + arch/x86/kvm/kvm_svm.h | 51 --- arch/x86/kvm/kvm_timer.h | 2 +- arch/x86/kvm/lapic.c | 322 +++++++++++---- arch/x86/kvm/lapic.h | 4 + arch/x86/kvm/mmu.c | 362 ++++++++++++------ arch/x86/kvm/mmu.h | 4 +- arch/x86/kvm/mmutrace.h | 220 +++++++++++ arch/x86/kvm/paging_tmpl.h | 54 ++-- arch/x86/kvm/svm.c | 259 ++++++++---- arch/x86/kvm/timer.c | 16 +- arch/x86/kvm/trace.h | 355 +++++++++++++++++ arch/x86/kvm/vmx.c | 418 +++++++++++++++----- arch/x86/kvm/x86.c | 742 +++++++++++++++++++++++++---------- arch/x86/kvm/x86.h | 4 + arch/x86/kvm/x86_emulate.c | 257 ++++++++++++- include/linux/kvm.h | 125 +++++-- include/linux/kvm_host.h | 119 ++++-- include/trace/events/kvm.h | 151 +++++++ mm/hugetlb.c | 1 + virt/kvm/Kconfig | 14 + virt/kvm/coalesced_mmio.c | 74 ++-- virt/kvm/coalesced_mmio.h | 1 + virt/kvm/eventfd.c | 578 +++++++++++++++++++++++++++ virt/kvm/ioapic.c | 84 +++-- virt/kvm/iodev.h | 55 ++-- virt/kvm/irq_comm.c | 51 ++- virt/kvm/kvm_main.c | 289 ++++++++++---- virt/kvm/kvm_trace.c | 285 -------------- 68 files changed, 4949 insertions(+), 1624 deletions(-) create mode 100644 Documentation/kvm/api.txt create mode 100644 arch/powerpc/kvm/trace.h delete mode 100644 arch/x86/kvm/kvm_svm.h create mode 100644 arch/x86/kvm/mmutrace.h create mode 100644 arch/x86/kvm/trace.h create mode 100644 include/trace/events/kvm.h create mode 100644 virt/kvm/Kconfig create mode 100644 virt/kvm/eventfd.c delete mode 100644 virt/kvm/kvm_trace.c Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Merge made by recursive. drivers/scsi/bnx2i/bnx2i_init.c | 93 +++++++++++++------------------- drivers/scsi/constants.c | 95 ++++++++++++++++++++++++++------- drivers/scsi/device_handler/scsi_dh.c | 23 ++++++--- drivers/scsi/scsi_lib.c | 1 + include/scsi/scsi_device.h | 2 + 5 files changed, 133 insertions(+), 81 deletions(-) Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/Kconfig Merge made by recursive. drivers/dma/Kconfig | 4 ++-- drivers/dma/dmatest.c | 2 +- drivers/dma/fsldma.c | 17 ++++++++++++----- drivers/dma/fsldma.h | 1 + drivers/dma/ioat.c | 28 +++++++++++++++------------- drivers/dma/mv_xor.c | 2 +- 6 files changed, 32 insertions(+), 22 deletions(-) Merging udf/for_next $ git merge udf/for_next Merge made by recursive. fs/udf/super.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) Merging net/master $ git merge net/master Resolved 'drivers/net/wireless/orinoco/main.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging drivers/misc/sgi-xp/xpnet.c Auto-merging drivers/net/8139too.c Auto-merging drivers/net/a2065.c Auto-merging drivers/net/bmac.c Auto-merging drivers/net/cs89x0.c Auto-merging drivers/net/epic100.c Auto-merging drivers/net/fealnx.c Auto-merging drivers/net/fec.c Auto-merging drivers/net/hamachi.c Auto-merging drivers/net/hamradio/baycom_epp.c Auto-merging drivers/net/isa-skeleton.c Auto-merging drivers/net/natsemi.c Auto-merging drivers/net/pci-skeleton.c Auto-merging drivers/net/pcmcia/nmclan_cs.c Auto-merging drivers/net/pcnet32.c Auto-merging drivers/net/plip.c Auto-merging drivers/net/smc91x.c Auto-merging drivers/net/starfire.c Auto-merging drivers/net/sundance.c Auto-merging drivers/net/tulip/de2104x.c Auto-merging drivers/net/tulip/tulip_core.c Auto-merging drivers/net/tulip/winbond-840.c Auto-merging drivers/net/usb/kaweth.c Auto-merging drivers/net/usb/pegasus.c Auto-merging drivers/net/via-rhine.c Auto-merging drivers/net/wan/sbni.c Auto-merging drivers/net/wireless/orinoco/main.c CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/main.c Removing drivers/net/wireless/p54/p54common.c Removing drivers/net/wireless/p54/p54common.h Auto-merging drivers/net/wireless/ray_cs.c Removing drivers/net/wireless/rt2x00/rt2x00rfkill.c Auto-merging drivers/net/wireless/wavelan_cs.c Removing drivers/net/wireless/wl12xx/acx.c Removing drivers/net/wireless/wl12xx/cmd.c Removing drivers/net/wireless/wl12xx/wl12xx.h Auto-merging drivers/net/yellowfin.c Auto-merging drivers/staging/stlc45xx/stlc45xx.c Auto-merging net/ipv4/ip_gre.c Auto-merging net/ipv6/ip6_output.c Auto-merging net/ipv6/sit.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c72eb75] Merge commit 'net/master' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 5 + arch/ia64/hp/sim/simeth.c | 2 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-o32.S | 4 +- arch/sparc/kernel/sys32.S | 2 +- arch/um/drivers/net_kern.c | 2 +- arch/xtensa/platforms/iss/network.c | 2 +- drivers/ieee802154/fakehard.c | 2 +- drivers/isdn/hysdn/hysdn_net.c | 2 +- drivers/isdn/i4l/isdn_net.c | 16 +- drivers/isdn/i4l/isdn_ppp.c | 6 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/message/fusion/mptlan.c | 2 +- drivers/misc/sgi-xp/xpnet.c | 4 +- drivers/net/3c501.c | 2 +- drivers/net/3c505.c | 2 +- drivers/net/3c507.c | 2 +- drivers/net/3c509.c | 2 +- drivers/net/3c515.c | 4 +- drivers/net/3c523.c | 2 +- drivers/net/3c527.c | 4 +- drivers/net/3c59x.c | 4 +- drivers/net/7990.c | 2 +- drivers/net/8139cp.c | 2 +- drivers/net/8139too.c | 4 +- drivers/net/82596.c | 4 +- drivers/net/a2065.c | 4 +- drivers/net/amd8111e.c | 2 +- drivers/net/appletalk/cops.c | 2 +- drivers/net/appletalk/ipddp.c | 4 +- drivers/net/appletalk/ltpc.c | 2 +- drivers/net/ariadne.c | 4 +- drivers/net/arm/am79c961a.c | 2 +- drivers/net/arm/at91_ether.c | 2 +- drivers/net/arm/ether1.c | 2 +- drivers/net/arm/ether3.c | 4 +- drivers/net/at1700.c | 2 +- drivers/net/atarilance.c | 4 +- drivers/net/atp.c | 2 +- drivers/net/au1000_eth.c | 2 +- drivers/net/bfin_mac.c | 2 +- drivers/net/bmac.c | 2 +- drivers/net/bonding/bond_3ad.c | 5 +- drivers/net/bonding/bond_alb.c | 2 +- drivers/net/bonding/bond_main.c | 8 +- drivers/net/can/sja1000/sja1000.c | 2 +- drivers/net/cassini.c | 4 +- drivers/net/cris/eth_v10.c | 2 +- drivers/net/cs89x0.c | 4 +- drivers/net/cxgb3/adapter.h | 10 + drivers/net/cxgb3/ael1002.c | 1193 +-------- drivers/net/cxgb3/aq100x.c | 7 +- drivers/net/cxgb3/common.h | 10 + drivers/net/cxgb3/cxgb3_main.c | 99 +- drivers/net/cxgb3/t3_hw.c | 2 + drivers/net/cxgb3/xgmac.c | 11 +- drivers/net/de600.c | 2 +- drivers/net/de620.c | 2 +- drivers/net/declance.c | 4 +- drivers/net/defxx.c | 6 +- drivers/net/depca.c | 2 +- drivers/net/dm9000.c | 109 +- drivers/net/dm9000.h | 18 + drivers/net/dnet.c | 2 +- drivers/net/dummy.c | 2 +- drivers/net/e100.c | 2 +- drivers/net/e1000/e1000.h | 7 +- drivers/net/e1000/e1000_ethtool.c | 51 +- drivers/net/e1000/e1000_hw.c | 2 +- drivers/net/e1000/e1000_hw.h | 3 - drivers/net/e1000/e1000_main.c | 483 +++- drivers/net/eepro.c | 4 +- drivers/net/eexpress.c | 4 +- drivers/net/enc28j60.c | 2 +- drivers/net/epic100.c | 4 +- drivers/net/eql.c | 2 +- drivers/net/eth16i.c | 4 +- drivers/net/ewrk3.c | 2 +- drivers/net/fealnx.c | 2 +- drivers/net/fec.c | 2 +- drivers/net/hamachi.c | 2 +- drivers/net/hamradio/6pack.c | 2 +- drivers/net/hamradio/baycom_epp.c | 6 +- drivers/net/hamradio/bpqether.c | 2 +- drivers/net/hamradio/dmascc.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 4 +- drivers/net/hamradio/mkiss.c | 2 +- drivers/net/hamradio/scc.c | 6 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/hp100.c | 6 +- drivers/net/ibm_newemac/core.c | 2 +- drivers/net/ibmveth.c | 2 +- drivers/net/ifb.c | 2 +- drivers/net/ioc3-eth.c | 2 +- drivers/net/irda/ali-ircc.c | 12 +- drivers/net/irda/au1k_ir.c | 4 +- drivers/net/irda/donauboe.c | 8 +- drivers/net/irda/irda-usb.c | 2 +- drivers/net/irda/nsc-ircc.c | 10 +- drivers/net/irda/pxaficp_ir.c | 4 +- drivers/net/irda/sa1100_ir.c | 4 +- drivers/net/irda/sir_dev.c | 6 +- drivers/net/irda/smsc-ircc2.c | 16 +- drivers/net/irda/stir4200.c | 2 +- drivers/net/irda/via-ircc.c | 12 +- drivers/net/irda/vlsi_ir.c | 6 +- drivers/net/irda/w83977af_ir.c | 4 +- drivers/net/isa-skeleton.c | 2 +- drivers/net/iseries_veth.c | 4 +- drivers/net/ixgb/ixgb_main.c | 2 +- drivers/net/ixp2000/ixpdev.c | 4 +- drivers/net/jme.c | 189 +- drivers/net/jme.h | 21 +- drivers/net/lance.c | 2 +- drivers/net/lib82596.c | 4 +- drivers/net/lib8390.c | 2 +- drivers/net/ll_temac_main.c | 2 +- drivers/net/loopback.c | 2 +- drivers/net/lp486e.c | 4 +- drivers/net/mac89x0.c | 2 +- drivers/net/macb.c | 2 +- drivers/net/mace.c | 2 +- drivers/net/meth.c | 2 +- drivers/net/mipsnet.c | 2 +- drivers/net/mlx4/en_tx.c | 2 +- drivers/net/myri10ge/myri10ge.c | 10 +- drivers/net/myri_sbus.c | 2 +- drivers/net/natsemi.c | 2 +- drivers/net/netx-eth.c | 2 +- drivers/net/ni5010.c | 2 +- drivers/net/ni52.c | 4 +- drivers/net/ni65.c | 2 +- drivers/net/pci-skeleton.c | 2 +- drivers/net/pcmcia/3c574_cs.c | 2 +- drivers/net/pcmcia/3c589_cs.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/pcmcia/fmvj18x_cs.c | 4 +- drivers/net/pcmcia/nmclan_cs.c | 2 +- drivers/net/pcmcia/smc91c92_cs.c | 6 +- drivers/net/pcmcia/xirc2ps_cs.c | 4 +- drivers/net/pcnet32.c | 2 +- drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/bcm63xx.c | 132 + drivers/net/plip.c | 2 +- drivers/net/ppp_generic.c | 4 +- drivers/net/r6040.c | 4 +- drivers/net/rionet.c | 7 +- drivers/net/rrunner.c | 2 +- drivers/net/s2io.c | 10 +- drivers/net/sb1000.c | 2 +- drivers/net/sb1250-mac.c | 2 +- drivers/net/seeq8005.c | 4 +- drivers/net/sgiseeq.c | 4 +- drivers/net/sh_eth.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/skfp/skfddi.c | 4 +- drivers/net/slip.c | 6 +- drivers/net/smc911x.c | 6 +- drivers/net/smc9194.c | 8 +- drivers/net/smc91x.c | 4 +- drivers/net/sonic.c | 4 +- drivers/net/starfire.c | 2 +- drivers/net/sun3_82586.c | 4 +- drivers/net/sun3lance.c | 4 +- drivers/net/sunbmac.c | 2 +- drivers/net/sundance.c | 2 +- drivers/net/sunhme.c | 2 +- drivers/net/sunlance.c | 2 +- drivers/net/sunqe.c | 2 +- drivers/net/tc35815.c | 2 +- drivers/net/tlan.c | 6 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/ibmtr.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/tulip/de2104x.c | 2 +- drivers/net/tulip/dmfe.c | 4 +- drivers/net/tulip/tulip_core.c | 2 +- drivers/net/tulip/uli526x.c | 4 +- drivers/net/tulip/winbond-840.c | 2 +- drivers/net/tulip/xircom_cb.c | 2 +- drivers/net/tun.c | 5 +- drivers/net/typhoon.c | 2 +- drivers/net/ucc_geth.c | 42 +- drivers/net/ucc_geth.h | 2 + drivers/net/usb/catc.c | 2 +- drivers/net/usb/hso.c | 2 +- drivers/net/usb/kaweth.c | 4 +- drivers/net/usb/pegasus.c | 2 +- drivers/net/usb/rtl8150.c | 2 +- drivers/net/usb/usbnet.c | 14 + drivers/net/veth.c | 6 +- drivers/net/via-rhine.c | 6 +- drivers/net/via-velocity.c | 2 +- drivers/net/vxge/vxge-config.c | 10 - drivers/net/vxge/vxge-config.h | 10 +- drivers/net/vxge/vxge-main.c | 100 +- drivers/net/vxge/vxge-main.h | 4 +- drivers/net/vxge/vxge-reg.h | 9 +- drivers/net/vxge/vxge-traffic.h | 2 - drivers/net/vxge/vxge-version.h | 2 +- drivers/net/wan/cycx_x25.c | 2 +- drivers/net/wan/dlci.c | 4 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wan/farsync.c | 27 +- drivers/net/wan/hdlc_fr.c | 6 +- drivers/net/wan/lmc/lmc_main.c | 2 +- drivers/net/wan/sbni.c | 4 +- drivers/net/wan/wanxl.c | 2 +- drivers/net/wan/x25_asy.c | 10 +- drivers/net/wireless/adm8211.c | 3 +- drivers/net/wireless/airo.c | 14 +- drivers/net/wireless/arlan-main.c | 2 +- drivers/net/wireless/at76c50x-usb.c | 3 +- drivers/net/wireless/ath/ar9170/main.c | 6 +- drivers/net/wireless/ath/ar9170/usb.c | 2 +- drivers/net/wireless/ath/ath5k/ath5k.h | 21 +- drivers/net/wireless/ath/ath5k/attach.c | 3 + drivers/net/wireless/ath/ath5k/base.c | 130 +- drivers/net/wireless/ath/ath5k/base.h | 10 +- drivers/net/wireless/ath/ath5k/debug.c | 8 +- drivers/net/wireless/ath/ath5k/phy.c | 7 +- drivers/net/wireless/ath/ath5k/qcu.c | 1 - drivers/net/wireless/ath/ath5k/reset.c | 1 - drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- drivers/net/wireless/ath/ath9k/beacon.c | 15 +- drivers/net/wireless/ath/ath9k/debug.c | 10 +- drivers/net/wireless/ath/ath9k/eeprom.c | 2 - drivers/net/wireless/ath/ath9k/hw.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 62 +- drivers/net/wireless/ath/ath9k/recv.c | 67 +- drivers/net/wireless/ath/ath9k/xmit.c | 33 +- drivers/net/wireless/ath/regd.c | 2 - drivers/net/wireless/atmel.c | 6 +- drivers/net/wireless/b43/xmit.c | 3 +- drivers/net/wireless/b43legacy/xmit.c | 3 +- drivers/net/wireless/hostap/hostap_80211_tx.c | 42 +- drivers/net/wireless/ipw2x00/ipw2200.c | 10 +- drivers/net/wireless/ipw2x00/libipw_tx.c | 4 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 6 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 29 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 74 +- drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +- drivers/net/wireless/iwlwifi/iwl-core.c | 63 +- drivers/net/wireless/iwlwifi/iwl-core.h | 3 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 6 + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 9 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 2 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 5 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 31 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 16 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 88 +- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 235 ++- drivers/net/wireless/iwmc3200wifi/commands.c | 116 +- drivers/net/wireless/iwmc3200wifi/commands.h | 7 +- drivers/net/wireless/iwmc3200wifi/eeprom.c | 4 - drivers/net/wireless/iwmc3200wifi/fw.c | 21 +- drivers/net/wireless/iwmc3200wifi/iwm.h | 32 +- drivers/net/wireless/iwmc3200wifi/lmac.h | 4 + drivers/net/wireless/iwmc3200wifi/main.c | 38 +- drivers/net/wireless/iwmc3200wifi/netdev.c | 27 +- drivers/net/wireless/iwmc3200wifi/rx.c | 36 +- drivers/net/wireless/iwmc3200wifi/sdio.c | 6 +- drivers/net/wireless/iwmc3200wifi/umac.h | 2 + drivers/net/wireless/iwmc3200wifi/wext.c | 352 +--- drivers/net/wireless/libertas/assoc.c | 6 + drivers/net/wireless/libertas/dev.h | 1 - drivers/net/wireless/libertas/if_cs.c | 3 - drivers/net/wireless/libertas/if_sdio.c | 5 +- drivers/net/wireless/libertas/if_spi.c | 8 +- drivers/net/wireless/libertas/if_usb.c | 3 +- drivers/net/wireless/libertas/wext.c | 2 +- drivers/net/wireless/libertas_tf/main.c | 3 +- drivers/net/wireless/mac80211_hwsim.c | 83 +- drivers/net/wireless/mwl8k.c | 3 +- drivers/net/wireless/netwave_cs.c | 2 +- drivers/net/wireless/orinoco/Kconfig | 1 + drivers/net/wireless/orinoco/Makefile | 2 +- drivers/net/wireless/orinoco/airport.c | 98 +- drivers/net/wireless/orinoco/cfg.c | 162 ++ drivers/net/wireless/orinoco/cfg.h | 15 + drivers/net/wireless/orinoco/fw.c | 41 +- drivers/net/wireless/orinoco/hermes.c | 2 +- drivers/net/wireless/orinoco/hermes.h | 2 +- drivers/net/wireless/orinoco/hermes_dld.c | 50 +- drivers/net/wireless/orinoco/hw.c | 668 +++++- drivers/net/wireless/orinoco/hw.h | 11 +- drivers/net/wireless/orinoco/main.c | 1132 +++------ drivers/net/wireless/orinoco/main.h | 3 +- drivers/net/wireless/orinoco/orinoco.h | 49 +- drivers/net/wireless/orinoco/orinoco_cs.c | 96 +- drivers/net/wireless/orinoco/orinoco_nortel.c | 38 +- drivers/net/wireless/orinoco/orinoco_pci.c | 38 +- drivers/net/wireless/orinoco/orinoco_pci.h | 57 +- drivers/net/wireless/orinoco/orinoco_plx.c | 38 +- drivers/net/wireless/orinoco/orinoco_tmd.c | 38 +- drivers/net/wireless/orinoco/scan.c | 291 ++-- drivers/net/wireless/orinoco/scan.h | 21 +- drivers/net/wireless/orinoco/spectrum_cs.c | 96 +- drivers/net/wireless/orinoco/wext.c | 878 +------ drivers/net/wireless/p54/Makefile | 3 + drivers/net/wireless/p54/eeprom.c | 564 ++++ drivers/net/wireless/p54/eeprom.h | 226 ++ drivers/net/wireless/p54/fwio.c | 698 +++++ drivers/net/wireless/p54/led.c | 163 ++ drivers/net/wireless/p54/lmac.h | 551 ++++ drivers/net/wireless/p54/main.c | 607 +++++ drivers/net/wireless/p54/p54.h | 148 +- drivers/net/wireless/p54/p54common.c | 2688 -------------------- drivers/net/wireless/p54/p54common.h | 644 ----- drivers/net/wireless/p54/p54pci.c | 9 +- drivers/net/wireless/p54/p54spi.c | 50 +- drivers/net/wireless/p54/p54usb.c | 42 +- drivers/net/wireless/p54/txrx.c | 826 ++++++ drivers/net/wireless/prism54/islpci_eth.c | 2 +- drivers/net/wireless/prism54/islpci_hotplug.c | 4 +- drivers/net/wireless/ray_cs.c | 6 +- drivers/net/wireless/rndis_wlan.c | 298 ++-- drivers/net/wireless/rt2x00/Kconfig | 8 - drivers/net/wireless/rt2x00/Makefile | 1 - drivers/net/wireless/rt2x00/rt2400pci.c | 7 +- drivers/net/wireless/rt2x00/rt2500pci.c | 7 +- drivers/net/wireless/rt2x00/rt2500usb.c | 7 +- drivers/net/wireless/rt2x00/rt2800usb.c | 7 +- drivers/net/wireless/rt2x00/rt2x00.h | 13 +- drivers/net/wireless/rt2x00/rt2x00crypto.c | 6 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 5 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 21 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 12 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 127 - drivers/net/wireless/rt2x00/rt61pci.c | 7 +- drivers/net/wireless/rt2x00/rt73usb.c | 7 +- drivers/net/wireless/rtl818x/rtl8180_dev.c | 5 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 3 +- drivers/net/wireless/strip.c | 2 +- drivers/net/wireless/wavelan.c | 2 +- drivers/net/wireless/wavelan_cs.c | 4 +- drivers/net/wireless/wl12xx/Kconfig | 17 +- drivers/net/wireless/wl12xx/Makefile | 9 +- drivers/net/wireless/wl12xx/acx.c | 689 ----- drivers/net/wireless/wl12xx/cmd.c | 353 --- drivers/net/wireless/wl12xx/reg.h | 1 - drivers/net/wireless/wl12xx/wl1251.h | 479 +++- drivers/net/wireless/wl12xx/wl1251_acx.c | 840 ++++++ .../net/wireless/wl12xx/{acx.h => wl1251_acx.h} | 199 +-- .../net/wireless/wl12xx/{boot.c => wl1251_boot.c} | 114 +- .../net/wireless/wl12xx/{boot.h => wl1251_boot.h} | 12 +- drivers/net/wireless/wl12xx/wl1251_cmd.c | 428 ++++ .../net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} | 194 ++- .../wl12xx/{debugfs.c => wl1251_debugfs.c} | 60 +- .../wl12xx/{debugfs.h => wl1251_debugfs.h} | 16 +- .../wireless/wl12xx/{event.c => wl1251_event.c} | 54 +- .../wireless/wl12xx/{event.h => wl1251_event.h} | 12 +- .../net/wireless/wl12xx/{init.c => wl1251_init.c} | 78 +- .../net/wireless/wl12xx/{init.h => wl1251_init.h} | 27 +- .../net/wireless/wl12xx/{main.c => wl1251_main.c} | 638 +++-- drivers/net/wireless/wl12xx/wl1251_netlink.c | 679 +++++ .../wl12xx/{debugfs.h => wl1251_netlink.h} | 15 +- .../net/wireless/wl12xx/{wl1251.c => wl1251_ops.c} | 297 ++- drivers/net/wireless/wl12xx/wl1251_ops.h | 165 ++ drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} | 64 +- drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} | 18 +- drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} | 90 +- drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} | 22 +- .../net/wireless/wl12xx/{spi.c => wl1251_spi.c} | 179 +- .../net/wireless/wl12xx/{spi.h => wl1251_spi.h} | 62 +- drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} | 124 +- drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} | 21 +- drivers/net/wireless/wl12xx/wl12xx.h | 409 --- drivers/net/wireless/wl3501_cs.c | 3 +- drivers/net/wireless/zd1201.c | 4 +- drivers/net/wireless/zd1211rw/zd_mac.c | 3 +- drivers/net/wireless/zd1211rw/zd_usb.c | 73 +- drivers/net/xen-netfront.c | 4 +- drivers/net/yellowfin.c | 4 +- drivers/net/znet.c | 4 +- drivers/s390/net/claw.c | 2 + drivers/s390/net/ctcm_main.c | 10 +- drivers/s390/net/lcs.c | 8 +- drivers/s390/net/netiucv.c | 6 +- drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l3_main.c | 1 + drivers/staging/agnx/xmit.c | 3 +- drivers/staging/at76_usb/at76_usb.c | 8 +- drivers/staging/epl/VirtualEthernetLinux.c | 2 +- drivers/staging/otus/usbdrv.c | 8 +- drivers/staging/otus/wrap_pkt.c | 3 - drivers/staging/rt2860/rt_main_dev.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8187se/r8180_core.c | 4 +- drivers/staging/slicoss/slicoss.c | 2 +- drivers/staging/stlc45xx/stlc45xx.c | 3 +- drivers/staging/winbond/wb35rx.c | 3 +- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/usb/gadget/f_phonet.c | 2 +- drivers/usb/gadget/u_ether.c | 6 +- firmware/Makefile | 5 +- firmware/WHENCE | 17 + firmware/cxgb3/ael2005_opt_edc.bin.ihex | 69 + firmware/cxgb3/ael2005_twx_edc.bin.ihex | 93 + firmware/cxgb3/ael2020_twx_edc.bin.ihex | 100 + fs/dlm/netlink.c | 2 +- include/linux/ieee80211.h | 4 + include/linux/net_dropmon.h | 1 - include/linux/netdevice.h | 4 - include/linux/nl80211.h | 96 + include/linux/rfkill.h | 14 + include/linux/tipc.h | 2 + include/linux/usb/usbnet.h | 3 + include/linux/wireless.h | 8 + include/net/cfg80211.h | 460 +++- include/net/genetlink.h | 66 +- include/net/ipv6.h | 12 + include/net/iw_handler.h | 2 +- include/net/mac80211.h | 34 +- include/net/net_namespace.h | 10 + include/net/netns/x_tables.h | 3 + include/net/scm.h | 2 - include/net/udp.h | 3 + kernel/taskstats.c | 10 +- net/Kconfig | 20 + net/Makefile | 1 - net/atm/br2684.c | 4 +- net/atm/clip.c | 12 +- net/atm/lec.c | 8 +- net/atm/mpc.c | 2 +- net/bluetooth/bnep/netdev.c | 6 +- net/bridge/br_device.c | 2 +- net/bridge/br_netfilter.c | 96 +- net/compat.c | 17 +- net/core/dev.c | 6 +- net/core/neighbour.c | 6 +- net/core/net_namespace.c | 35 +- net/core/netpoll.c | 6 +- net/core/rtnetlink.c | 21 +- net/decnet/dn_route.c | 2 +- net/econet/af_econet.c | 4 +- net/ipv4/af_inet.c | 12 +- net/ipv4/ip_gre.c | 6 +- net/ipv4/ipip.c | 6 +- net/ipv4/ipmr.c | 2 +- net/ipv4/udp.c | 61 + net/ipv6/af_inet6.c | 20 +- net/ipv6/ip6_input.c | 6 +- net/ipv6/ip6_output.c | 26 +- net/ipv6/ip6_tunnel.c | 4 +- net/ipv6/ip6mr.c | 2 +- net/ipv6/sit.c | 6 +- net/ipv6/udp.c | 141 +- net/irda/irlan/irlan_eth.c | 4 +- net/irda/irnetlink.c | 2 +- net/lapb/lapb_iface.c | 2 +- net/mac80211/Kconfig | 16 - net/mac80211/cfg.c | 216 +- net/mac80211/debugfs_netdev.c | 46 - net/mac80211/debugfs_sta.c | 98 +- net/mac80211/event.c | 23 +- net/mac80211/ibss.c | 6 +- net/mac80211/ieee80211_i.h | 148 +- net/mac80211/iface.c | 30 +- net/mac80211/key.c | 28 +- net/mac80211/main.c | 5 +- net/mac80211/mesh.c | 6 +- net/mac80211/mesh.h | 3 +- net/mac80211/mlme.c | 1637 +++++------- net/mac80211/rx.c | 103 +- net/mac80211/scan.c | 29 +- net/mac80211/sta_info.h | 17 + net/mac80211/tx.c | 12 +- net/mac80211/wep.c | 52 +- net/mac80211/wep.h | 4 - net/mac80211/wext.c | 450 +--- net/mac80211/wpa.c | 3 +- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/netlink/af_netlink.c | 72 +- net/netlink/genetlink.c | 186 ++- net/netrom/nr_dev.c | 4 +- net/phonet/pep-gprs.c | 4 +- net/rfkill/core.c | 10 +- net/rose/rose_dev.c | 2 +- net/sched/sch_teql.c | 6 +- net/tipc/netlink.c | 2 +- net/tipc/socket.c | 6 + net/wireless/Kconfig | 43 +- net/wireless/Makefile | 4 +- net/wireless/core.c | 385 ++- net/wireless/core.h | 184 ++- net/wireless/debugfs.c | 14 +- net/wireless/debugfs.h | 8 +- net/wireless/ibss.c | 158 +- net/wireless/mlme.c | 581 ++++- net/wireless/nl80211.c | 1124 ++++++--- net/wireless/nl80211.h | 71 +- net/wireless/reg.c | 48 +- net/wireless/scan.c | 75 +- net/wireless/sme.c | 792 ++++++ net/wireless/util.c | 21 + net/wireless/wext-compat.c | 496 ++++- net/wireless/wext-sme.c | 380 +++ net/wireless/wext.c | 256 ++- 505 files changed, 18349 insertions(+), 14254 deletions(-) create mode 100644 drivers/net/phy/bcm63xx.c create mode 100644 drivers/net/wireless/orinoco/cfg.c create mode 100644 drivers/net/wireless/orinoco/cfg.h create mode 100644 drivers/net/wireless/p54/eeprom.c create mode 100644 drivers/net/wireless/p54/eeprom.h create mode 100644 drivers/net/wireless/p54/fwio.c create mode 100644 drivers/net/wireless/p54/led.c create mode 100644 drivers/net/wireless/p54/lmac.h create mode 100644 drivers/net/wireless/p54/main.c delete mode 100644 drivers/net/wireless/p54/p54common.c delete mode 100644 drivers/net/wireless/p54/p54common.h create mode 100644 drivers/net/wireless/p54/txrx.c delete mode 100644 drivers/net/wireless/rt2x00/rt2x00rfkill.c delete mode 100644 drivers/net/wireless/wl12xx/acx.c delete mode 100644 drivers/net/wireless/wl12xx/cmd.c create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.c rename drivers/net/wireless/wl12xx/{acx.h => wl1251_acx.h} (86%) rename drivers/net/wireless/wl12xx/{boot.c => wl1251_boot.c} (67%) rename drivers/net/wireless/wl12xx/{boot.h => wl1251_boot.h} (78%) create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.c rename drivers/net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} (60%) rename drivers/net/wireless/wl12xx/{debugfs.c => wl1251_debugfs.c} (92%) copy drivers/net/wireless/wl12xx/{debugfs.h => wl1251_debugfs.h} (74%) rename drivers/net/wireless/wl12xx/{event.c => wl1251_event.c} (59%) rename drivers/net/wireless/wl12xx/{event.h => wl1251_event.h} (94%) rename drivers/net/wireless/wl12xx/{init.c => wl1251_init.c} (55%) rename drivers/net/wireless/wl12xx/{init.h => wl1251_init.h} (55%) rename drivers/net/wireless/wl12xx/{main.c => wl1251_main.c} (60%) create mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.c rename drivers/net/wireless/wl12xx/{debugfs.h => wl1251_netlink.h} (73%) rename drivers/net/wireless/wl12xx/{wl1251.c => wl1251_ops.c} (66%) create mode 100644 drivers/net/wireless/wl12xx/wl1251_ops.h rename drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} (55%) rename drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} (72%) rename drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} (68%) rename drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} (89%) rename drivers/net/wireless/wl12xx/{spi.c => wl1251_spi.c} (63%) rename drivers/net/wireless/wl12xx/{spi.h => wl1251_spi.h} (61%) rename drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} (79%) rename drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} (93%) delete mode 100644 drivers/net/wireless/wl12xx/wl12xx.h create mode 100644 firmware/cxgb3/ael2005_opt_edc.bin.ihex create mode 100644 firmware/cxgb3/ael2005_twx_edc.bin.ihex create mode 100644 firmware/cxgb3/ael2020_twx_edc.bin.ihex create mode 100644 net/wireless/sme.c create mode 100644 net/wireless/wext-sme.c Merging wireless/master $ git merge wireless/master Already up-to-date. Merging mtd/master $ git merge mtd/master Already up-to-date. Merging crypto/master $ git merge crypto/master Merge made by recursive. arch/s390/crypto/des_s390.c | 11 +- arch/s390/crypto/sha1_s390.c | 26 +++ arch/s390/crypto/sha256_s390.c | 26 +++ arch/x86/crypto/aesni-intel_glue.c | 2 +- crypto/Kconfig | 2 +- crypto/Makefile | 3 +- crypto/ablkcipher.c | 23 ++- crypto/ahash.c | 336 ++++++++++++++++++++++++++++++---- crypto/algapi.c | 103 +++++++++-- crypto/algboss.c | 5 + crypto/ansi_cprng.c | 34 ++--- crypto/api.c | 54 +++--- crypto/authenc.c | 6 +- crypto/cryptd.c | 246 ++++++++++++++----------- crypto/hmac.c | 272 ++++++++++++---------------- crypto/internal.h | 28 +--- crypto/pcompress.c | 6 +- crypto/sha1_generic.c | 41 +++-- crypto/sha256_generic.c | 100 ++++++----- crypto/shash.c | 269 ++++++++++++++++++++------- crypto/tcrypt.c | 18 ++- crypto/testmgr.c | 21 ++- crypto/xcbc.c | 236 +++++++++--------------- drivers/char/hw_random/amd-rng.c | 4 +- drivers/char/hw_random/geode-rng.c | 3 +- drivers/char/random.c | 14 ++ drivers/crypto/Kconfig | 2 +- drivers/crypto/amcc/crypto4xx_alg.c | 3 +- drivers/crypto/amcc/crypto4xx_core.c | 73 ++++---- drivers/crypto/amcc/crypto4xx_core.h | 25 +++- drivers/crypto/padlock-sha.c | 327 +++++++++++++++++---------------- include/crypto/algapi.h | 29 +++- include/crypto/hash.h | 147 ++++++++++----- include/crypto/internal/hash.h | 147 ++++++++++++++- include/crypto/sha.h | 14 ++ include/linux/crypto.h | 43 +---- include/linux/fips.h | 10 + 37 files changed, 1704 insertions(+), 1005 deletions(-) create mode 100644 include/linux/fips.h Merging sound/for-next $ git merge sound/for-next Auto-merging sound/soc/atmel/sam9g20_wm8731.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 4 + Documentation/sound/alsa/HD-Audio-Models.txt | 12 +- Documentation/sound/alsa/HD-Audio.txt | 60 + include/sound/memalloc.h | 6 + include/sound/pcm.h | 23 + include/sound/soc-dai.h | 26 +- include/sound/soc-dapm.h | 1 + include/sound/soc.h | 13 +- include/sound/tlv.h | 14 + include/sound/uda1380.h | 22 + include/sound/wm8993.h | 44 + sound/arm/pxa2xx-pcm-lib.c | 2 +- sound/core/Kconfig | 4 + sound/core/Makefile | 2 +- sound/core/info.c | 4 +- sound/core/memalloc.c | 4 + sound/core/pcm_memory.c | 2 + sound/core/rawmidi.c | 2 +- sound/core/seq/oss/seq_oss_midi.c | 14 +- sound/core/seq/seq_midi.c | 7 +- sound/core/vmaster.c | 8 +- sound/isa/cmi8330.c | 86 +- sound/pci/Kconfig | 4 +- sound/pci/azt3328.c | 1116 +++++++----- sound/pci/azt3328.h | 103 +- sound/pci/hda/Kconfig | 14 + sound/pci/hda/hda_beep.c | 4 + sound/pci/hda/hda_codec.c | 26 +- sound/pci/hda/hda_codec.h | 10 +- sound/pci/hda/hda_hwdep.c | 236 +++- sound/pci/hda/hda_intel.c | 42 +- sound/pci/hda/hda_local.h | 1 - sound/pci/hda/patch_realtek.c | 1846 ++++++++------------ sound/pci/ice1712/ice1712.h | 9 + sound/pci/ice1712/ice1724.c | 112 ++- sound/pci/ice1712/prodigy_hifi.c | 46 +- sound/pci/riptide/riptide.c | 7 +- sound/soc/atmel/sam9g20_wm8731.c | 138 +-- sound/soc/blackfin/bf5xx-ac97.c | 10 +- sound/soc/blackfin/bf5xx-ad73311.c | 16 +- sound/soc/blackfin/bf5xx-i2s.c | 8 +- sound/soc/blackfin/bf5xx-ssm2602.c | 16 +- sound/soc/codecs/Kconfig | 12 + sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ak4535.c | 16 - sound/soc/codecs/spdif_transciever.c | 3 + sound/soc/codecs/stac9766.c | 4 +- sound/soc/codecs/twl4030.c | 105 +- sound/soc/codecs/twl4030.h | 2 + sound/soc/codecs/uda1380.c | 313 ++-- sound/soc/codecs/uda1380.h | 8 - sound/soc/codecs/wm8350.c | 40 +- sound/soc/codecs/wm8400.c | 17 + sound/soc/codecs/wm8510.c | 1 + sound/soc/codecs/wm8523.c | 755 ++++++++ sound/soc/codecs/wm8523.h | 160 ++ sound/soc/codecs/wm8580.c | 55 +- sound/soc/codecs/wm8731.c | 74 +- sound/soc/codecs/wm8753.c | 35 + sound/soc/codecs/wm8900.c | 30 +- sound/soc/codecs/wm8903.c | 27 +- sound/soc/codecs/wm8940.c | 17 + sound/soc/codecs/wm8960.c | 33 +- sound/soc/codecs/wm8961.c | 1326 ++++++++++++++ sound/soc/codecs/wm8961.h | 866 +++++++++ sound/soc/codecs/wm8988.c | 42 +- sound/soc/codecs/wm8993.c | 2204 +++++++++++++++++++++++ sound/soc/codecs/wm8993.h | 2132 ++++++++++++++++++++++ sound/soc/codecs/wm9081.c | 25 + sound/soc/davinci/Kconfig | 13 + sound/soc/davinci/Makefile | 3 + sound/soc/davinci/davinci-evm.c | 102 +- sound/soc/davinci/davinci-i2s.c | 339 ++-- sound/soc/davinci/davinci-mcasp.c | 874 +++++++++ sound/soc/davinci/davinci-mcasp.h | 55 + sound/soc/davinci/davinci-pcm.c | 1 + sound/soc/davinci/davinci-pcm.h | 18 +- sound/soc/omap/Kconfig | 7 + sound/soc/omap/Makefile | 2 + sound/soc/omap/sdp3430.c | 2 +- sound/soc/omap/zoom2.c | 314 ++++ sound/soc/pxa/magician.c | 54 +- sound/soc/pxa/pxa-ssp.c | 50 +- sound/soc/soc-core.c | 122 +- sound/soc/soc-dapm.c | 355 +++- sound/soc/txx9/txx9aclc.c | 10 +- sound/usb/usbaudio.c | 14 +- sound/usb/usbmidi.c | 290 ++- sound/usb/usbmixer.c | 73 +- 89 files changed, 12464 insertions(+), 2666 deletions(-) create mode 100644 include/sound/uda1380.h create mode 100644 include/sound/wm8993.h create mode 100644 sound/soc/codecs/wm8523.c create mode 100644 sound/soc/codecs/wm8523.h create mode 100644 sound/soc/codecs/wm8961.c create mode 100644 sound/soc/codecs/wm8961.h create mode 100644 sound/soc/codecs/wm8993.c create mode 100644 sound/soc/codecs/wm8993.h create mode 100644 sound/soc/davinci/davinci-mcasp.c create mode 100644 sound/soc/davinci/davinci-mcasp.h create mode 100644 sound/soc/omap/zoom2.c Merging cpufreq/next $ git merge cpufreq/next Merge made by recursive. Documentation/cpu-freq/user-guide.txt | 9 +- drivers/cpufreq/cpufreq.c | 265 +++++++++++++++++++-------------- 2 files changed, 158 insertions(+), 116 deletions(-) Merging quilt/rr $ git merge quilt/rr Auto-merging arch/s390/kernel/smp.c Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging drivers/acpi/processor_throttling.c Auto-merging kernel/trace/trace.c Auto-merging virt/kvm/kvm_main.c Merge made by recursive. arch/alpha/include/asm/smp.h | 2 +- arch/alpha/include/asm/topology.h | 18 - arch/alpha/kernel/smp.c | 14 +- arch/arm/include/asm/cacheflush.h | 8 +- arch/arm/include/asm/mmu_context.h | 7 +- arch/arm/include/asm/smp.h | 1 - arch/arm/include/asm/tlbflush.h | 4 +- arch/arm/kernel/smp.c | 10 +- arch/arm/mm/context.c | 2 +- arch/arm/mm/flush.c | 10 +- arch/frv/include/asm/gdb-stub.h | 1 - arch/ia64/include/asm/smp.h | 1 - arch/ia64/include/asm/topology.h | 3 - arch/ia64/kernel/smp.c | 2 +- arch/m32r/include/asm/mmu_context.h | 4 +- arch/m32r/include/asm/smp.h | 2 +- arch/m32r/kernel/smp.c | 30 +- arch/m32r/kernel/smpboot.c | 2 +- arch/mips/alchemy/common/time.c | 2 +- arch/mips/include/asm/mach-ip27/topology.h | 2 - arch/mips/include/asm/mmu_context.h | 10 +- arch/mips/include/asm/smp-ops.h | 2 +- arch/mips/include/asm/smp.h | 2 +- arch/mips/kernel/smp-cmp.c | 6 +- arch/mips/kernel/smp-mt.c | 6 +- arch/mips/kernel/smp-up.c | 3 +- arch/mips/kernel/smp.c | 8 +- arch/mips/kernel/smtc.c | 6 +- arch/mips/mipssim/sim_smtc.c | 5 +- arch/mips/mm/c-octeon.c | 2 +- arch/mips/mti-malta/malta-smtc.c | 4 +- arch/mips/pmc-sierra/yosemite/smp.c | 4 +- arch/mips/sgi-ip27/ip27-memory.c | 2 +- arch/mips/sgi-ip27/ip27-smp.c | 4 +- arch/mips/sibyte/bcm1480/smp.c | 5 +- arch/mips/sibyte/sb1250/smp.c | 5 +- arch/mn10300/include/asm/gdb-stub.h | 1 - arch/mn10300/include/asm/mmu_context.h | 12 +- arch/parisc/include/asm/smp.h | 1 - arch/powerpc/include/asm/smp.h | 2 +- arch/powerpc/include/asm/topology.h | 12 - arch/powerpc/kernel/setup-common.c | 6 +- arch/powerpc/kernel/smp.c | 12 +- arch/powerpc/platforms/powermac/smp.c | 6 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- arch/s390/include/asm/smp.h | 2 +- arch/s390/include/asm/topology.h | 1 - arch/s390/kernel/smp.c | 4 +- arch/sh/include/asm/smp.h | 1 - arch/sh/include/asm/topology.h | 1 - arch/sparc/include/asm/smp_64.h | 1 - arch/sparc/include/asm/topology_64.h | 16 - arch/um/include/asm/mmu_context.h | 4 +- arch/um/kernel/smp.c | 2 +- arch/x86/include/asm/lguest_hcall.h | 2 +- arch/x86/include/asm/mmu_context.h | 6 +- arch/x86/include/asm/smp.h | 1 - arch/x86/kernel/acpi/cstate.c | 36 +- arch/x86/kernel/apic/io_apic.c | 7 +- arch/x86/kernel/ldt.c | 4 +- arch/x86/kernel/process.c | 6 +- arch/x86/kernel/setup.c | 1 - arch/x86/kernel/smpboot.c | 9 +- arch/x86/lguest/boot.c | 7 +- arch/x86/mm/tlb.c | 15 +- arch/x86/xen/mmu.c | 4 +- drivers/acpi/processor_perflib.c | 3 +- drivers/acpi/processor_throttling.c | 97 ++-- drivers/block/virtio_blk.c | 5 +- drivers/firmware/dcdbas.c | 49 +-- drivers/lguest/lg.h | 2 - drivers/net/sfc/efx.c | 3 +- drivers/oprofile/buffer_sync.c | 3 +- drivers/virtio/virtio_pci.c | 2 +- include/asm-generic/topology.h | 17 - include/linux/cpumask.h | 709 +++++++++----------------- include/linux/interrupt.h | 2 - include/linux/lguest.h | 2 +- include/linux/sched.h | 3 + include/linux/smp.h | 11 - include/linux/topology.h | 6 - include/linux/virtio_net.h | 14 +- init/main.c | 5 - kernel/kthread.c | 10 +- kernel/module.c | 3 +- kernel/smp.c | 7 - kernel/trace/trace.c | 7 +- mm/quicklist.c | 3 +- virt/kvm/kvm_main.c | 3 +- 89 files changed, 522 insertions(+), 831 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging input/next $ git merge input/next Auto-merging drivers/input/misc/cobalt_btns.c Merge made by recursive. drivers/input/misc/cobalt_btns.c | 2 +- drivers/input/misc/dm355evm_keys.c | 42 +++++++++++++-------------- drivers/input/serio/at32psif.c | 2 +- drivers/input/touchscreen/Kconfig | 7 ++++ drivers/input/touchscreen/atmel_tsadcc.c | 8 ++-- drivers/input/touchscreen/ucb1400_ts.c | 5 ++- drivers/input/touchscreen/usbtouchscreen.c | 32 +++++++++++++++++++++ drivers/input/touchscreen/w90p910_ts.c | 34 +++++++++++----------- 8 files changed, 85 insertions(+), 47 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Auto-merging drivers/scsi/scsi_lib.c Auto-merging fs/char_dev.c Auto-merging fs/fuse/inode.c Auto-merging fs/ubifs/super.c Auto-merging include/linux/backing-dev.h Auto-merging include/linux/blkdev.h Removing mm/pdflush.c Merge made by recursive. block/blk-core.c | 119 ++++++- block/blk-merge.c | 43 +++ block/blk.h | 1 + block/cfq-iosched.c | 38 ++- drivers/block/aoe/aoeblk.c | 1 + drivers/char/mem.c | 1 + drivers/scsi/scsi_lib.c | 6 +- fs/btrfs/disk-io.c | 1 + fs/buffer.c | 2 +- fs/char_dev.c | 1 + fs/configfs/inode.c | 1 + fs/fs-writeback.c | 775 ++++++++++++++++++++++++++++++++++--------- fs/fuse/inode.c | 1 + fs/hugetlbfs/inode.c | 1 + fs/nfs/client.c | 1 + fs/ocfs2/dlm/dlmfs.c | 1 + fs/ramfs/inode.c | 1 + fs/super.c | 3 - fs/sync.c | 2 +- fs/sysfs/inode.c | 1 + fs/ubifs/super.c | 1 + include/linux/backing-dev.h | 71 ++++- include/linux/bio.h | 43 ++-- include/linux/blkdev.h | 27 ++- include/linux/fs.h | 11 +- include/linux/writeback.h | 15 +- kernel/cgroup.c | 1 + mm/Makefile | 2 +- mm/backing-dev.c | 533 +++++++++++++++++++++++++++++- mm/page-writeback.c | 157 ++-------- mm/pdflush.c | 269 --------------- mm/swap_state.c | 1 + mm/vmscan.c | 2 +- 33 files changed, 1484 insertions(+), 649 deletions(-) delete mode 100644 mm/pdflush.c Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Merge made by recursive. Documentation/power/power_supply_class.txt | 7 + drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/ds2782_battery.c | 330 ++++++++++++++++++++++++++++ drivers/power/olpc_battery.c | 76 ++++++- drivers/power/power_supply_sysfs.c | 12 + drivers/power/wm8350_power.c | 22 ++ include/linux/power_supply.h | 18 ++ 8 files changed, 462 insertions(+), 11 deletions(-) create mode 100644 drivers/power/ds2782_battery.c Merging leds/for-mm $ git merge leds/for-mm Already up-to-date. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging arch/x86/kernel/kgdb.c Merge made by recursive. arch/x86/kernel/kgdb.c | 9 +++++++-- include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ kernel/kgdb.c | 6 +++--- 3 files changed, 52 insertions(+), 11 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging mm/Makefile Auto-merging mm/slub.c Merge made by recursive. Documentation/vm/slqbinfo.c | 1047 ++++++++++++ Documentation/vm/slub.txt | 10 + include/linux/rcu_types.h | 18 + include/linux/rcupdate.h | 11 +- include/linux/slab.h | 10 +- include/linux/slqb_def.h | 301 ++++ init/Kconfig | 28 +- lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/slqb.c | 3765 +++++++++++++++++++++++++++++++++++++++++++ mm/slub.c | 41 +- 11 files changed, 5233 insertions(+), 19 deletions(-) create mode 100644 Documentation/vm/slqbinfo.c create mode 100644 include/linux/rcu_types.h create mode 100644 include/linux/slqb_def.h create mode 100644 mm/slqb.c Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Auto-merging MAINTAINERS Auto-merging drivers/mfd/ezx-pcap.c Merge made by recursive. MAINTAINERS | 18 ++ drivers/mfd/ab3100-core.c | 8 +- drivers/mfd/ezx-pcap.c | 103 ++++++++---- drivers/mfd/twl4030-irq.c | 2 +- drivers/regulator/Kconfig | 7 + drivers/regulator/Makefile | 1 + drivers/regulator/pcap-regulator.c | 318 ++++++++++++++++++++++++++++++++++++ include/linux/mfd/ezx-pcap.h | 3 + 8 files changed, 425 insertions(+), 35 deletions(-) create mode 100644 drivers/regulator/pcap-regulator.c Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Merge made by recursive. drivers/gpu/drm/drm_edid.c | 70 ++++++-- drivers/gpu/drm/drm_modes.c | 416 +++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 6 + 3 files changed, 480 insertions(+), 12 deletions(-) Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/core.c | 62 ++++++++++++++++----- drivers/regulator/da903x.c | 97 ++++++++++++++++++++++++++++++- drivers/regulator/pcf50633-regulator.c | 2 +- drivers/regulator/virtual.c | 44 +++++++++----- drivers/regulator/wm8350-regulator.c | 2 + include/linux/mfd/da903x.h | 4 +- include/linux/regulator/machine.h | 20 ++++++- 7 files changed, 194 insertions(+), 37 deletions(-) Merging security-testing/next $ git merge security-testing/next Merge made by recursive. fs/proc/base.c | 23 +++---- include/linux/lsm_audit.h | 10 ++- include/linux/security.h | 14 ++-- kernel/ptrace.c | 2 +- security/capability.c | 2 +- security/commoncap.c | 4 +- security/keys/proc.c | 4 + security/security.c | 4 +- security/selinux/avc.c | 8 ++- security/selinux/hooks.c | 24 +++++-- security/selinux/include/avc.h | 6 +- security/selinux/ss/services.c | 142 +++++++++++++++++++++++++++++++++------ security/smack/smack.h | 2 +- security/smack/smack_access.c | 11 ++-- security/smack/smack_lsm.c | 8 +- security/tomoyo/common.c | 30 +++++++++ security/tomoyo/common.h | 2 - security/tomoyo/domain.c | 42 ++---------- security/tomoyo/tomoyo.c | 10 +-- security/tomoyo/tomoyo.h | 3 +- 20 files changed, 230 insertions(+), 121 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Auto-merging drivers/net/slip.c Merge made by recursive. arch/arm/mach-omap1/board-ams-delta.c | 38 + arch/mn10300/kernel/asm-offsets.c | 6 +- arch/x86/include/asm/termios.h | 25 +- drivers/char/cyclades.c | 2283 ++++++++----------------------- drivers/char/esp.c | 7 +- drivers/char/mxser.c | 8 +- drivers/char/n_tty.c | 3 - drivers/char/nozomi.c | 12 +- drivers/char/tty_ldisc.c | 25 +- drivers/char/tty_port.c | 2 + drivers/char/vt.c | 16 +- drivers/char/vt_ioctl.c | 279 +++- drivers/firmware/dmi_scan.c | 34 +- drivers/net/slip.c | 96 +- drivers/serial/21285.c | 8 +- drivers/serial/8250.c | 28 +- drivers/serial/8250.h | 1 + drivers/serial/amba-pl010.c | 6 +- drivers/serial/amba-pl011.c | 6 +- drivers/serial/atmel_serial.c | 14 +- drivers/serial/bfin_5xx.c | 20 +- drivers/serial/bfin_sport_uart.c | 7 +- drivers/serial/clps711x.c | 4 +- drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- drivers/serial/dz.c | 6 +- drivers/serial/icom.c | 16 +- drivers/serial/imx.c | 16 +- drivers/serial/ioc3_serial.c | 54 +- drivers/serial/ioc4_serial.c | 68 +- drivers/serial/ip22zilog.c | 14 +- drivers/serial/jsm/jsm_neo.c | 2 +- drivers/serial/jsm/jsm_tty.c | 20 +- drivers/serial/m32r_sio.c | 6 +- drivers/serial/max3100.c | 16 +- drivers/serial/mcf.c | 4 +- drivers/serial/mpc52xx_uart.c | 4 +- drivers/serial/mpsc.c | 4 +- drivers/serial/msm_serial.c | 7 +- drivers/serial/mux.c | 4 +- drivers/serial/netx-serial.c | 6 +- drivers/serial/nwpserial.c | 4 +- drivers/serial/pmac_zilog.c | 12 +- drivers/serial/pnx8xxx_uart.c | 8 +- drivers/serial/pxa.c | 6 +- drivers/serial/sa1100.c | 8 +- drivers/serial/samsung.c | 8 +- drivers/serial/sb1250-duart.c | 6 +- drivers/serial/sc26xx.c | 10 +- drivers/serial/serial_core.c | 871 ++++++------ drivers/serial/serial_ks8695.c | 6 +- drivers/serial/serial_lh7a40x.c | 6 +- drivers/serial/serial_txx9.c | 4 +- drivers/serial/sh-sci.c | 10 +- drivers/serial/sn_console.c | 22 +- drivers/serial/sunhv.c | 8 +- drivers/serial/sunsab.c | 10 +- drivers/serial/sunsu.c | 6 +- drivers/serial/sunzilog.c | 14 +- drivers/serial/timbuart.c | 10 +- drivers/serial/uartlite.c | 6 +- drivers/serial/ucc_uart.c | 4 +- drivers/serial/vr41xx_siu.c | 6 +- drivers/serial/zs.c | 6 +- drivers/usb/serial/mos7720.c | 120 ++- drivers/usb/serial/mos7840.c | 115 -- include/linux/console_struct.h | 1 - include/linux/cyclades.h | 11 +- include/linux/hayesesp.h | 1 - include/linux/ioport.h | 4 +- include/linux/kfifo.h | 4 +- include/linux/serial.h | 2 + include/linux/serial_8250.h | 1 + include/linux/serial_core.h | 91 +- include/linux/tty.h | 10 +- include/linux/vt.h | 32 +- include/linux/vt_kern.h | 16 +- kernel/kfifo.c | 2 +- kernel/power/console.c | 63 +- kernel/resource.c | 15 +- 79 files changed, 1836 insertions(+), 2880 deletions(-) $ git reset --hard HEAD^ HEAD is now at 1dd3529 Merge commit 'security-testing/next' Merging refs/next/20090713/ttydev $ git merge refs/next/20090713/ttydev Resolved 'drivers/usb/serial/generic.c' using previous resolution. Auto-merging drivers/char/cyclades.c Auto-merging drivers/char/tty_ldisc.c Auto-merging drivers/char/vt.c Auto-merging drivers/char/vt_ioctl.c Auto-merging drivers/net/slip.c Auto-merging drivers/usb/serial/cp210x.c Auto-merging drivers/usb/serial/ftdi_sio.c Auto-merging drivers/usb/serial/ftdi_sio.h Auto-merging drivers/usb/serial/generic.c CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c Auto-merging drivers/usb/serial/mos7840.c Auto-merging drivers/usb/serial/pl2303.c CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/usb/serial/pl2303.c'. [master 40ce51d] Merge commit 'refs/next/20090713/ttydev' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-omap1/board-ams-delta.c | 38 + drivers/char/cyclades.c | 2276 ++++++++------------------------- drivers/char/tty_ldisc.c | 25 +- drivers/char/vt.c | 4 +- drivers/char/vt_ioctl.c | 279 ++++- drivers/firmware/dmi_scan.c | 34 +- drivers/net/slip.c | 96 +-- drivers/serial/8250.c | 18 +- drivers/serial/8250.h | 1 + drivers/serial/bfin_sport_uart.c | 1 - drivers/usb/serial/mos7720.c | 120 ++- drivers/usb/serial/mos7840.c | 115 -- include/linux/cyclades.h | 10 + include/linux/ioport.h | 4 +- include/linux/kfifo.h | 4 +- include/linux/serial_8250.h | 1 + include/linux/serial_core.h | 1 + include/linux/vt.h | 32 +- include/linux/vt_kern.h | 16 +- kernel/kfifo.c | 2 +- kernel/power/console.c | 63 +- kernel/resource.c | 15 +- 22 files changed, 1059 insertions(+), 2096 deletions(-) Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Already up-to-date. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merging drivers/pci/intel-iommu.c Merge made by recursive. drivers/pci/intel-iommu.c | 43 ++++++++++++++++++++++++++----------------- drivers/pci/iova.c | 16 ++++------------ include/linux/iova.h | 1 - 3 files changed, 30 insertions(+), 30 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Merge made by recursive. fs/proc/uptime.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/filesystems/seq_file.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging MAINTAINERS Auto-merging arch/arm/mach-at91/board-sam9261ek.c Auto-merging arch/arm/mach-at91/board-sam9g20ek.c Auto-merging arch/arm/mach-at91/board-sam9rlek.c Auto-merging drivers/net/rionet.c Merge made by recursive. Documentation/filesystems/nfsroot.txt | 2 +- Documentation/hwmon/hpfall.c | 64 +++++++++++----------- Documentation/powerpc/dts-bindings/marvell.txt | 2 +- Documentation/sysctl/kernel.txt | 30 ++++++----- MAINTAINERS | 2 +- arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-neocore926.c | 2 +- arch/arm/mach-at91/board-qil-a9260.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-sam9rlek.c | 2 +- arch/arm/mach-at91/board-usb-a9260.c | 2 +- arch/arm/mach-at91/board-usb-a9263.c | 2 +- arch/blackfin/mach-bf538/include/mach/defBF539.h | 2 +- arch/h8300/kernel/timer/tpu.c | 1 - arch/powerpc/kernel/udbg_16550.c | 2 +- arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- drivers/block/DAC960.c | 4 +- drivers/edac/edac_core.h | 2 +- drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- drivers/isdn/i4l/isdn_common.c | 4 +- drivers/md/md.h | 2 +- drivers/mtd/devices/m25p80.c | 4 +- drivers/mtd/devices/slram.c | 2 +- drivers/mtd/ftl.c | 2 +- drivers/mtd/nand/cafe_nand.c | 4 +- drivers/mtd/nand/cmx270_nand.c | 4 +- drivers/net/bnx2x_reg.h | 2 +- drivers/net/rionet.c | 2 +- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ehci.h | 2 +- drivers/usb/host/ohci-q.c | 2 +- drivers/video/omap/lcd_h3.c | 4 +- drivers/video/omap/lcd_h4.c | 4 +- drivers/video/omap/lcd_inn1510.c | 4 +- drivers/video/omap/lcd_inn1610.c | 4 +- drivers/video/omap/lcd_osk.c | 4 +- drivers/video/omap/lcd_palmte.c | 4 +- drivers/video/omap/lcd_palmtt.c | 4 +- drivers/video/omap/lcd_palmz71.c | 4 +- fs/xfs/xfs_fs.h | 2 +- include/linux/capability.h | 2 +- include/linux/namei.h | 2 +- include/linux/usb.h | 2 +- include/linux/workqueue.h | 2 +- kernel/panic.c | 2 +- scripts/basic/fixdep.c | 3 +- scripts/mod/sumversion.c | 2 - sound/oss/swarm_cs4297a.c | 3 - 52 files changed, 108 insertions(+), 113 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Already up-to-date. Merging suspend/linux-next $ git merge suspend/linux-next Merge made by recursive. arch/arm/include/asm/device.h | 3 + arch/arm/plat-omap/debug-leds.c | 11 +- arch/arm/plat-omap/gpio.c | 14 +- arch/ia64/include/asm/device.h | 3 + arch/microblaze/include/asm/device.h | 3 + arch/powerpc/include/asm/device.h | 3 + arch/sparc/include/asm/device.h | 3 + arch/x86/include/asm/device.h | 3 + drivers/base/platform.c | 36 --- drivers/dma/dw_dmac.c | 15 +- drivers/dma/txx9dmac.c | 15 +- drivers/i2c/busses/i2c-pxa.c | 25 ++- drivers/i2c/busses/i2c-s3c2410.c | 25 ++- drivers/usb/musb/musb_core.c | 18 +- include/asm-generic/device.h | 3 + include/linux/platform_device.h | 5 +- kernel/power/hibernate.c | 21 ++- kernel/power/power.h | 2 +- kernel/power/snapshot.c | 400 ++++++++++++++++++++++++++-------- 19 files changed, 428 insertions(+), 180 deletions(-) Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. Documentation/00-INDEX | 2 + Documentation/btmrvl.txt | 119 +++++ drivers/bluetooth/Kconfig | 25 + drivers/bluetooth/Makefile | 6 + drivers/bluetooth/btmrvl_debugfs.c | 432 ++++++++++++++++ drivers/bluetooth/btmrvl_drv.h | 139 +++++ drivers/bluetooth/btmrvl_main.c | 624 ++++++++++++++++++++++ drivers/bluetooth/btmrvl_sdio.c | 1002 ++++++++++++++++++++++++++++++++++++ drivers/bluetooth/btmrvl_sdio.h | 108 ++++ drivers/bluetooth/btusb.c | 4 +- include/net/bluetooth/l2cap.h | 8 +- net/bluetooth/hidp/core.c | 1 + net/bluetooth/l2cap.c | 72 +++- net/bluetooth/sco.c | 49 ++- 14 files changed, 2561 insertions(+), 30 deletions(-) create mode 100644 Documentation/btmrvl.txt create mode 100644 drivers/bluetooth/btmrvl_debugfs.c create mode 100644 drivers/bluetooth/btmrvl_drv.h create mode 100644 drivers/bluetooth/btmrvl_main.c create mode 100644 drivers/bluetooth/btmrvl_sdio.c create mode 100644 drivers/bluetooth/btmrvl_sdio.h Merging edac-amd/for-next $ git merge edac-amd/for-next Merge made by recursive. Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging init/Kconfig Merge made by recursive. Documentation/feature-removal-schedule.txt | 7 + fs/notify/Kconfig | 12 +- fs/notify/dnotify/Kconfig | 2 +- fs/notify/dnotify/dnotify.c | 2 +- fs/notify/inode_mark.c | 18 ++- fs/notify/inotify/Kconfig | 2 +- fs/notify/inotify/inotify_user.c | 91 ++++++--- fs/notify/notification.c | 10 +- include/linux/fsnotify_backend.h | 10 +- init/Kconfig | 10 +- kernel/Makefile | 5 +- kernel/audit.c | 1 - kernel/audit.h | 26 ++- kernel/audit_tree.c | 223 ++++++++++++---------- kernel/audit_watch.c | 293 ++++++++++++++++------------ kernel/auditfilter.c | 39 ++--- kernel/auditsc.c | 9 +- 17 files changed, 434 insertions(+), 326 deletions(-) Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging hwlat/for-linus $ git merge hwlat/for-linus Auto-merging MAINTAINERS Merge made by recursive. Documentation/hwlat_detector.txt | 64 ++ MAINTAINERS | 9 + drivers/misc/Kconfig | 29 + drivers/misc/Makefile | 1 + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1311 insertions(+), 0 deletions(-) create mode 100644 Documentation/hwlat_detector.txt create mode 100644 drivers/misc/hwlat_detector.c Merging tip/auto-latest $ git merge tip/auto-latest Resolved 'drivers/oprofile/oprofile_stats.c' using previous resolution. Resolved 'include/linux/rcupdate.h' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging arch/x86/mm/fault.c Auto-merging arch/x86/oprofile/nmi_int.c Auto-merging drivers/oprofile/oprofile_stats.c CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c Removing include/linux/rcuclassic.h Auto-merging include/linux/rcupdate.h CONFLICT (content): Merge conflict in include/linux/rcupdate.h Auto-merging include/linux/sched.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Removing kernel/rcuclassic.c Auto-merging kernel/sched.c Auto-merging kernel/trace/trace.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master dbbb305] Merge commit 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/RCU/RTFP.txt | 77 +++ Documentation/RCU/UP.txt | 34 +- Documentation/RCU/checklist.txt | 20 +- Documentation/RCU/rcubarrier.txt | 7 + Documentation/RCU/torture.txt | 23 +- Documentation/RCU/whatisRCU.txt | 14 +- Documentation/feature-removal-schedule.txt | 9 - Documentation/kernel-parameters.txt | 5 + Documentation/scheduler/sched-rt-group.txt | 13 +- Documentation/trace/events.txt | 9 + arch/x86/Kconfig | 5 + arch/x86/boot/video-vesa.c | 7 +- arch/x86/boot/video-vga.c | 10 - arch/x86/boot/video.c | 5 - arch/x86/boot/video.h | 20 +- arch/x86/include/asm/i387.h | 1 + arch/x86/include/asm/ioctls.h | 95 +---- arch/x86/include/asm/ipcbuf.h | 29 +- arch/x86/include/asm/mce.h | 2 +- arch/x86/include/asm/mman.h | 14 +- arch/x86/include/asm/module.h | 13 +- arch/x86/include/asm/msgbuf.h | 40 +-- arch/x86/include/asm/param.h | 23 +- arch/x86/include/asm/paravirt.h | 711 +------------------------ arch/x86/include/asm/paravirt_types.h | 720 +++++++++++++++++++++++++ arch/x86/include/asm/pgtable.h | 16 +- arch/x86/include/asm/scatterlist.h | 27 +- arch/x86/include/asm/shmbuf.h | 52 +-- arch/x86/include/asm/socket.h | 61 +-- arch/x86/include/asm/sockios.h | 14 +- arch/x86/include/asm/termbits.h | 199 +------- arch/x86/include/asm/termios.h | 115 +---- arch/x86/include/asm/types.h | 12 +- arch/x86/include/asm/ucontext.h | 8 +- arch/x86/kernel/cpu/mcheck/mce.c | 4 +- arch/x86/kernel/cpu/mtrr/amd.c | 97 ++-- arch/x86/kernel/cpu/mtrr/centaur.c | 168 ++----- arch/x86/kernel/cpu/mtrr/cleanup.c | 350 ++++++------ arch/x86/kernel/cpu/mtrr/cyrix.c | 94 ++-- arch/x86/kernel/cpu/mtrr/generic.c | 304 ++++++----- arch/x86/kernel/cpu/mtrr/if.c | 135 +++-- arch/x86/kernel/cpu/mtrr/main.c | 455 +++++++++-------- arch/x86/kernel/cpu/mtrr/mtrr.h | 19 +- arch/x86/kernel/cpu/mtrr/state.c | 68 ++- arch/x86/kernel/cpu/proc.c | 2 - arch/x86/kernel/ds.c | 6 +- arch/x86/kernel/process_32.c | 27 +- arch/x86/kernel/process_64.c | 33 +- arch/x86/kernel/traps.c | 33 +- arch/x86/mm/fault.c | 51 +- arch/x86/mm/highmem_32.c | 2 +- arch/x86/oprofile/nmi_int.c | 101 ++-- arch/x86/oprofile/op_model_amd.c | 267 ++++----- arch/x86/oprofile/op_model_p4.c | 60 +-- arch/x86/oprofile/op_model_ppro.c | 95 ++-- arch/x86/oprofile/op_x86_model.h | 47 +- drivers/oprofile/cpu_buffer.c | 16 +- include/linux/irq.h | 7 - include/linux/oprofile.h | 2 +- include/linux/poison.h | 16 +- include/linux/rcuclassic.h | 178 ------ include/linux/rcupdate.h | 29 +- include/linux/rcupreempt.h | 10 + include/linux/rcutree.h | 12 +- include/linux/sched.h | 6 + init/Kconfig | 12 +- kernel/Makefile | 1 - kernel/irq/manage.c | 2 +- kernel/kprobes.c | 30 +- kernel/printk.c | 146 ++++-- kernel/rcuclassic.c | 807 ---------------------------- kernel/rcupdate.c | 25 + kernel/rcutorture.c | 202 ++++---- kernel/sched.c | 188 ++++++- kernel/trace/kmemtrace.c | 120 +++- kernel/trace/trace.c | 4 +- kernel/trace/trace.h | 3 + kernel/trace/trace_events.c | 37 ++- 78 files changed, 2750 insertions(+), 3931 deletions(-) create mode 100644 arch/x86/include/asm/paravirt_types.h delete mode 100644 include/linux/rcuclassic.h delete mode 100644 kernel/rcuclassic.c Merging percpu/for-next $ git merge percpu/for-next Resolved 'arch/sh/kernel/vmlinux.lds.S' using previous resolution. Resolved 'arch/x86/kernel/cpu/perf_counter.c' using previous resolution. Resolved 'drivers/cpufreq/cpufreq_ondemand.c' using previous resolution. Auto-merging Makefile Auto-merging arch/ia64/kernel/smp.c Auto-merging arch/mn10300/kernel/vmlinux.lds.S Auto-merging arch/sh/kernel/vmlinux.lds.S CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging arch/x86/kernel/cpu/perf_counter.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c Auto-merging block/cfq-iosched.c Auto-merging drivers/cpufreq/cpufreq_conservative.c Auto-merging drivers/cpufreq/cpufreq_ondemand.c CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c Auto-merging drivers/xen/events.c Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging init/main.c Auto-merging kernel/module.c Auto-merging kernel/perf_counter.c Auto-merging kernel/sched.c Auto-merging kernel/trace/trace_events.c Auto-merging lib/Kconfig.debug Auto-merging mm/Makefile Auto-merging mm/page-writeback.c Auto-merging mm/quicklist.c Auto-merging mm/slub.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f0b1a88] Merge commit 'percpu/for-next' $ git diff -M --stat --summary HEAD^.. Makefile | 2 +- arch/alpha/include/asm/percpu.h | 100 +--- arch/alpha/include/asm/tlbflush.h | 1 + arch/alpha/kernel/vmlinux.lds.S | 9 +- arch/arm/kernel/vmlinux.lds.S | 1 + arch/avr32/kernel/vmlinux.lds.S | 9 +- arch/blackfin/kernel/vmlinux.lds.S | 5 +- arch/blackfin/mm/sram-alloc.c | 6 +- arch/cris/include/asm/mmu_context.h | 3 +- arch/cris/kernel/vmlinux.lds.S | 9 +- arch/cris/mm/fault.c | 2 +- arch/frv/kernel/vmlinux.lds.S | 2 + arch/h8300/kernel/vmlinux.lds.S | 5 +- arch/ia64/Kconfig | 3 + arch/ia64/kernel/smp.c | 3 +- arch/ia64/kernel/vmlinux.lds.S | 16 +- arch/ia64/sn/kernel/setup.c | 2 +- arch/m32r/kernel/vmlinux.lds.S | 10 +- arch/m68k/kernel/vmlinux-std.lds | 10 +- arch/m68k/kernel/vmlinux-sun3.lds | 9 +- arch/m68knommu/kernel/vmlinux.lds.S | 7 +- arch/microblaze/kernel/vmlinux.lds.S | 6 +- arch/mips/kernel/vmlinux.lds.S | 21 +- arch/mn10300/kernel/vmlinux.lds.S | 8 +- arch/parisc/kernel/vmlinux.lds.S | 8 +- arch/powerpc/Kconfig | 3 + arch/powerpc/kernel/vmlinux.lds.S | 9 +- arch/powerpc/mm/stab.c | 2 +- arch/powerpc/platforms/ps3/smp.c | 2 +- arch/s390/include/asm/percpu.h | 32 +- arch/s390/kernel/vmlinux.lds.S | 9 +- arch/sh/kernel/vmlinux.lds.S | 10 +- arch/sparc/Kconfig | 3 - arch/sparc/kernel/smp_64.c | 42 +- arch/sparc/kernel/vmlinux.lds.S | 8 +- arch/um/include/asm/common.lds.S | 5 - arch/um/kernel/dyn.lds.S | 2 + arch/um/kernel/uml.lds.S | 2 + arch/x86/Kconfig | 3 - arch/x86/include/asm/percpu.h | 9 - arch/x86/kernel/cpu/cpu_debug.c | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 8 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- arch/x86/kernel/cpu/perf_counter.c | 14 +- arch/x86/kernel/setup_percpu.c | 297 ++------ arch/x86/kernel/vmlinux.lds.S | 11 +- arch/x86/mm/pageattr.c | 1 + arch/xtensa/kernel/vmlinux.lds.S | 13 +- block/as-iosched.c | 10 +- block/cfq-iosched.c | 10 +- drivers/cpufreq/cpufreq_conservative.c | 12 +- drivers/cpufreq/cpufreq_ondemand.c | 15 +- drivers/xen/events.c | 13 +- include/asm-generic/vmlinux.lds.h | 24 +- include/linux/percpu-defs.h | 66 ++- include/linux/percpu.h | 85 ++- init/main.c | 24 - kernel/module.c | 6 +- kernel/perf_counter.c | 6 +- kernel/sched.c | 4 +- kernel/trace/trace_events.c | 6 +- lib/Kconfig.debug | 15 + mm/Makefile | 2 +- mm/allocpercpu.c | 28 + mm/kmemleak-test.c | 6 +- mm/page-writeback.c | 5 +- mm/percpu.c | 1316 +++++++++++++++++++++++++------- mm/quicklist.c | 2 +- mm/slub.c | 4 +- net/ipv4/syncookies.c | 5 +- net/ipv6/syncookies.c | 5 +- net/rds/ib_stats.c | 2 +- net/rds/iw_stats.c | 2 +- net/rds/page.c | 2 +- scripts/module-common.lds | 8 + 75 files changed, 1504 insertions(+), 927 deletions(-) create mode 100644 scripts/module-common.lds Merging sfi/sfi-test $ git merge sfi/sfi-test Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging arch/x86/include/asm/io_apic.h Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging arch/x86/kernel/e820.c Auto-merging arch/x86/kernel/setup.c Auto-merging init/main.c Merge made by recursive. Documentation/kernel-parameters.txt | 5 + MAINTAINERS | 12 + arch/x86/Kconfig | 4 +- arch/x86/include/asm/io_apic.h | 3 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/acpi/boot.c | 24 +-- arch/x86/kernel/apic/io_apic.c | 27 ++- arch/x86/kernel/e820.c | 5 + arch/x86/kernel/setup.c | 3 + arch/x86/kernel/sfi.c | 284 +++++++++++++++++++++++++ arch/x86/pci/mmconfig-shared.c | 5 +- drivers/Makefile | 1 + drivers/acpi/tables.c | 3 + drivers/sfi/Kconfig | 15 ++ drivers/sfi/Makefile | 3 + drivers/sfi/sfi_acpi.c | 151 ++++++++++++++ drivers/sfi/sfi_core.c | 388 +++++++++++++++++++++++++++++++++++ drivers/sfi/sfi_core.h | 44 ++++ include/linux/sfi.h | 198 ++++++++++++++++++ include/linux/sfi_acpi.h | 60 ++++++ init/main.c | 2 + 21 files changed, 1205 insertions(+), 33 deletions(-) create mode 100644 arch/x86/kernel/sfi.c create mode 100644 drivers/sfi/Kconfig create mode 100644 drivers/sfi/Makefile create mode 100644 drivers/sfi/sfi_acpi.c create mode 100644 drivers/sfi/sfi_core.c create mode 100644 drivers/sfi/sfi_core.h create mode 100644 include/linux/sfi.h create mode 100644 include/linux/sfi_acpi.h Merging asm-generic/next $ git merge asm-generic/next Merge made by recursive. lib/checksum.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) Merging quilt/driver-core $ git merge quilt/driver-core Resolved 'init/main.c' using previous resolution. Auto-merging drivers/char/mem.c Auto-merging drivers/infiniband/hw/ehca/ehca_main.c Auto-merging drivers/s390/net/netiucv.c Auto-merging include/linux/netdevice.h Auto-merging init/main.c CONFLICT (content): Merge conflict in init/main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b03d169] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. block/genhd.c | 2 +- drivers/base/Kconfig | 25 ++ drivers/base/Makefile | 1 + drivers/base/base.h | 6 + drivers/base/core.c | 7 +- drivers/base/devtmpfs.c | 367 ++++++++++++++++++++++++++++ drivers/base/driver.c | 4 +- drivers/base/init.c | 1 + drivers/block/cciss.c | 2 +- drivers/char/mem.c | 82 +++---- drivers/firewire/core-device.c | 2 +- drivers/firmware/dmi-id.c | 2 +- drivers/infiniband/hw/ehca/ehca_main.c | 2 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 2 +- drivers/infiniband/hw/ipath/ipath_sysfs.c | 2 +- drivers/input/input.c | 2 +- drivers/misc/enclosure.c | 4 +- drivers/mmc/core/mmc.c | 2 +- drivers/mmc/core/sd.c | 2 +- drivers/mtd/mtdcore.c | 2 +- drivers/s390/cio/css.c | 2 +- drivers/s390/cio/device.c | 2 +- drivers/s390/net/netiucv.c | 2 +- drivers/scsi/scsi_priv.h | 2 +- drivers/scsi/scsi_sysfs.c | 4 +- drivers/uio/Kconfig | 5 - drivers/usb/core/endpoint.c | 2 +- drivers/usb/core/sysfs.c | 4 +- drivers/usb/core/usb.h | 4 +- drivers/uwb/lc-dev.c | 2 +- fs/partitions/check.c | 2 +- include/linux/attribute_container.h | 2 +- include/linux/device.h | 16 +- include/linux/netdevice.h | 2 +- include/linux/shmem_fs.h | 3 + include/linux/transport_class.h | 2 +- init/do_mounts.c | 2 +- init/main.c | 2 + mm/shmem.c | 9 +- net/bluetooth/hci_sysfs.c | 4 +- net/core/net-sysfs.c | 2 +- 41 files changed, 501 insertions(+), 93 deletions(-) create mode 100644 drivers/base/devtmpfs.c $ git am -3 ../patches/0001-driver-core-fix-for-mtd-typo.patch Applying: driver-core: fix for mtd typo $ git reset HEAD^ drivers/mtd/mtdcore.c: locally modified $ git add . $ git commit -v -a --amend [master 88ce42c] Merge branch 'quilt/driver-core' Merging quilt/usb $ git merge quilt/usb Removing drivers/usb/mon/mon_dma.c Auto-merging include/linux/usb.h Merge made by recursive. Documentation/usb/usbmon.txt | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 3 + arch/arm/mach-omap2/usb-musb.c | 21 --- drivers/usb/Kconfig | 2 + drivers/usb/class/usbtmc.c | 34 ++++- drivers/usb/core/devio.c | 166 ++++++++++++-------- drivers/usb/core/driver.c | 41 +++-- drivers/usb/core/generic.c | 4 +- drivers/usb/core/hub.c | 93 ++++++++++- drivers/usb/core/message.c | 32 ++--- drivers/usb/core/usb.h | 7 + drivers/usb/gadget/audio.c | 24 ++-- drivers/usb/gadget/f_audio.c | 97 +++++++----- drivers/usb/gadget/gmidi.c | 8 +- drivers/usb/gadget/pxa25x_udc.c | 49 ++++++- drivers/usb/gadget/pxa25x_udc.h | 1 + drivers/usb/host/Kconfig | 6 + drivers/usb/host/ehci-dbg.c | 3 +- drivers/usb/host/ehci-hcd.c | 5 + drivers/usb/host/ehci-w90x900.c | 181 ++++++++++++++++++++++ drivers/usb/host/whci/asl.c | 12 ++- drivers/usb/host/whci/hcd.c | 8 +- drivers/usb/host/whci/pzl.c | 12 ++- drivers/usb/host/whci/qset.c | 4 +- drivers/usb/host/whci/whci-hc.h | 1 + drivers/usb/misc/ldusb.c | 6 + drivers/usb/misc/legousbtower.c | 6 + drivers/usb/misc/sisusbvga/sisusb.c | 53 ++----- drivers/usb/misc/sisusbvga/sisusb.h | 2 - drivers/usb/mon/Kconfig | 4 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 12 +-- drivers/usb/mon/mon_dma.c | 95 ------------ drivers/usb/mon/mon_main.c | 1 - drivers/usb/mon/mon_text.c | 14 -- drivers/usb/mon/usb_mon.h | 14 -- drivers/usb/musb/Kconfig | 1 + drivers/usb/serial/option.c | 134 ++++++++++++++-- drivers/usb/serial/usb-serial.c | 6 - include/linux/usb.h | 25 ++- include/linux/usb/audio.h | 283 ++++++++++++++++------------------ include/linux/usb/ch9.h | 8 + include/linux/usbdevice_fs.h | 2 + 43 files changed, 913 insertions(+), 571 deletions(-) create mode 100644 drivers/usb/host/ehci-w90x900.c delete mode 100644 drivers/usb/mon/mon_dma.c Merging quilt/staging $ git merge quilt/staging Removing drivers/staging/android/lowmemorykiller.txt Auto-merging drivers/staging/at76_usb/at76_usb.c Auto-merging drivers/staging/otus/usbdrv.c Auto-merging drivers/staging/otus/wrap_pkt.c Auto-merging drivers/staging/rt2860/rt_main_dev.c Removing drivers/staging/rtl8187se/dot11d.h Removing drivers/staging/rtl8187se/ieee80211.h Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c Removing drivers/staging/rtl8187se/ieee80211/internal.h Removing drivers/staging/rtl8187se/ieee80211/rtl_crypto.h Removing drivers/staging/rtl8187se/ieee80211_crypt.h Auto-merging drivers/staging/rtl8187se/r8180_core.c Removing drivers/staging/rtl8187se/r8180_gct.c Removing drivers/staging/rtl8187se/r8180_gct.h Removing drivers/staging/rtl8187se/r8180_max2820.c Removing drivers/staging/rtl8187se/r8180_max2820.h Removing drivers/staging/rtl8187se/r8180_pm.c Removing drivers/staging/rtl8187se/r8180_pm.h Removing drivers/staging/rtl8187se/r8180_rtl8225.c Removing drivers/staging/rtl8187se/r8180_rtl8255.c Removing drivers/staging/rtl8187se/r8180_rtl8255.h Removing drivers/staging/rtl8187se/r8180_sa2400.c Removing drivers/staging/rtl8187se/r8180_sa2400.h Removing drivers/staging/rtl8192su/dot11d.h Removing drivers/staging/rtl8192su/ieee80211.h Removing drivers/staging/rtl8192su/ieee80211/EndianFree.h Removing drivers/staging/rtl8192su/ieee80211/aes.c Removing drivers/staging/rtl8192su/ieee80211/api.c Removing drivers/staging/rtl8192su/ieee80211/arc4.c Removing drivers/staging/rtl8192su/ieee80211/autoload.c Removing drivers/staging/rtl8192su/ieee80211/cipher.c Removing drivers/staging/rtl8192su/ieee80211/compress.c Removing drivers/staging/rtl8192su/ieee80211/crypto_compat.h Removing drivers/staging/rtl8192su/ieee80211/digest.c Removing drivers/staging/rtl8192su/ieee80211/internal.h Removing drivers/staging/rtl8192su/ieee80211/kmap_types.h Removing drivers/staging/rtl8192su/ieee80211/michael_mic.c Removing drivers/staging/rtl8192su/ieee80211/proc.c Removing drivers/staging/rtl8192su/ieee80211/rtl_crypto.h Removing drivers/staging/rtl8192su/ieee80211/scatterwalk.c Removing drivers/staging/rtl8192su/ieee80211/scatterwalk.h Removing drivers/staging/rtl8192su/ieee80211_crypt.h Removing drivers/staging/rtl8192su/r8190_rtl8256.c Removing drivers/staging/rtl8192su/r8192U_hw.h Removing drivers/staging/rtl8192su/r819xU_firmware.c Removing drivers/staging/rtl8192su/r819xU_firmware.h Removing drivers/staging/rtl8192su/r819xU_phy.c Removing drivers/staging/rtl8192su/r819xU_phy.h Removing drivers/staging/rtl8192su/r819xU_phyreg.h Removing drivers/staging/vt6655/Makefile.arm Removing drivers/staging/vt6655/Makefile.x86 Auto-merging drivers/staging/wlan-ng/p80211netdev.c Merge made by recursive. drivers/staging/Kconfig | 6 + drivers/staging/Makefile | 3 + drivers/staging/android/binder.c | 709 +- drivers/staging/android/lowmemorykiller.c | 35 +- drivers/staging/android/lowmemorykiller.txt | 16 - drivers/staging/at76_usb/at76_usb.c | 131 +- drivers/staging/comedi/comedi.h | 1002 ++-- drivers/staging/comedi/comedi_compat32.c | 115 +- drivers/staging/comedi/comedi_compat32.h | 4 +- drivers/staging/comedi/comedi_fops.c | 278 +- drivers/staging/comedi/comedi_ksyms.c | 3 - drivers/staging/comedi/comedidev.h | 85 +- drivers/staging/comedi/comedilib.h | 77 +- drivers/staging/comedi/drivers.c | 184 +- drivers/staging/comedi/drivers/8253.h | 69 +- drivers/staging/comedi/drivers/8255.c | 54 +- drivers/staging/comedi/drivers/8255.h | 16 +- drivers/staging/comedi/drivers/acl7225b.c | 22 +- drivers/staging/comedi/drivers/adl_pci6208.c | 93 +- drivers/staging/comedi/drivers/adl_pci7296.c | 39 +- drivers/staging/comedi/drivers/adl_pci7432.c | 57 +- drivers/staging/comedi/drivers/adl_pci8164.c | 126 +- drivers/staging/comedi/drivers/adl_pci9111.c | 361 +- drivers/staging/comedi/drivers/adl_pci9118.c | 532 +- drivers/staging/comedi/drivers/adq12b.c | 371 +- drivers/staging/comedi/drivers/adv_pci1710.c | 417 +- drivers/staging/comedi/drivers/adv_pci1723.c | 73 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 306 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 36 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 30 +- drivers/staging/comedi/drivers/amplc_dio200.c | 314 +- drivers/staging/comedi/drivers/amplc_pc236.c | 118 +- drivers/staging/comedi/drivers/amplc_pc263.c | 101 +- drivers/staging/comedi/drivers/amplc_pci224.c | 260 +- drivers/staging/comedi/drivers/amplc_pci230.c | 495 +- drivers/staging/comedi/drivers/c6xdigio.c | 42 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 166 +- drivers/staging/comedi/drivers/cb_pcidas.c | 671 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 1788 +++--- drivers/staging/comedi/drivers/cb_pcidda.c | 218 +- drivers/staging/comedi/drivers/cb_pcidio.c | 74 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 89 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 61 +- drivers/staging/comedi/drivers/comedi_bond.c | 56 +- drivers/staging/comedi/drivers/comedi_fc.c | 14 +- drivers/staging/comedi/drivers/comedi_fc.h | 4 +- drivers/staging/comedi/drivers/comedi_parport.c | 29 +- drivers/staging/comedi/drivers/comedi_test.c | 143 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 48 +- drivers/staging/comedi/drivers/daqboard2000.c | 119 +- drivers/staging/comedi/drivers/das08.c | 622 +- drivers/staging/comedi/drivers/das08.h | 3 +- drivers/staging/comedi/drivers/das08_cs.c | 24 +- drivers/staging/comedi/drivers/das16.c | 828 ++-- drivers/staging/comedi/drivers/das16m1.c | 132 +- drivers/staging/comedi/drivers/das1800.c | 658 +- drivers/staging/comedi/drivers/das6402.c | 23 +- drivers/staging/comedi/drivers/das800.c | 224 +- drivers/staging/comedi/drivers/dmm32at.c | 144 +- drivers/staging/comedi/drivers/dt2801.c | 242 +- drivers/staging/comedi/drivers/dt2811.c | 178 +- drivers/staging/comedi/drivers/dt2814.c | 16 +- drivers/staging/comedi/drivers/dt2815.c | 38 +- drivers/staging/comedi/drivers/dt2817.c | 19 +- drivers/staging/comedi/drivers/dt282x.c | 264 +- drivers/staging/comedi/drivers/dt3000.c | 145 +- drivers/staging/comedi/drivers/dt9812.c | 85 +- drivers/staging/comedi/drivers/fl512.c | 37 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 236 +- drivers/staging/comedi/drivers/icp_multi.c | 198 +- drivers/staging/comedi/drivers/icp_multi.h | 74 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 127 +- drivers/staging/comedi/drivers/jr3_pci.c | 298 +- drivers/staging/comedi/drivers/jr3_pci.h | 40 +- drivers/staging/comedi/drivers/ke_counter.c | 67 +- drivers/staging/comedi/drivers/me4000.c | 881 ++-- drivers/staging/comedi/drivers/me_daq.c | 218 +- drivers/staging/comedi/drivers/mite.c | 138 +- drivers/staging/comedi/drivers/mite.h | 144 +- drivers/staging/comedi/drivers/mpc624.c | 48 +- drivers/staging/comedi/drivers/mpc8260cpm.c | 26 +- drivers/staging/comedi/drivers/multiq3.c | 45 +- drivers/staging/comedi/drivers/ni_6527.c | 107 +- drivers/staging/comedi/drivers/ni_65xx.c | 400 +- drivers/staging/comedi/drivers/ni_660x.c | 291 +- drivers/staging/comedi/drivers/ni_670x.c | 99 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 93 +- drivers/staging/comedi/drivers/ni_at_ao.c | 69 +- drivers/staging/comedi/drivers/ni_atmio.c | 318 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 126 +- drivers/staging/comedi/drivers/ni_daq_700.c | 80 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 43 +- drivers/staging/comedi/drivers/ni_labpc.c | 452 +- drivers/staging/comedi/drivers/ni_labpc.h | 5 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 70 +- drivers/staging/comedi/drivers/ni_mio_common.c | 1662 +++-- drivers/staging/comedi/drivers/ni_mio_cs.c | 36 +- drivers/staging/comedi/drivers/ni_pcidio.c | 341 +- drivers/staging/comedi/drivers/ni_pcimio.c | 2063 +++--- drivers/staging/comedi/drivers/ni_stc.h | 64 +- drivers/staging/comedi/drivers/ni_tio.c | 475 +- drivers/staging/comedi/drivers/ni_tio.h | 47 +- drivers/staging/comedi/drivers/ni_tio_internal.h | 58 +- drivers/staging/comedi/drivers/ni_tiocmd.c | 105 +- drivers/staging/comedi/drivers/pcl711.c | 107 +- drivers/staging/comedi/drivers/pcl724.c | 33 +- drivers/staging/comedi/drivers/pcl725.c | 7 +- drivers/staging/comedi/drivers/pcl726.c | 59 +- drivers/staging/comedi/drivers/pcl730.c | 16 +- drivers/staging/comedi/drivers/pcl812.c | 480 +- drivers/staging/comedi/drivers/pcl816.c | 220 +- drivers/staging/comedi/drivers/pcl818.c | 338 +- drivers/staging/comedi/drivers/pcm3724.c | 28 +- drivers/staging/comedi/drivers/pcm3730.c | 16 +- drivers/staging/comedi/drivers/pcmad.c | 17 +- drivers/staging/comedi/drivers/pcmda12.c | 25 +- drivers/staging/comedi/drivers/pcmmio.c | 287 +- drivers/staging/comedi/drivers/pcmuio.c | 228 +- drivers/staging/comedi/drivers/plx9080.h | 8 +- drivers/staging/comedi/drivers/poc.c | 102 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 115 +- drivers/staging/comedi/drivers/rtd520.c | 487 +- drivers/staging/comedi/drivers/rti800.c | 83 +- drivers/staging/comedi/drivers/rti802.c | 21 +- drivers/staging/comedi/drivers/s526.c | 203 +- drivers/staging/comedi/drivers/s626.c | 1016 ++-- drivers/staging/comedi/drivers/s626.h | 16 +- drivers/staging/comedi/drivers/serial2002.c | 201 +- drivers/staging/comedi/drivers/skel.c | 82 +- drivers/staging/comedi/drivers/ssv_dnp.c | 40 +- drivers/staging/comedi/drivers/unioxx5.c | 106 +- drivers/staging/comedi/drivers/usbdux.c | 268 +- drivers/staging/comedi/drivers/usbduxfast.c | 459 +- drivers/staging/comedi/drivers/vmk80xx.c | 135 +- drivers/staging/comedi/kcomedilib/data.c | 12 +- drivers/staging/comedi/kcomedilib/dio.c | 8 +- drivers/staging/comedi/kcomedilib/get.c | 55 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 35 +- drivers/staging/comedi/kcomedilib/ksyms.c | 4 - drivers/staging/comedi/proc.c | 23 +- drivers/staging/comedi/range.c | 21 +- drivers/staging/cpc-usb/cpc-usb_drv.c | 1 - drivers/staging/et131x/et1310_address_map.h | 2138 +++--- drivers/staging/et131x/et1310_eeprom.c | 46 +- drivers/staging/et131x/et1310_eeprom.h | 6 +- drivers/staging/et131x/et1310_jagcore.c | 20 +- drivers/staging/et131x/et1310_jagcore.h | 17 +- drivers/staging/et131x/et1310_mac.c | 112 +- drivers/staging/et131x/et1310_mac.h | 8 +- drivers/staging/et131x/et1310_phy.c | 202 +- drivers/staging/et131x/et1310_phy.h | 904 ++-- drivers/staging/et131x/et1310_pm.c | 19 +- drivers/staging/et131x/et1310_pm.h | 8 +- drivers/staging/et131x/et1310_rx.c | 115 +- drivers/staging/et131x/et1310_rx.h | 194 +- drivers/staging/et131x/et1310_tx.c | 120 +- drivers/staging/et131x/et1310_tx.h | 102 +- drivers/staging/et131x/et131x_adapter.h | 72 +- drivers/staging/et131x/et131x_config.c | 38 +- drivers/staging/et131x/et131x_debug.c | 12 +- drivers/staging/et131x/et131x_debug.h | 24 +- drivers/staging/et131x/et131x_defs.h | 12 +- drivers/staging/et131x/et131x_initpci.c | 74 +- drivers/staging/et131x/et131x_initpci.h | 6 +- drivers/staging/et131x/et131x_isr.c | 44 +- drivers/staging/et131x/et131x_isr.h | 6 +- drivers/staging/et131x/et131x_netdev.c | 123 +- drivers/staging/et131x/et131x_netdev.h | 6 +- drivers/staging/et131x/et131x_version.h | 6 +- drivers/staging/otus/ioctl.c | 25 +- drivers/staging/otus/usbdrv.c | 14 - drivers/staging/otus/wrap_buf.c | 3 - drivers/staging/otus/wrap_dbg.c | 3 - drivers/staging/otus/wrap_ev.c | 7 - drivers/staging/otus/wrap_mem.c | 3 - drivers/staging/otus/wrap_mis.c | 3 - drivers/staging/otus/wrap_pkt.c | 4 - drivers/staging/otus/wrap_sec.c | 3 - drivers/staging/otus/wrap_usb.c | 3 - drivers/staging/otus/wwrap.c | 8 - drivers/staging/otus/zdcompat.h | 10 - drivers/staging/quatech_usb2/Kconfig | 15 + drivers/staging/quatech_usb2/Makefile | 1 + drivers/staging/quatech_usb2/quatech_usb2.c | 611 ++ drivers/staging/rt2860/rt_linux.h | 33 +- drivers/staging/rt2860/rt_main_dev.c | 2 +- drivers/staging/rt2860/sta_ioctl.c | 7 +- drivers/staging/rt2870/2870_main_dev.c | 4 +- drivers/staging/rt2870/rt2870.h | 5 + drivers/staging/rt3090/Kconfig | 5 + drivers/staging/rt3090/Makefile | 80 + drivers/staging/{rt2860/md4.h => rt3090/action.h} | 50 +- drivers/staging/rt3090/ap.h | 512 ++ drivers/staging/rt3090/ap_apcli.h | 276 + .../{rt2860/md4.h => rt3090/ap_autoChSel.h} | 63 +- .../{rt2860/md4.h => rt3090/ap_autoChSel_cmm.h} | 50 +- drivers/staging/rt3090/ap_cfg.h | 118 + drivers/staging/{rt2860/md4.h => rt3090/ap_ids.h} | 66 +- drivers/staging/{rt2860/md4.h => rt3090/ap_mbss.h} | 56 +- drivers/staging/rt3090/ap_uapsd.h | 636 ++ drivers/staging/rt3090/ap_wds.h | 212 + drivers/staging/rt3090/chips/rt3090.c | 123 + drivers/staging/rt3090/chips/rt30xx.c | 525 ++ drivers/staging/rt3090/chips/rt3370.c | 121 + drivers/staging/rt3090/chips/rt3390.c | 122 + drivers/staging/rt3090/chips/rt33xx.c | 536 ++ drivers/staging/rt3090/chlist.h | 130 + drivers/staging/rt3090/common/action.c | 1057 +++ drivers/staging/rt3090/common/ba_action.c | 1779 +++++ drivers/staging/rt3090/common/cmm_aes.c | 1560 ++++ drivers/staging/rt3090/common/cmm_asic.c | 2753 +++++++ drivers/staging/rt3090/common/cmm_cfg.c | 295 + drivers/staging/rt3090/common/cmm_data.c | 2763 +++++++ drivers/staging/rt3090/common/cmm_data_pci.c | 1576 ++++ drivers/staging/rt3090/common/cmm_info.c | 3717 ++++++++++ drivers/staging/rt3090/common/cmm_mac_pci.c | 1757 +++++ drivers/staging/rt3090/common/cmm_profile.c | 2321 ++++++ drivers/staging/rt3090/common/cmm_sanity.c | 1718 +++++ drivers/staging/rt3090/common/cmm_sync.c | 734 ++ drivers/staging/rt3090/common/cmm_tkip.c | 966 +++ drivers/staging/rt3090/common/cmm_wep.c | 500 ++ drivers/staging/rt3090/common/cmm_wpa.c | 3149 ++++++++ drivers/staging/rt3090/common/crypt_aes.c | 1007 +++ drivers/staging/rt3090/common/crypt_biginteger.c | 1119 +++ drivers/staging/rt3090/common/crypt_dh.c | 234 + drivers/staging/rt3090/common/crypt_hmac.c | 279 + drivers/staging/rt3090/common/crypt_md5.c | 353 + drivers/staging/rt3090/common/crypt_sha2.c | 536 ++ drivers/staging/rt3090/common/dfs.c | 481 ++ drivers/staging/rt3090/common/ee_efuse.c | 1548 ++++ drivers/staging/rt3090/common/ee_prom.c | 308 + drivers/staging/rt3090/common/eeprom.c | 98 + drivers/staging/rt3090/common/igmp_snoop.c | 1365 ++++ drivers/staging/rt3090/common/mlme.c | 6550 +++++++++++++++++ drivers/staging/rt3090/common/mlme_ex.c | 215 + drivers/staging/rt3090/common/netif_block.c | 147 + drivers/staging/rt3090/common/rt_channel.c | 1287 ++++ drivers/staging/rt3090/common/rt_rf.c | 201 + drivers/staging/rt3090/common/rtmp_init.c | 3882 ++++++++++ drivers/staging/rt3090/common/rtmp_mcu.c | 560 ++ drivers/staging/rt3090/common/rtmp_timer.c | 327 + drivers/staging/rt3090/common/spectrum.c | 2221 ++++++ drivers/staging/rt3090/config.mk | 187 + .../staging/{rt2860/md4.h => rt3090/crypt_hmac.h} | 65 +- .../staging/{rt2860/md4.h => rt3090/crypt_md5.h} | 62 +- drivers/staging/rt3090/crypt_sha2.h | 107 + drivers/staging/rt3090/dfs.h | 137 + drivers/staging/rt3090/eeprom.h | 82 + drivers/staging/rt3090/firmware.h | 517 ++ drivers/staging/rt3090/igmp_snoop.h | 152 + drivers/staging/rt3090/ipv6.h | 215 + drivers/staging/rt3090/link_list.h | 133 + drivers/staging/rt3090/mac_pci.h | 454 ++ drivers/staging/rt3090/mlme.h | 1360 ++++ drivers/staging/{rt2860/md4.h => rt3090/mlme_ex.h} | 67 +- .../staging/{rt2860/md4.h => rt3090/mlme_ex_def.h} | 37 +- .../staging/{rt2860/md4.h => rt3090/netif_block.h} | 38 +- drivers/staging/rt3090/oid.h | 1144 +++ drivers/staging/rt3090/pci_main_dev.c | 1194 +++ drivers/staging/{rt2860/md4.h => rt3090/rt3090.h} | 59 +- drivers/staging/{rt2860/md4.h => rt3090/rt30xx.h} | 30 +- drivers/staging/{rt2860/md4.h => rt3090/rt3370.h} | 46 +- drivers/staging/{rt2860/md4.h => rt3090/rt3390.h} | 59 +- drivers/staging/{rt2870/md4.h => rt3090/rt33xx.h} | 30 +- drivers/staging/rt3090/rt_ate.c | 6089 ++++++++++++++++ drivers/staging/rt3090/rt_ate.h | 314 + drivers/staging/rt3090/rt_config.h | 126 + drivers/staging/rt3090/rt_linux.c | 1623 +++++ drivers/staging/rt3090/rt_linux.h | 1034 +++ drivers/staging/rt3090/rt_main_dev.c | 897 +++ drivers/staging/rt3090/rt_pci_rbus.c | 989 +++ drivers/staging/rt3090/rt_profile.c | 101 + drivers/staging/rt3090/rtmp.h | 6873 ++++++++++++++++++ drivers/staging/rt3090/rtmp_chip.h | 355 + drivers/staging/rt3090/rtmp_def.h | 1650 +++++ drivers/staging/rt3090/rtmp_dot11.h | 146 + .../staging/{rt2860/md4.h => rt3090/rtmp_iface.h} | 63 +- drivers/staging/rt3090/rtmp_mac.h | 2304 ++++++ .../staging/{rt2860/md4.h => rt3090/rtmp_mcu.h} | 39 +- drivers/staging/rt3090/rtmp_os.h | 93 + drivers/staging/rt3090/rtmp_pci.h | 110 + drivers/staging/rt3090/rtmp_phy.h | 631 ++ drivers/staging/rt3090/rtmp_timer.h | 162 + drivers/staging/rt3090/rtmp_type.h | 147 + drivers/staging/rt3090/spectrum.h | 234 + drivers/staging/rt3090/spectrum_def.h | 257 + drivers/staging/rt3090/sta/assoc.c | 1673 +++++ drivers/staging/rt3090/sta/auth.c | 491 ++ drivers/staging/rt3090/sta/auth_rsp.c | 151 + drivers/staging/rt3090/sta/connect.c | 2759 +++++++ drivers/staging/rt3090/sta/dls.c | 2207 ++++++ drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 ++ drivers/staging/rt3090/sta/rtmp_data.c | 2661 +++++++ drivers/staging/rt3090/sta/sanity.c | 382 + drivers/staging/rt3090/sta/sync.c | 1840 +++++ drivers/staging/rt3090/sta/wpa.c | 396 + drivers/staging/rt3090/sta_ioctl.c | 7559 ++++++++++++++++++++ .../staging/{rt2860/md4.h => rt3090/vr_ikans.h} | 53 +- drivers/staging/rt3090/wpa.h | 447 ++ drivers/staging/rtl8187se/Makefile | 14 - drivers/staging/rtl8187se/TODO | 21 + drivers/staging/rtl8187se/dot11d.h | 101 - drivers/staging/rtl8187se/ieee80211.h | 1755 ----- drivers/staging/rtl8187se/ieee80211/dot11d.c | 22 - drivers/staging/rtl8187se/ieee80211/dot11d.h | 2 - drivers/staging/rtl8187se/ieee80211/ieee80211.h | 140 +- .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 17 - .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 73 +- .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 293 +- .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 120 +- .../staging/rtl8187se/ieee80211/ieee80211_module.c | 88 - drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 242 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 995 +--- .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 30 - drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 241 - drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 123 +- drivers/staging/rtl8187se/ieee80211/internal.h | 115 - drivers/staging/rtl8187se/ieee80211/rtl_crypto.h | 399 -- drivers/staging/rtl8187se/ieee80211_crypt.h | 86 - drivers/staging/rtl8187se/r8180.h | 24 +- drivers/staging/rtl8187se/r8180_93cx6.h | 2 - drivers/staging/rtl8187se/r8180_core.c | 2946 +------- drivers/staging/rtl8187se/r8180_dm.c | 58 - drivers/staging/rtl8187se/r8180_dm.h | 18 - drivers/staging/rtl8187se/r8180_gct.c | 296 - drivers/staging/rtl8187se/r8180_gct.h | 25 - drivers/staging/rtl8187se/r8180_hw.h | 393 +- drivers/staging/rtl8187se/r8180_max2820.c | 240 - drivers/staging/rtl8187se/r8180_max2820.h | 21 - drivers/staging/rtl8187se/r8180_pm.c | 92 - drivers/staging/rtl8187se/r8180_pm.h | 28 - drivers/staging/rtl8187se/r8180_rtl8225.c | 933 --- drivers/staging/rtl8187se/r8180_rtl8225.h | 12 +- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 1552 ++--- drivers/staging/rtl8187se/r8180_rtl8255.c | 1838 ----- drivers/staging/rtl8187se/r8180_rtl8255.h | 19 - drivers/staging/rtl8187se/r8180_sa2400.c | 233 - drivers/staging/rtl8187se/r8180_sa2400.h | 26 - drivers/staging/rtl8187se/r8180_wx.c | 51 +- drivers/staging/rtl8187se/r8180_wx.h | 2 +- drivers/staging/rtl8187se/r8185b_init.c | 663 +-- drivers/staging/rtl8192su/Makefile | 23 +- drivers/staging/rtl8192su/TODO | 23 + drivers/staging/rtl8192su/dot11d.h | 102 - drivers/staging/rtl8192su/ieee80211.h | 2901 -------- drivers/staging/rtl8192su/ieee80211/EndianFree.h | 199 - drivers/staging/rtl8192su/ieee80211/Makefile | 3 +- drivers/staging/rtl8192su/ieee80211/aes.c | 469 -- drivers/staging/rtl8192su/ieee80211/api.c | 246 - drivers/staging/rtl8192su/ieee80211/arc4.c | 103 - drivers/staging/rtl8192su/ieee80211/autoload.c | 40 - drivers/staging/rtl8192su/ieee80211/cipher.c | 299 - drivers/staging/rtl8192su/ieee80211/compress.c | 64 - .../staging/rtl8192su/ieee80211/crypto_compat.h | 90 - drivers/staging/rtl8192su/ieee80211/digest.c | 108 - drivers/staging/rtl8192su/ieee80211/dot11d.c | 18 +- drivers/staging/rtl8192su/ieee80211/dot11d.h | 4 - drivers/staging/rtl8192su/ieee80211/ieee80211.h | 354 +- .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 14 - .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 7 - .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 51 +- .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 266 +- .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 113 +- .../staging/rtl8192su/ieee80211/ieee80211_module.c | 64 +- drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 126 +- .../rtl8192su/ieee80211/ieee80211_softmac.c | 338 +- .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 69 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 22 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 198 +- drivers/staging/rtl8192su/ieee80211/internal.h | 115 - drivers/staging/rtl8192su/ieee80211/kmap_types.h | 20 - drivers/staging/rtl8192su/ieee80211/michael_mic.c | 194 - drivers/staging/rtl8192su/ieee80211/proc.c | 116 - .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 43 - drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 9 - .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 277 +- drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 168 +- .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 34 +- drivers/staging/rtl8192su/ieee80211/rtl_crypto.h | 399 -- drivers/staging/rtl8192su/ieee80211/scatterwalk.c | 126 - drivers/staging/rtl8192su/ieee80211/scatterwalk.h | 51 - drivers/staging/rtl8192su/ieee80211_crypt.h | 86 - drivers/staging/rtl8192su/r8180_93cx6.h | 5 - drivers/staging/rtl8192su/r8190_rtl8256.c | 312 - drivers/staging/rtl8192su/r8192S_Efuse.c | 113 - drivers/staging/rtl8192su/r8192S_firmware.c | 477 -- drivers/staging/rtl8192su/r8192S_firmware.h | 5 - drivers/staging/rtl8192su/r8192S_hw.h | 184 - drivers/staging/rtl8192su/r8192S_phy.c | 923 +--- drivers/staging/rtl8192su/r8192S_phy.h | 5 +- drivers/staging/rtl8192su/r8192S_rtl6052.c | 104 - drivers/staging/rtl8192su/r8192S_rtl6052.h | 47 - drivers/staging/rtl8192su/r8192U.h | 528 +-- drivers/staging/rtl8192su/r8192U_core.c | 4812 +------------- drivers/staging/rtl8192su/r8192U_dm.c | 549 +-- drivers/staging/rtl8192su/r8192U_dm.h | 55 - drivers/staging/rtl8192su/r8192U_hw.h | 746 -- drivers/staging/rtl8192su/r8192U_pm.c | 11 +- drivers/staging/rtl8192su/r8192U_pm.h | 2 - drivers/staging/rtl8192su/r8192U_wx.c | 128 +- drivers/staging/rtl8192su/r8192U_wx.h | 1 - drivers/staging/rtl8192su/r819xU_HTType.h | 9 - drivers/staging/rtl8192su/r819xU_cmdpkt.c | 113 +- drivers/staging/rtl8192su/r819xU_cmdpkt.h | 20 - drivers/staging/rtl8192su/r819xU_firmware.c | 707 -- drivers/staging/rtl8192su/r819xU_firmware.h | 106 - drivers/staging/rtl8192su/r819xU_phy.c | 1826 ----- drivers/staging/rtl8192su/r819xU_phy.h | 94 - drivers/staging/rtl8192su/r819xU_phyreg.h | 871 --- drivers/staging/serqt_usb2/serqt_usb2.c | 20 +- drivers/staging/vt6655/Kconfig | 2 +- drivers/staging/vt6655/Makefile | 2 +- drivers/staging/vt6655/Makefile.arm | 181 - drivers/staging/vt6655/Makefile.x86 | 209 - drivers/staging/vt6655/desc.h | 9 - drivers/staging/vt6655/device.h | 98 - drivers/staging/vt6655/device_main.c | 301 +- drivers/staging/vt6655/dpc.c | 106 - drivers/staging/vt6655/hostap.c | 29 - drivers/staging/vt6655/hostap.h | 8 - drivers/staging/vt6655/iwctl.c | 87 - drivers/staging/vt6655/iwctl.h | 87 - drivers/staging/vt6655/kcompat.h | 4 - drivers/staging/vt6655/wctl.c | 4 - drivers/staging/vt6656/80211hdr.h | 358 + drivers/staging/vt6656/80211mgr.c | 1050 +++ drivers/staging/vt6656/80211mgr.h | 867 +++ drivers/staging/vt6656/Kconfig | 6 + drivers/staging/vt6656/Makefile | 39 + drivers/staging/vt6656/aes_ccmp.c | 410 ++ drivers/staging/vt6656/aes_ccmp.h | 48 + drivers/staging/vt6656/baseband.c | 2129 ++++++ drivers/staging/vt6656/baseband.h | 163 + drivers/staging/vt6656/bssdb.c | 1768 +++++ drivers/staging/vt6656/bssdb.h | 370 + drivers/staging/vt6656/card.c | 1147 +++ drivers/staging/vt6656/card.h | 109 + drivers/staging/vt6656/channel.c | 535 ++ drivers/staging/vt6656/channel.h | 58 + drivers/staging/vt6656/control.c | 116 + drivers/staging/vt6656/control.h | 103 + drivers/staging/vt6656/country.h | 163 + drivers/staging/vt6656/datarate.c | 518 ++ drivers/staging/vt6656/datarate.h | 110 + drivers/staging/vt6656/desc.h | 453 ++ drivers/staging/vt6656/device.h | 976 +++ drivers/staging/vt6656/device_cfg.h | 142 + drivers/staging/vt6656/dpc.c | 1658 +++++ drivers/staging/vt6656/dpc.h | 94 + drivers/staging/vt6656/firmware.c | 887 +++ drivers/staging/vt6656/firmware.h | 66 + drivers/staging/vt6656/hostap.c | 888 +++ drivers/staging/vt6656/hostap.h | 86 + drivers/staging/vt6656/int.c | 214 + drivers/staging/vt6656/int.h | 101 + drivers/staging/vt6656/iocmd.h | 478 ++ drivers/staging/vt6656/ioctl.c | 724 ++ drivers/staging/vt6656/ioctl.h | 74 + drivers/staging/vt6656/iowpa.h | 159 + drivers/staging/vt6656/iwctl.c | 2215 ++++++ drivers/staging/vt6656/iwctl.h | 246 + drivers/staging/vt6656/kcompat.h | 83 + drivers/staging/vt6656/key.c | 886 +++ drivers/staging/vt6656/key.h | 196 + drivers/staging/vt6656/mac.c | 500 ++ drivers/staging/vt6656/mac.h | 458 ++ drivers/staging/vt6656/main_usb.c | 2256 ++++++ drivers/staging/vt6656/mib.c | 592 ++ drivers/staging/vt6656/mib.h | 445 ++ drivers/staging/vt6656/michael.c | 188 + drivers/staging/vt6656/michael.h | 62 + drivers/staging/vt6656/power.c | 458 ++ drivers/staging/vt6656/power.h | 84 + drivers/staging/vt6656/rc4.c | 89 + drivers/staging/vt6656/rc4.h | 51 + drivers/staging/vt6656/rf.c | 1163 +++ drivers/staging/vt6656/rf.h | 112 + drivers/staging/vt6656/rndis.h | 162 + drivers/staging/vt6656/rxtx.c | 3280 +++++++++ drivers/staging/vt6656/rxtx.h | 716 ++ drivers/staging/vt6656/srom.h | 144 + drivers/staging/vt6656/tbit.h | 78 + drivers/staging/vt6656/tcrc.c | 207 + drivers/staging/vt6656/tcrc.h | 71 + drivers/staging/vt6656/tether.c | 123 + drivers/staging/vt6656/tether.h | 256 + drivers/staging/vt6656/tkip.c | 284 + drivers/staging/vt6656/tkip.h | 76 + drivers/staging/vt6656/tmacro.h | 152 + drivers/staging/vt6656/tpci.h | 119 + drivers/staging/vt6656/ttype.h | 399 ++ drivers/staging/vt6656/umem.h | 75 + drivers/staging/vt6656/upc.h | 171 + drivers/staging/vt6656/usbpipe.c | 857 +++ drivers/staging/vt6656/usbpipe.h | 116 + drivers/staging/vt6656/vntconfiguration.dat | 6 + drivers/staging/vt6656/wcmd.c | 1397 ++++ drivers/staging/vt6656/wcmd.h | 156 + drivers/staging/vt6656/wctl.c | 263 + drivers/staging/vt6656/wctl.h | 127 + drivers/staging/vt6656/wmgr.c | 4993 +++++++++++++ drivers/staging/vt6656/wmgr.h | 519 ++ drivers/staging/vt6656/wpa.c | 339 + drivers/staging/vt6656/wpa.h | 98 + drivers/staging/vt6656/wpa2.c | 373 + drivers/staging/vt6656/wpa2.h | 99 + drivers/staging/vt6656/wpactl.c | 1030 +++ drivers/staging/vt6656/wpactl.h | 90 + drivers/staging/wlan-ng/hfa384x_usb.c | 205 +- drivers/staging/wlan-ng/p80211conv.c | 12 +- drivers/staging/wlan-ng/p80211hdr.h | 15 - drivers/staging/wlan-ng/p80211meta.h | 6 - drivers/staging/wlan-ng/p80211mgmt.h | 6 - drivers/staging/wlan-ng/p80211msg.h | 6 - drivers/staging/wlan-ng/p80211netdev.c | 62 +- drivers/staging/wlan-ng/p80211netdev.h | 3 - drivers/staging/wlan-ng/p80211req.c | 12 +- drivers/staging/wlan-ng/p80211types.h | 4 - drivers/staging/wlan-ng/p80211wep.c | 27 +- drivers/staging/wlan-ng/p80211wext.c | 77 +- drivers/staging/wlan-ng/prism2fw.c | 46 +- drivers/staging/wlan-ng/prism2mgmt.c | 23 +- drivers/staging/wlan-ng/prism2mib.c | 144 +- drivers/staging/wlan-ng/prism2sta.c | 153 +- drivers/staging/wlan-ng/prism2usb.c | 10 +- 525 files changed, 167924 insertions(+), 51515 deletions(-) delete mode 100644 drivers/staging/android/lowmemorykiller.txt create mode 100644 drivers/staging/quatech_usb2/Kconfig create mode 100644 drivers/staging/quatech_usb2/Makefile create mode 100644 drivers/staging/quatech_usb2/quatech_usb2.c create mode 100644 drivers/staging/rt3090/Kconfig create mode 100644 drivers/staging/rt3090/Makefile copy drivers/staging/{rt2860/md4.h => rt3090/action.h} (66%) create mode 100644 drivers/staging/rt3090/ap.h create mode 100644 drivers/staging/rt3090/ap_apcli.h copy drivers/staging/{rt2860/md4.h => rt3090/ap_autoChSel.h} (57%) copy drivers/staging/{rt2860/md4.h => rt3090/ap_autoChSel_cmm.h} (62%) create mode 100644 drivers/staging/rt3090/ap_cfg.h copy drivers/staging/{rt2860/md4.h => rt3090/ap_ids.h} (56%) copy drivers/staging/{rt2860/md4.h => rt3090/ap_mbss.h} (62%) create mode 100644 drivers/staging/rt3090/ap_uapsd.h create mode 100644 drivers/staging/rt3090/ap_wds.h create mode 100644 drivers/staging/rt3090/chips/rt3090.c create mode 100644 drivers/staging/rt3090/chips/rt30xx.c create mode 100644 drivers/staging/rt3090/chips/rt3370.c create mode 100644 drivers/staging/rt3090/chips/rt3390.c create mode 100644 drivers/staging/rt3090/chips/rt33xx.c create mode 100644 drivers/staging/rt3090/chlist.h create mode 100644 drivers/staging/rt3090/common/action.c create mode 100644 drivers/staging/rt3090/common/ba_action.c create mode 100644 drivers/staging/rt3090/common/cmm_aes.c create mode 100644 drivers/staging/rt3090/common/cmm_asic.c create mode 100644 drivers/staging/rt3090/common/cmm_cfg.c create mode 100644 drivers/staging/rt3090/common/cmm_data.c create mode 100644 drivers/staging/rt3090/common/cmm_data_pci.c create mode 100644 drivers/staging/rt3090/common/cmm_info.c create mode 100644 drivers/staging/rt3090/common/cmm_mac_pci.c create mode 100644 drivers/staging/rt3090/common/cmm_profile.c create mode 100644 drivers/staging/rt3090/common/cmm_sanity.c create mode 100644 drivers/staging/rt3090/common/cmm_sync.c create mode 100644 drivers/staging/rt3090/common/cmm_tkip.c create mode 100644 drivers/staging/rt3090/common/cmm_wep.c create mode 100644 drivers/staging/rt3090/common/cmm_wpa.c create mode 100644 drivers/staging/rt3090/common/crypt_aes.c create mode 100644 drivers/staging/rt3090/common/crypt_biginteger.c create mode 100644 drivers/staging/rt3090/common/crypt_dh.c create mode 100644 drivers/staging/rt3090/common/crypt_hmac.c create mode 100644 drivers/staging/rt3090/common/crypt_md5.c create mode 100644 drivers/staging/rt3090/common/crypt_sha2.c create mode 100644 drivers/staging/rt3090/common/dfs.c create mode 100644 drivers/staging/rt3090/common/ee_efuse.c create mode 100644 drivers/staging/rt3090/common/ee_prom.c create mode 100644 drivers/staging/rt3090/common/eeprom.c create mode 100644 drivers/staging/rt3090/common/igmp_snoop.c create mode 100644 drivers/staging/rt3090/common/mlme.c create mode 100644 drivers/staging/rt3090/common/mlme_ex.c create mode 100644 drivers/staging/rt3090/common/netif_block.c create mode 100644 drivers/staging/rt3090/common/rt_channel.c create mode 100644 drivers/staging/rt3090/common/rt_rf.c create mode 100644 drivers/staging/rt3090/common/rtmp_init.c create mode 100644 drivers/staging/rt3090/common/rtmp_mcu.c create mode 100644 drivers/staging/rt3090/common/rtmp_timer.c create mode 100644 drivers/staging/rt3090/common/spectrum.c create mode 100644 drivers/staging/rt3090/config.mk copy drivers/staging/{rt2860/md4.h => rt3090/crypt_hmac.h} (54%) copy drivers/staging/{rt2860/md4.h => rt3090/crypt_md5.h} (54%) create mode 100644 drivers/staging/rt3090/crypt_sha2.h create mode 100644 drivers/staging/rt3090/dfs.h create mode 100644 drivers/staging/rt3090/eeprom.h create mode 100644 drivers/staging/rt3090/firmware.h create mode 100644 drivers/staging/rt3090/igmp_snoop.h create mode 100644 drivers/staging/rt3090/ipv6.h create mode 100644 drivers/staging/rt3090/link_list.h create mode 100644 drivers/staging/rt3090/mac_pci.h create mode 100644 drivers/staging/rt3090/mlme.h copy drivers/staging/{rt2860/md4.h => rt3090/mlme_ex.h} (56%) copy drivers/staging/{rt2860/md4.h => rt3090/mlme_ex_def.h} (67%) copy drivers/staging/{rt2860/md4.h => rt3090/netif_block.h} (72%) create mode 100644 drivers/staging/rt3090/oid.h create mode 100644 drivers/staging/rt3090/pci_main_dev.c copy drivers/staging/{rt2860/md4.h => rt3090/rt3090.h} (55%) copy drivers/staging/{rt2860/md4.h => rt3090/rt30xx.h} (79%) copy drivers/staging/{rt2860/md4.h => rt3090/rt3370.h} (65%) copy drivers/staging/{rt2860/md4.h => rt3090/rt3390.h} (55%) rename drivers/staging/{rt2870/md4.h => rt3090/rt33xx.h} (79%) create mode 100644 drivers/staging/rt3090/rt_ate.c create mode 100644 drivers/staging/rt3090/rt_ate.h create mode 100644 drivers/staging/rt3090/rt_config.h create mode 100644 drivers/staging/rt3090/rt_linux.c create mode 100644 drivers/staging/rt3090/rt_linux.h create mode 100644 drivers/staging/rt3090/rt_main_dev.c create mode 100644 drivers/staging/rt3090/rt_pci_rbus.c create mode 100644 drivers/staging/rt3090/rt_profile.c create mode 100644 drivers/staging/rt3090/rtmp.h create mode 100644 drivers/staging/rt3090/rtmp_chip.h create mode 100644 drivers/staging/rt3090/rtmp_def.h create mode 100644 drivers/staging/rt3090/rtmp_dot11.h copy drivers/staging/{rt2860/md4.h => rt3090/rtmp_iface.h} (56%) create mode 100644 drivers/staging/rt3090/rtmp_mac.h copy drivers/staging/{rt2860/md4.h => rt3090/rtmp_mcu.h} (73%) create mode 100644 drivers/staging/rt3090/rtmp_os.h create mode 100644 drivers/staging/rt3090/rtmp_pci.h create mode 100644 drivers/staging/rt3090/rtmp_phy.h create mode 100644 drivers/staging/rt3090/rtmp_timer.h create mode 100644 drivers/staging/rt3090/rtmp_type.h create mode 100644 drivers/staging/rt3090/spectrum.h create mode 100644 drivers/staging/rt3090/spectrum_def.h create mode 100644 drivers/staging/rt3090/sta/assoc.c create mode 100644 drivers/staging/rt3090/sta/auth.c create mode 100644 drivers/staging/rt3090/sta/auth_rsp.c create mode 100644 drivers/staging/rt3090/sta/connect.c create mode 100644 drivers/staging/rt3090/sta/dls.c create mode 100644 drivers/staging/rt3090/sta/rtmp_ckipmic.c create mode 100644 drivers/staging/rt3090/sta/rtmp_data.c create mode 100644 drivers/staging/rt3090/sta/sanity.c create mode 100644 drivers/staging/rt3090/sta/sync.c create mode 100644 drivers/staging/rt3090/sta/wpa.c create mode 100644 drivers/staging/rt3090/sta_ioctl.c rename drivers/staging/{rt2860/md4.h => rt3090/vr_ikans.h} (59%) create mode 100644 drivers/staging/rt3090/wpa.h create mode 100644 drivers/staging/rtl8187se/TODO delete mode 100644 drivers/staging/rtl8187se/dot11d.h delete mode 100644 drivers/staging/rtl8187se/ieee80211.h delete mode 100644 drivers/staging/rtl8187se/ieee80211/internal.h delete mode 100644 drivers/staging/rtl8187se/ieee80211/rtl_crypto.h delete mode 100644 drivers/staging/rtl8187se/ieee80211_crypt.h delete mode 100644 drivers/staging/rtl8187se/r8180_gct.c delete mode 100644 drivers/staging/rtl8187se/r8180_gct.h delete mode 100644 drivers/staging/rtl8187se/r8180_max2820.c delete mode 100644 drivers/staging/rtl8187se/r8180_max2820.h delete mode 100644 drivers/staging/rtl8187se/r8180_pm.c delete mode 100644 drivers/staging/rtl8187se/r8180_pm.h delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.c delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.c delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.h delete mode 100644 drivers/staging/rtl8187se/r8180_sa2400.c delete mode 100644 drivers/staging/rtl8187se/r8180_sa2400.h create mode 100644 drivers/staging/rtl8192su/TODO delete mode 100644 drivers/staging/rtl8192su/dot11d.h delete mode 100644 drivers/staging/rtl8192su/ieee80211.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/EndianFree.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/aes.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/api.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/arc4.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/autoload.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/cipher.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/compress.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/crypto_compat.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/digest.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/internal.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/kmap_types.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/michael_mic.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/proc.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl_crypto.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h delete mode 100644 drivers/staging/rtl8192su/ieee80211_crypt.h delete mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c delete mode 100644 drivers/staging/rtl8192su/r8192U_hw.h delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware.c delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware.h delete mode 100644 drivers/staging/rtl8192su/r819xU_phy.c delete mode 100644 drivers/staging/rtl8192su/r819xU_phy.h delete mode 100644 drivers/staging/rtl8192su/r819xU_phyreg.h delete mode 100644 drivers/staging/vt6655/Makefile.arm delete mode 100644 drivers/staging/vt6655/Makefile.x86 create mode 100644 drivers/staging/vt6656/80211hdr.h create mode 100644 drivers/staging/vt6656/80211mgr.c create mode 100644 drivers/staging/vt6656/80211mgr.h create mode 100644 drivers/staging/vt6656/Kconfig create mode 100644 drivers/staging/vt6656/Makefile create mode 100644 drivers/staging/vt6656/aes_ccmp.c create mode 100644 drivers/staging/vt6656/aes_ccmp.h create mode 100644 drivers/staging/vt6656/baseband.c create mode 100644 drivers/staging/vt6656/baseband.h create mode 100644 drivers/staging/vt6656/bssdb.c create mode 100644 drivers/staging/vt6656/bssdb.h create mode 100644 drivers/staging/vt6656/card.c create mode 100644 drivers/staging/vt6656/card.h create mode 100644 drivers/staging/vt6656/channel.c create mode 100644 drivers/staging/vt6656/channel.h create mode 100644 drivers/staging/vt6656/control.c create mode 100644 drivers/staging/vt6656/control.h create mode 100644 drivers/staging/vt6656/country.h create mode 100644 drivers/staging/vt6656/datarate.c create mode 100644 drivers/staging/vt6656/datarate.h create mode 100644 drivers/staging/vt6656/desc.h create mode 100644 drivers/staging/vt6656/device.h create mode 100644 drivers/staging/vt6656/device_cfg.h create mode 100644 drivers/staging/vt6656/dpc.c create mode 100644 drivers/staging/vt6656/dpc.h create mode 100644 drivers/staging/vt6656/firmware.c create mode 100644 drivers/staging/vt6656/firmware.h create mode 100644 drivers/staging/vt6656/hostap.c create mode 100644 drivers/staging/vt6656/hostap.h create mode 100644 drivers/staging/vt6656/int.c create mode 100644 drivers/staging/vt6656/int.h create mode 100644 drivers/staging/vt6656/iocmd.h create mode 100644 drivers/staging/vt6656/ioctl.c create mode 100644 drivers/staging/vt6656/ioctl.h create mode 100644 drivers/staging/vt6656/iowpa.h create mode 100644 drivers/staging/vt6656/iwctl.c create mode 100644 drivers/staging/vt6656/iwctl.h create mode 100644 drivers/staging/vt6656/kcompat.h create mode 100644 drivers/staging/vt6656/key.c create mode 100644 drivers/staging/vt6656/key.h create mode 100644 drivers/staging/vt6656/mac.c create mode 100644 drivers/staging/vt6656/mac.h create mode 100644 drivers/staging/vt6656/main_usb.c create mode 100644 drivers/staging/vt6656/mib.c create mode 100644 drivers/staging/vt6656/mib.h create mode 100644 drivers/staging/vt6656/michael.c create mode 100644 drivers/staging/vt6656/michael.h create mode 100644 drivers/staging/vt6656/power.c create mode 100644 drivers/staging/vt6656/power.h create mode 100644 drivers/staging/vt6656/rc4.c create mode 100644 drivers/staging/vt6656/rc4.h create mode 100644 drivers/staging/vt6656/rf.c create mode 100644 drivers/staging/vt6656/rf.h create mode 100644 drivers/staging/vt6656/rndis.h create mode 100644 drivers/staging/vt6656/rxtx.c create mode 100644 drivers/staging/vt6656/rxtx.h create mode 100644 drivers/staging/vt6656/srom.h create mode 100644 drivers/staging/vt6656/tbit.h create mode 100644 drivers/staging/vt6656/tcrc.c create mode 100644 drivers/staging/vt6656/tcrc.h create mode 100644 drivers/staging/vt6656/tether.c create mode 100644 drivers/staging/vt6656/tether.h create mode 100644 drivers/staging/vt6656/tkip.c create mode 100644 drivers/staging/vt6656/tkip.h create mode 100644 drivers/staging/vt6656/tmacro.h create mode 100644 drivers/staging/vt6656/tpci.h create mode 100644 drivers/staging/vt6656/ttype.h create mode 100644 drivers/staging/vt6656/umem.h create mode 100644 drivers/staging/vt6656/upc.h create mode 100644 drivers/staging/vt6656/usbpipe.c create mode 100644 drivers/staging/vt6656/usbpipe.h create mode 100644 drivers/staging/vt6656/vntconfiguration.dat create mode 100644 drivers/staging/vt6656/wcmd.c create mode 100644 drivers/staging/vt6656/wcmd.h create mode 100644 drivers/staging/vt6656/wctl.c create mode 100644 drivers/staging/vt6656/wctl.h create mode 100644 drivers/staging/vt6656/wmgr.c create mode 100644 drivers/staging/vt6656/wmgr.h create mode 100644 drivers/staging/vt6656/wpa.c create mode 100644 drivers/staging/vt6656/wpa.h create mode 100644 drivers/staging/vt6656/wpa2.c create mode 100644 drivers/staging/vt6656/wpa2.h create mode 100644 drivers/staging/vt6656/wpactl.c create mode 100644 drivers/staging/vt6656/wpactl.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.