| $ git checkout master |
| Already on 'master' |
| $ git reset --hard stable |
| HEAD is now at 9c93768 Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip |
| Merging origin/master |
| $ git merge origin/master |
| Updating 9c93768..f415c41 |
| Fast forward |
| arch/sparc/configs/sparc32_defconfig | 74 ++++++++++++++++++++-------------- |
| arch/sparc/configs/sparc64_defconfig | 59 +++++++++++++++----------- |
| arch/sparc/include/asm/pgtable_64.h | 12 ++++- |
| arch/sparc/kernel/ktlb.S | 42 +++++++++++++++++-- |
| arch/sparc/kernel/sun4d_smp.c | 22 ---------- |
| arch/sparc/kernel/sun4m_smp.c | 26 ------------ |
| arch/sparc/kernel/sys32.S | 4 +- |
| arch/sparc/kernel/systbls_64.S | 4 +- |
| arch/sparc/mm/fault_32.c | 7 ++- |
| arch/sparc/mm/fault_64.c | 7 ++- |
| arch/sparc/mm/init_64.c | 43 +++++++++++--------- |
| arch/sparc/mm/init_64.h | 7 ++- |
| drivers/net/irda/au1k_ir.c | 4 -- |
| drivers/net/irda/sa1100_ir.c | 4 -- |
| drivers/sbus/char/bbc_envctrl.c | 11 ++++- |
| net/sched/sch_api.c | 2 +- |
| net/sched/sch_cbq.c | 2 +- |
| 17 files changed, 177 insertions(+), 153 deletions(-) |
| Merging fixes/fixes |
| $ git merge fixes/fixes |
| Already up-to-date. |
| Merging arm-current/master |
| $ git merge arm-current/master |
| Already up-to-date. |
| Merging m68k-current/for-linus |
| $ git merge m68k-current/for-linus |
| Updating f415c41..9848484 |
| Fast forward |
| arch/m68k/amiga/config.c | 6 ++++-- |
| arch/m68k/include/asm/motorola_pgalloc.h | 10 ++++------ |
| arch/m68k/include/asm/pgtable_mm.h | 3 +-- |
| arch/m68k/include/asm/unistd.h | 4 +++- |
| arch/m68k/kernel/entry.S | 2 ++ |
| arch/m68knommu/kernel/syscalltable.S | 2 ++ |
| drivers/macintosh/via-maciisi.c | 2 +- |
| 7 files changed, 17 insertions(+), 12 deletions(-) |
| 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 |
| Already up-to-date. |
| Merging wireless-current/master |
| $ git merge wireless-current/master |
| Already up-to-date. |
| Merging kbuild-current/master |
| $ git merge kbuild-current/master |
| Already up-to-date. |
| Merging quilt/driver-core.current |
| $ git merge quilt/driver-core.current |
| Already up-to-date. |
| Merging quilt/tty.current |
| $ git merge quilt/tty.current |
| Merge made by recursive. |
| drivers/isdn/gigaset/interface.c | 19 +++++++------------ |
| drivers/serial/bfin_5xx.c | 4 ++++ |
| drivers/serial/serial_cs.c | 1 + |
| 3 files changed, 12 insertions(+), 12 deletions(-) |
| Merging quilt/usb.current |
| $ git merge quilt/usb.current |
| Merge made by recursive. |
| drivers/usb/host/xhci-dbg.c | 5 +- |
| drivers/usb/host/xhci-hcd.c | 365 +++++++++++++++++++++++++++++------- |
| drivers/usb/host/xhci-mem.c | 64 ++++++- |
| drivers/usb/host/xhci-pci.c | 13 ++ |
| drivers/usb/host/xhci-ring.c | 116 +++++++++++- |
| drivers/usb/host/xhci.h | 38 +++- |
| drivers/usb/storage/unusual_devs.h | 2 +- |
| 7 files changed, 509 insertions(+), 94 deletions(-) |
| Merging cpufreq-current/fixes |
| $ git merge cpufreq-current/fixes |
| Already up-to-date. |
| Merging input-current/for-linus |
| $ git merge input-current/for-linus |
| Merge made by recursive. |
| drivers/input/serio/i8042-x86ia64io.h | 8 ++++++++ |
| 1 files changed, 8 insertions(+), 0 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 ide-curent/master |
| $ git merge ide-curent/master |
| Merge made by recursive. |
| drivers/ide/ide-cs.c | 1 + |
| 1 files changed, 1 insertions(+), 0 deletions(-) |
| Merging dwmw2/master |
| $ git merge dwmw2/master |
| Already up-to-date. |
| Merging arm/devel |
| $ git merge arm/devel |
| Renaming arch/arm/plat-s3c24xx/pwm.c => arch/arm/plat-s3c/pwm.c |
| Auto-merging arch/arm/plat-s3c/pwm.c |
| Auto-merging MAINTAINERS |
| Auto-merging arch/arm/kernel/entry-common.S |
| Auto-merging arch/arm/kernel/signal.c |
| Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h |
| Auto-merging arch/arm/mach-ep93xx/ts72xx.c |
| Auto-merging arch/arm/mach-mx3/mx31moboard-devboard.c |
| Auto-merging arch/arm/mach-mx3/mx31moboard-marxbot.c |
| Auto-merging arch/arm/mach-mx3/mx31moboard.c |
| Auto-merging arch/arm/mach-omap2/board-4430sdp.c |
| Auto-merging arch/arm/mach-omap2/mcbsp.c |
| Auto-merging arch/arm/plat-omap/gpio.c |
| Auto-merging drivers/net/Kconfig |
| Auto-merging drivers/serial/Kconfig |
| Merge made by recursive. |
| Documentation/arm/Samsung-S3C24XX/CPUfreq.txt | 75 + |
| MAINTAINERS | 34 +- |
| arch/arm/Kconfig | 264 ++- |
| arch/arm/Kconfig.debug | 1 + |
| arch/arm/Makefile | 17 +- |
| arch/arm/boot/Makefile | 9 +- |
| arch/arm/boot/compressed/head.S | 184 +- |
| arch/arm/common/vic.c | 99 +- |
| arch/arm/configs/bcmring_defconfig | 725 ++++++ |
| arch/arm/configs/cpu9260_defconfig | 1338 +++++++++++ |
| arch/arm/configs/cpu9g20_defconfig | 1328 +++++++++++ |
| arch/arm/configs/cpuat91_defconfig | 1316 +++++++++++ |
| arch/arm/configs/nhk8815_defconfig | 1316 +++++++++++ |
| arch/arm/configs/s5pc100_defconfig | 892 ++++++++ |
| arch/arm/include/asm/assembler.h | 133 ++- |
| arch/arm/include/asm/elf.h | 3 + |
| arch/arm/include/asm/ftrace.h | 35 + |
| arch/arm/include/asm/futex.h | 1 + |
| arch/arm/include/asm/mach/mmc.h | 2 + |
| arch/arm/include/asm/memory.h | 6 + |
| arch/arm/include/asm/mmu_context.h | 2 + |
| arch/arm/include/asm/page-nommu.h | 3 - |
| arch/arm/include/asm/pgalloc.h | 16 +- |
| arch/arm/include/asm/pgtable.h | 37 +- |
| arch/arm/include/asm/ptrace.h | 8 + |
| arch/arm/include/asm/thread_info.h | 2 + |
| arch/arm/include/asm/uaccess.h | 7 +- |
| arch/arm/include/asm/unified.h | 126 ++ |
| arch/arm/include/asm/unistd.h | 7 +- |
| arch/arm/kernel/Makefile | 4 +- |
| arch/arm/kernel/armksyms.c | 1 + |
| arch/arm/kernel/calls.S | 10 +- |
| arch/arm/kernel/crunch.c | 13 +- |
| arch/arm/kernel/entry-armv.S | 179 +- |
| arch/arm/kernel/entry-common.S | 57 +- |
| arch/arm/kernel/entry-header.S | 92 +- |
| arch/arm/kernel/head-common.S | 15 +- |
| arch/arm/kernel/head-nommu.S | 16 +- |
| arch/arm/kernel/head.S | 28 +- |
| arch/arm/kernel/irq.c | 2 +- |
| arch/arm/kernel/module.c | 53 + |
| arch/arm/kernel/process.c | 2 +- |
| arch/arm/kernel/ptrace.c | 8 +- |
| arch/arm/kernel/return_address.c | 71 + |
| arch/arm/kernel/setup.c | 28 +- |
| arch/arm/kernel/signal.c | 86 +- |
| arch/arm/kernel/stacktrace.c | 4 +- |
| 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/bitops.h | 2 +- |
| 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-at91/Kconfig | 70 +- |
| arch/arm/mach-at91/Makefile | 9 + |
| arch/arm/mach-at91/Makefile.boot | 4 + |
| arch/arm/mach-at91/at91sam9260_devices.c | 116 + |
| 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-afeb-9260v1.c | 12 + |
| arch/arm/mach-at91/board-cpu9krea.c | 385 ++++ |
| arch/arm/mach-at91/board-cpuat91.c | 185 ++ |
| 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 | 155 ++ |
| .../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-bcmring/Kconfig | 21 + |
| arch/arm/mach-bcmring/Makefile | 8 + |
| arch/arm/mach-bcmring/Makefile.boot | 6 + |
| arch/arm/mach-bcmring/arch.c | 157 ++ |
| arch/arm/mach-bcmring/clock.c | 224 ++ |
| arch/arm/mach-bcmring/clock.h | 33 + |
| arch/arm/mach-bcmring/core.c | 367 +++ |
| arch/arm/mach-bcmring/core.h | 30 + |
| arch/arm/mach-bcmring/csp/Makefile | 3 + |
| arch/arm/mach-bcmring/csp/chipc/Makefile | 1 + |
| arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 776 +++++++ |
| arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 293 +++ |
| arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 124 ++ |
| arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c | 64 + |
| arch/arm/mach-bcmring/csp/dmac/Makefile | 1 + |
| arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 917 ++++++++ |
| arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 1017 +++++++++ |
| arch/arm/mach-bcmring/csp/tmr/Makefile | 1 + |
| arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 576 +++++ |
| arch/arm/mach-bcmring/dma.c | 2321 ++++++++++++++++++++ |
| arch/arm/mach-bcmring/dma_device.c | 593 +++++ |
| arch/arm/mach-bcmring/include/cfg_global.h | 13 + |
| arch/arm/mach-bcmring/include/cfg_global_defines.h | 40 + |
| arch/arm/mach-bcmring/include/csp/cache.h | 35 + |
| arch/arm/mach-bcmring/include/csp/delay.h | 36 + |
| arch/arm/mach-bcmring/include/csp/dmacHw.h | 596 +++++ |
| arch/arm/mach-bcmring/include/csp/errno.h | 32 + |
| arch/arm/mach-bcmring/include/csp/intcHw.h | 40 + |
| arch/arm/mach-bcmring/include/csp/module.h | 32 + |
| arch/arm/mach-bcmring/include/csp/reg.h | 114 + |
| arch/arm/mach-bcmring/include/csp/secHw.h | 65 + |
| arch/arm/mach-bcmring/include/csp/stdint.h | 30 + |
| arch/arm/mach-bcmring/include/csp/string.h | 34 + |
| arch/arm/mach-bcmring/include/csp/tmrHw.h | 263 +++ |
| arch/arm/mach-bcmring/include/mach/clkdev.h | 7 + |
| arch/arm/mach-bcmring/include/mach/csp/cap.h | 63 + |
| .../arm/mach-bcmring/include/mach/csp/cap_inline.h | 409 ++++ |
| .../mach-bcmring/include/mach/csp/chipcHw_def.h | 1123 ++++++++++ |
| .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 1673 ++++++++++++++ |
| .../mach-bcmring/include/mach/csp/chipcHw_reg.h | 530 +++++ |
| arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h | 872 ++++++++ |
| .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 145 ++ |
| .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 406 ++++ |
| arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 73 + |
| .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h | 246 +++ |
| arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | 101 + |
| arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 147 ++ |
| arch/arm/mach-bcmring/include/mach/csp/secHw_def.h | 100 + |
| .../mach-bcmring/include/mach/csp/secHw_inline.h | 79 + |
| arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h | 82 + |
| arch/arm/mach-bcmring/include/mach/dma.h | 826 +++++++ |
| arch/arm/mach-bcmring/include/mach/entry-macro.S | 86 + |
| arch/arm/mach-bcmring/include/mach/hardware.h | 60 + |
| arch/arm/mach-bcmring/include/mach/io.h | 56 + |
| arch/arm/mach-bcmring/include/mach/irqs.h | 132 ++ |
| arch/arm/mach-bcmring/include/mach/memory.h | 33 + |
| .../mach-bcmring/include/mach/memory_settings.h | 67 + |
| arch/arm/mach-bcmring/include/mach/system.h | 54 + |
| arch/arm/mach-bcmring/include/mach/timer.h | 77 + |
| arch/arm/mach-bcmring/include/mach/timex.h | 25 + |
| arch/arm/mach-bcmring/include/mach/uncompress.h | 43 + |
| arch/arm/mach-bcmring/include/mach/vmalloc.h | 25 + |
| arch/arm/mach-bcmring/irq.c | 127 ++ |
| arch/arm/mach-bcmring/mm.c | 56 + |
| arch/arm/mach-bcmring/timer.c | 62 + |
| arch/arm/mach-ep93xx/adssphere.c | 11 +- |
| arch/arm/mach-ep93xx/clock.c | 131 +- |
| arch/arm/mach-ep93xx/core.c | 202 ++- |
| arch/arm/mach-ep93xx/edb93xx.c | 10 +- |
| arch/arm/mach-ep93xx/gesbc9312.c | 11 +- |
| arch/arm/mach-ep93xx/gpio.c | 65 +- |
| arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 103 +- |
| 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 | 20 + |
| 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/include/mach/hardware.h | 4 + |
| arch/arm/mach-integrator/integrator_cp.c | 18 +- |
| arch/arm/mach-kirkwood/Kconfig | 6 + |
| arch/arm/mach-kirkwood/Makefile | 1 + |
| arch/arm/mach-kirkwood/common.c | 5 +- |
| arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 + |
| arch/arm/mach-kirkwood/openrd_base-setup.c | 84 + |
| arch/arm/mach-mx1/clock.c | 86 +- |
| arch/arm/mach-mx1/devices.c | 87 +- |
| arch/arm/mach-mx1/generic.c | 7 + |
| arch/arm/mach-mx1/mx1ads.c | 10 +- |
| arch/arm/mach-mx1/scb9328.c | 16 +- |
| arch/arm/mach-mx2/Kconfig | 35 + |
| arch/arm/mach-mx2/Makefile | 3 + |
| arch/arm/mach-mx2/clock_imx21.c | 2 +- |
| arch/arm/mach-mx2/clock_imx27.c | 11 +- |
| arch/arm/mach-mx2/devices.c | 332 ++- |
| arch/arm/mach-mx2/devices.h | 9 +- |
| arch/arm/mach-mx2/eukrea_cpuimx27.c | 234 ++ |
| arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 249 +++ |
| arch/arm/mach-mx2/generic.c | 12 + |
| arch/arm/mach-mx2/mx21ads.c | 44 +- |
| arch/arm/mach-mx2/mx27ads.c | 38 +- |
| arch/arm/mach-mx2/mx27lite.c | 2 +- |
| arch/arm/mach-mx2/mx27pdk.c | 2 +- |
| arch/arm/mach-mx2/pca100.c | 244 ++ |
| arch/arm/mach-mx2/pcm038.c | 17 +- |
| arch/arm/mach-mx2/pcm970-baseboard.c | 112 +- |
| arch/arm/mach-mx25/Kconfig | 9 + |
| arch/arm/mach-mx25/Makefile | 3 + |
| arch/arm/mach-mx25/Makefile.boot | 3 + |
| arch/arm/mach-mx25/clock.c | 219 ++ |
| arch/arm/mach-mx25/devices.c | 402 ++++ |
| arch/arm/mach-mx25/devices.h | 19 + |
| arch/arm/mach-mx25/mm.c | 76 + |
| arch/arm/mach-mx25/mx25pdk.c | 58 + |
| arch/arm/mach-mx3/armadillo5x0.c | 2 +- |
| arch/arm/mach-mx3/clock-imx35.c | 22 +- |
| arch/arm/mach-mx3/clock.c | 22 +- |
| arch/arm/mach-mx3/devices.c | 163 ++- |
| arch/arm/mach-mx3/devices.h | 6 + |
| arch/arm/mach-mx3/mm.c | 14 + |
| arch/arm/mach-mx3/mx31ads.c | 2 +- |
| arch/arm/mach-mx3/mx31lilly.c | 2 +- |
| arch/arm/mach-mx3/mx31lite.c | 7 +- |
| arch/arm/mach-mx3/mx31moboard-devboard.c | 43 - |
| arch/arm/mach-mx3/mx31moboard-marxbot.c | 55 +- |
| arch/arm/mach-mx3/mx31moboard.c | 134 ++- |
| arch/arm/mach-mx3/mx31pdk.c | 2 +- |
| arch/arm/mach-mx3/mx35pdk.c | 2 +- |
| arch/arm/mach-mx3/pcm037.c | 42 +- |
| arch/arm/mach-mx3/pcm043.c | 8 +- |
| arch/arm/mach-mx3/qong.c | 7 +- |
| arch/arm/mach-mxc91231/Kconfig | 11 + |
| arch/arm/mach-mxc91231/Makefile | 2 + |
| arch/arm/mach-mxc91231/Makefile.boot | 3 + |
| arch/arm/mach-mxc91231/clock.c | 642 ++++++ |
| arch/arm/mach-mxc91231/crm_regs.h | 399 ++++ |
| arch/arm/mach-mxc91231/devices.c | 251 +++ |
| arch/arm/mach-mxc91231/devices.h | 13 + |
| arch/arm/mach-mxc91231/iomux.c | 177 ++ |
| arch/arm/mach-mxc91231/magx-zn5.c | 63 + |
| arch/arm/mach-mxc91231/mm.c | 94 + |
| arch/arm/mach-mxc91231/system.c | 51 + |
| arch/arm/mach-netx/include/mach/entry-macro.S | 4 +- |
| 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-omap2/board-4430sdp.c | 2 +- |
| arch/arm/mach-omap2/mcbsp.c | 41 + |
| arch/arm/mach-omap2/serial.c | 10 + |
| arch/arm/mach-orion5x/Kconfig | 14 + |
| arch/arm/mach-orion5x/Makefile | 2 + |
| arch/arm/mach-orion5x/addr-map.c | 3 +- |
| arch/arm/mach-orion5x/d2net-setup.c | 365 +++ |
| arch/arm/mach-realview/Kconfig | 2 +- |
| arch/arm/mach-realview/core.c | 7 + |
| arch/arm/mach-realview/include/mach/gpio.h | 6 + |
| arch/arm/mach-realview/include/mach/hardware.h | 4 + |
| arch/arm/mach-realview/platsmp.c | 18 +- |
| 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-s3c2410/Kconfig | 18 + |
| arch/arm/mach-s3c2410/Makefile | 2 + |
| arch/arm/mach-s3c2410/cpu-freq.c | 159 ++ |
| arch/arm/mach-s3c2410/dma.c | 11 + |
| arch/arm/mach-s3c2410/include/mach/irqs.h | 6 + |
| arch/arm/mach-s3c2410/include/mach/map.h | 8 + |
| arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 4 +- |
| arch/arm/mach-s3c2410/include/mach/regs-mem.h | 10 + |
| .../mach-s3c2410/include/mach/regs-s3c2412-mem.h | 23 +- |
| arch/arm/mach-s3c2410/include/mach/spi.h | 3 + |
| arch/arm/mach-s3c2410/irq.c | 15 +- |
| arch/arm/mach-s3c2410/mach-bast.c | 41 + |
| arch/arm/mach-s3c2410/pll.c | 95 + |
| arch/arm/mach-s3c2410/pm.c | 12 + |
| arch/arm/mach-s3c2410/s3c2410.c | 29 + |
| arch/arm/mach-s3c2412/Kconfig | 9 + |
| arch/arm/mach-s3c2412/Makefile | 1 + |
| arch/arm/mach-s3c2412/cpu-freq.c | 257 +++ |
| arch/arm/mach-s3c2412/s3c2412.c | 12 + |
| arch/arm/mach-s3c2440/Kconfig | 7 + |
| arch/arm/mach-s3c2440/mach-osiris.c | 9 + |
| arch/arm/mach-s3c24a0/include/mach/map.h | 1 + |
| arch/arm/mach-s3c6400/include/mach/map.h | 8 +- |
| arch/arm/mach-s3c6400/s3c6400.c | 2 + |
| arch/arm/mach-s3c6410/Kconfig | 10 + |
| arch/arm/mach-s3c6410/Makefile | 3 +- |
| arch/arm/mach-s3c6410/cpu.c | 2 + |
| arch/arm/mach-s3c6410/mach-hmt.c | 276 +++ |
| arch/arm/mach-s3c6410/mach-ncp.c | 2 +- |
| arch/arm/mach-s3c6410/mach-smdk6410.c | 26 +- |
| arch/arm/mach-s5pc100/Kconfig | 22 + |
| arch/arm/mach-s5pc100/Makefile | 17 + |
| arch/arm/mach-s5pc100/Makefile.boot | 2 + |
| arch/arm/mach-s5pc100/cpu.c | 97 + |
| arch/arm/mach-s5pc100/include/mach/debug-macro.S | 38 + |
| arch/arm/mach-s5pc100/include/mach/entry-macro.S | 50 + |
| arch/arm/mach-s5pc100/include/mach/gpio-core.h | 21 + |
| arch/arm/mach-s5pc100/include/mach/gpio.h | 146 ++ |
| arch/arm/mach-s5pc100/include/mach/hardware.h | 14 + |
| arch/arm/mach-s5pc100/include/mach/irqs.h | 14 + |
| arch/arm/mach-s5pc100/include/mach/map.h | 75 + |
| arch/arm/mach-s5pc100/include/mach/memory.h | 18 + |
| arch/arm/mach-s5pc100/include/mach/pwm-clock.h | 56 + |
| arch/arm/mach-s5pc100/include/mach/regs-irq.h | 24 + |
| arch/arm/mach-s5pc100/include/mach/system.h | 24 + |
| arch/arm/mach-s5pc100/include/mach/tick.h | 29 + |
| arch/arm/mach-s5pc100/include/mach/uncompress.h | 28 + |
| arch/arm/mach-s5pc100/mach-smdkc100.c | 103 + |
| 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/mach-w90x900/Makefile | 2 +- |
| arch/arm/mach-w90x900/clksel.c | 91 + |
| arch/arm/mach-w90x900/clock.c | 24 + |
| arch/arm/mach-w90x900/clock.h | 8 + |
| arch/arm/mach-w90x900/cpu.h | 1 + |
| arch/arm/mach-w90x900/include/mach/regs-clock.h | 22 + |
| arch/arm/mach-w90x900/include/mach/regs-ebi.h | 33 + |
| arch/arm/mach-w90x900/irq.c | 154 ++- |
| arch/arm/mach-w90x900/mach-w90p910evb.c | 140 ++ |
| arch/arm/mach-w90x900/mfp-w90p910.c | 58 +- |
| arch/arm/mach-w90x900/time.c | 151 ++- |
| arch/arm/mach-w90x900/w90p910.c | 90 +- |
| arch/arm/mm/Kconfig | 2 +- |
| arch/arm/mm/alignment.c | 20 +- |
| arch/arm/mm/cache-v7.S | 16 +- |
| arch/arm/mm/dma-mapping.c | 94 +- |
| arch/arm/mm/fault.c | 24 + |
| arch/arm/mm/nommu.c | 1 + |
| arch/arm/mm/proc-macros.S | 8 +- |
| arch/arm/mm/proc-v7.S | 7 +- |
| arch/arm/plat-mxc/Kconfig | 17 + |
| arch/arm/plat-mxc/clock.c | 170 +-- |
| arch/arm/plat-mxc/gpio.c | 42 +- |
| .../arm/plat-mxc/include/mach/board-armadillo5x0.h | 7 - |
| .../plat-mxc/include/mach/board-eukrea_cpuimx27.h | 40 + |
| arch/arm/plat-mxc/include/mach/board-mx21ads.h | 6 - |
| arch/arm/plat-mxc/include/mach/board-mx27ads.h | 6 - |
| arch/arm/plat-mxc/include/mach/board-mx27lite.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-mx27pdk.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-mx31ads.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-mx31lilly.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-mx31lite.h | 3 - |
| arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-mx31pdk.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-mx35pdk.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-pcm037.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-pcm038.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-pcm043.h | 5 - |
| arch/arm/plat-mxc/include/mach/board-qong.h | 5 - |
| arch/arm/plat-mxc/include/mach/common.h | 19 +- |
| arch/arm/plat-mxc/include/mach/debug-macro.S | 68 +- |
| arch/arm/plat-mxc/include/mach/entry-macro.S | 3 +- |
| arch/arm/plat-mxc/include/mach/hardware.h | 8 + |
| arch/arm/plat-mxc/include/mach/imxfb.h | 29 +- |
| arch/arm/plat-mxc/include/mach/iomux-mx25.h | 517 +++++ |
| arch/arm/plat-mxc/include/mach/iomux-mx3.h | 25 + |
| arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 287 +++ |
| arch/arm/plat-mxc/include/mach/iomux-v3.h | 35 +- |
| arch/arm/plat-mxc/include/mach/iomux.h | 6 + |
| arch/arm/plat-mxc/include/mach/irqs.h | 4 + |
| arch/arm/plat-mxc/include/mach/memory.h | 4 + |
| arch/arm/plat-mxc/include/mach/mx1.h | 22 - |
| arch/arm/plat-mxc/include/mach/mx21.h | 5 - |
| arch/arm/plat-mxc/include/mach/mx25.h | 44 + |
| arch/arm/plat-mxc/include/mach/mx27.h | 7 - |
| arch/arm/plat-mxc/include/mach/mx2x.h | 18 - |
| arch/arm/plat-mxc/include/mach/mx31.h | 2 +- |
| arch/arm/plat-mxc/include/mach/mx35.h | 1 + |
| arch/arm/plat-mxc/include/mach/mx3x.h | 21 - |
| arch/arm/plat-mxc/include/mach/mxc.h | 28 +- |
| arch/arm/plat-mxc/include/mach/mxc91231.h | 315 +++ |
| arch/arm/plat-mxc/include/mach/system.h | 10 + |
| arch/arm/plat-mxc/include/mach/timex.h | 4 + |
| arch/arm/plat-mxc/include/mach/uncompress.h | 68 +- |
| arch/arm/plat-mxc/iomux-v3.c | 15 +- |
| arch/arm/plat-mxc/irq.c | 6 +- |
| arch/arm/plat-mxc/pwm.c | 19 +- |
| arch/arm/plat-mxc/system.c | 29 +- |
| arch/arm/plat-mxc/time.c | 39 +- |
| arch/arm/plat-omap/gpio.c | 249 ++- |
| arch/arm/plat-omap/include/mach/dma.h | 88 + |
| arch/arm/plat-omap/include/mach/mcbsp.h | 8 +- |
| arch/arm/plat-omap/mcbsp.c | 2 +- |
| arch/arm/plat-s3c/Kconfig | 5 + |
| arch/arm/plat-s3c/Makefile | 6 +- |
| arch/arm/plat-s3c/dev-nand.c | 30 + |
| arch/arm/plat-s3c/include/plat/adc.h | 8 +- |
| arch/arm/plat-s3c/include/plat/cpu-freq.h | 87 +- |
| arch/arm/plat-s3c/include/plat/cpu.h | 1 + |
| arch/arm/plat-s3c/include/plat/devs.h | 3 + |
| arch/arm/plat-s3c/include/plat/hwmon.h | 41 + |
| arch/arm/plat-s3c/include/plat/map-base.h | 8 +- |
| arch/arm/{plat-s3c24xx => plat-s3c}/pwm.c | 5 +- |
| arch/arm/plat-s3c24xx/Kconfig | 66 + |
| arch/arm/plat-s3c24xx/Makefile | 12 +- |
| arch/arm/plat-s3c24xx/adc.c | 64 +- |
| arch/arm/plat-s3c24xx/cpu-freq-debugfs.c | 199 ++ |
| arch/arm/plat-s3c24xx/cpu-freq.c | 716 ++++++ |
| arch/arm/plat-s3c24xx/cpu.c | 2 +- |
| arch/arm/plat-s3c24xx/devs.c | 71 +- |
| arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 282 +++ |
| arch/arm/plat-s3c24xx/include/plat/fiq.h | 13 + |
| arch/arm/plat-s3c24xx/include/plat/s3c2410.h | 1 + |
| arch/arm/plat-s3c24xx/irq.c | 36 + |
| arch/arm/plat-s3c24xx/s3c2410-cpufreq-utils.c | 64 + |
| arch/arm/plat-s3c24xx/s3c2410-iotiming.c | 477 ++++ |
| arch/arm/plat-s3c24xx/s3c2412-iotiming.c | 285 +++ |
| arch/arm/plat-s3c24xx/s3c2440-cpufreq.c | 311 +++ |
| arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c | 97 + |
| arch/arm/plat-s3c24xx/s3c2440-pll-16934400.c | 127 ++ |
| arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 38 + |
| arch/arm/plat-s3c64xx/Kconfig | 1 + |
| arch/arm/plat-s3c64xx/Makefile | 3 +- |
| arch/arm/{plat-s3c => plat-s3c64xx}/dev-audio.c | 0 |
| arch/arm/plat-s5pc1xx/Kconfig | 50 + |
| arch/arm/plat-s5pc1xx/Makefile | 26 + |
| arch/arm/plat-s5pc1xx/cpu.c | 112 + |
| arch/arm/plat-s5pc1xx/dev-uart.c | 174 ++ |
| arch/arm/plat-s5pc1xx/include/plat/irqs.h | 182 ++ |
| arch/arm/plat-s5pc1xx/include/plat/pll.h | 38 + |
| arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 421 ++++ |
| arch/arm/plat-s5pc1xx/include/plat/s5pc100.h | 65 + |
| arch/arm/plat-s5pc1xx/irq.c | 259 +++ |
| arch/arm/plat-s5pc1xx/s5pc100-clock.c | 1139 ++++++++++ |
| arch/arm/plat-s5pc1xx/s5pc100-init.c | 27 + |
| arch/arm/plat-s5pc1xx/setup-i2c0.c | 25 + |
| arch/arm/plat-s5pc1xx/setup-i2c1.c | 25 + |
| arch/arm/tools/mach-types | 73 +- |
| arch/arm/vfp/entry.S | 2 + |
| arch/arm/vfp/vfphw.S | 48 +- |
| drivers/amba/bus.c | 26 +- |
| drivers/hwmon/Kconfig | 17 + |
| drivers/hwmon/Makefile | 1 + |
| drivers/hwmon/s3c-hwmon.c | 405 ++++ |
| drivers/misc/Kconfig | 13 + |
| drivers/misc/Makefile | 1 + |
| drivers/misc/ep93xx_pwm.c | 384 ++++ |
| drivers/mmc/host/mmci.c | 71 +- |
| drivers/mmc/host/mmci.h | 2 + |
| drivers/mtd/nand/ts7250.c | 5 +- |
| drivers/net/Kconfig | 2 +- |
| drivers/serial/Kconfig | 9 +- |
| drivers/serial/Makefile | 1 + |
| drivers/serial/amba-pl011.c | 26 + |
| drivers/serial/imx.c | 65 +- |
| drivers/spi/amba-pl022.c | 2 - |
| drivers/video/Kconfig | 4 +- |
| drivers/video/atmel_lcdfb.c | 6 +- |
| drivers/video/backlight/Kconfig | 2 +- |
| drivers/video/imxfb.c | 184 ++- |
| include/linux/amba/pl093.h | 80 + |
| sound/soc/atmel/sam9g20_wm8731.c | 36 - |
| sound/soc/s3c24xx/s3c24xx-ac97.h | 6 - |
| 474 files changed, 46508 insertions(+), 2069 deletions(-) |
| create mode 100644 Documentation/arm/Samsung-S3C24XX/CPUfreq.txt |
| create mode 100644 arch/arm/configs/bcmring_defconfig |
| create mode 100644 arch/arm/configs/cpu9260_defconfig |
| create mode 100644 arch/arm/configs/cpu9g20_defconfig |
| create mode 100644 arch/arm/configs/cpuat91_defconfig |
| create mode 100644 arch/arm/configs/nhk8815_defconfig |
| create mode 100644 arch/arm/configs/s5pc100_defconfig |
| create mode 100644 arch/arm/include/asm/unified.h |
| create mode 100644 arch/arm/kernel/return_address.c |
| 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-cpu9krea.c |
| create mode 100644 arch/arm/mach-at91/board-cpuat91.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-bcmring/Kconfig |
| create mode 100644 arch/arm/mach-bcmring/Makefile |
| create mode 100644 arch/arm/mach-bcmring/Makefile.boot |
| create mode 100644 arch/arm/mach-bcmring/arch.c |
| create mode 100644 arch/arm/mach-bcmring/clock.c |
| create mode 100644 arch/arm/mach-bcmring/clock.h |
| create mode 100644 arch/arm/mach-bcmring/core.c |
| create mode 100644 arch/arm/mach-bcmring/core.h |
| create mode 100644 arch/arm/mach-bcmring/csp/Makefile |
| create mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile |
| create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c |
| create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c |
| create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c |
| create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c |
| create mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile |
| create mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c |
| create mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c |
| create mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile |
| create mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c |
| create mode 100644 arch/arm/mach-bcmring/dma.c |
| create mode 100644 arch/arm/mach-bcmring/dma_device.c |
| create mode 100644 arch/arm/mach-bcmring/include/cfg_global.h |
| create mode 100644 arch/arm/mach-bcmring/include/cfg_global_defines.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/cache.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/delay.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/dmacHw.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/errno.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/module.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/reg.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/string.h |
| create mode 100644 arch/arm/mach-bcmring/include/csp/tmrHw.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/clkdev.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/dma.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S |
| create mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/io.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/memory.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/system.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/timer.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/timex.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h |
| create mode 100644 arch/arm/mach-bcmring/include/mach/vmalloc.h |
| create mode 100644 arch/arm/mach-bcmring/irq.c |
| create mode 100644 arch/arm/mach-bcmring/mm.c |
| create mode 100644 arch/arm/mach-bcmring/timer.c |
| create mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c |
| create mode 100644 arch/arm/mach-mx2/eukrea_cpuimx27.c |
| create mode 100644 arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c |
| create mode 100644 arch/arm/mach-mx2/pca100.c |
| create mode 100644 arch/arm/mach-mx25/Kconfig |
| create mode 100644 arch/arm/mach-mx25/Makefile |
| create mode 100644 arch/arm/mach-mx25/Makefile.boot |
| create mode 100644 arch/arm/mach-mx25/clock.c |
| create mode 100644 arch/arm/mach-mx25/devices.c |
| create mode 100644 arch/arm/mach-mx25/devices.h |
| create mode 100644 arch/arm/mach-mx25/mm.c |
| create mode 100644 arch/arm/mach-mx25/mx25pdk.c |
| create mode 100644 arch/arm/mach-mxc91231/Kconfig |
| create mode 100644 arch/arm/mach-mxc91231/Makefile |
| create mode 100644 arch/arm/mach-mxc91231/Makefile.boot |
| create mode 100644 arch/arm/mach-mxc91231/clock.c |
| create mode 100644 arch/arm/mach-mxc91231/crm_regs.h |
| create mode 100644 arch/arm/mach-mxc91231/devices.c |
| create mode 100644 arch/arm/mach-mxc91231/devices.h |
| create mode 100644 arch/arm/mach-mxc91231/iomux.c |
| create mode 100644 arch/arm/mach-mxc91231/magx-zn5.c |
| create mode 100644 arch/arm/mach-mxc91231/mm.c |
| create mode 100644 arch/arm/mach-mxc91231/system.c |
| 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-orion5x/d2net-setup.c |
| create mode 100644 arch/arm/mach-realview/include/mach/gpio.h |
| create mode 100644 arch/arm/mach-s3c2410/cpu-freq.c |
| create mode 100644 arch/arm/mach-s3c2410/pll.c |
| create mode 100644 arch/arm/mach-s3c2412/cpu-freq.c |
| create mode 100644 arch/arm/mach-s3c6410/mach-hmt.c |
| create mode 100644 arch/arm/mach-s5pc100/Kconfig |
| create mode 100644 arch/arm/mach-s5pc100/Makefile |
| create mode 100644 arch/arm/mach-s5pc100/Makefile.boot |
| create mode 100644 arch/arm/mach-s5pc100/cpu.c |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/debug-macro.S |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/entry-macro.S |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/gpio-core.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/gpio.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/hardware.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/irqs.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/map.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/memory.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/pwm-clock.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/regs-irq.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/system.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h |
| create mode 100644 arch/arm/mach-s5pc100/include/mach/uncompress.h |
| create mode 100644 arch/arm/mach-s5pc100/mach-smdkc100.c |
| create mode 100644 arch/arm/mach-versatile/include/mach/gpio.h |
| create mode 100644 arch/arm/mach-w90x900/clksel.c |
| create mode 100644 arch/arm/mach-w90x900/include/mach/regs-ebi.h |
| create mode 100644 arch/arm/plat-mxc/include/mach/board-eukrea_cpuimx27.h |
| create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx25.h |
| create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h |
| create mode 100644 arch/arm/plat-mxc/include/mach/mx25.h |
| create mode 100644 arch/arm/plat-mxc/include/mach/mxc91231.h |
| create mode 100644 arch/arm/plat-s3c/dev-nand.c |
| create mode 100644 arch/arm/plat-s3c/include/plat/hwmon.h |
| rename arch/arm/{plat-s3c24xx => plat-s3c}/pwm.c (99%) |
| create mode 100644 arch/arm/plat-s3c24xx/cpu-freq-debugfs.c |
| create mode 100644 arch/arm/plat-s3c24xx/cpu-freq.c |
| create mode 100644 arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h |
| create mode 100644 arch/arm/plat-s3c24xx/include/plat/fiq.h |
| create mode 100644 arch/arm/plat-s3c24xx/s3c2410-cpufreq-utils.c |
| create mode 100644 arch/arm/plat-s3c24xx/s3c2410-iotiming.c |
| create mode 100644 arch/arm/plat-s3c24xx/s3c2412-iotiming.c |
| create mode 100644 arch/arm/plat-s3c24xx/s3c2440-cpufreq.c |
| create mode 100644 arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c |
| create mode 100644 arch/arm/plat-s3c24xx/s3c2440-pll-16934400.c |
| create mode 100644 arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c |
| rename arch/arm/{plat-s3c => plat-s3c64xx}/dev-audio.c (100%) |
| create mode 100644 arch/arm/plat-s5pc1xx/Kconfig |
| create mode 100644 arch/arm/plat-s5pc1xx/Makefile |
| create mode 100644 arch/arm/plat-s5pc1xx/cpu.c |
| create mode 100644 arch/arm/plat-s5pc1xx/dev-uart.c |
| create mode 100644 arch/arm/plat-s5pc1xx/include/plat/irqs.h |
| create mode 100644 arch/arm/plat-s5pc1xx/include/plat/pll.h |
| create mode 100644 arch/arm/plat-s5pc1xx/include/plat/regs-clock.h |
| create mode 100644 arch/arm/plat-s5pc1xx/include/plat/s5pc100.h |
| create mode 100644 arch/arm/plat-s5pc1xx/irq.c |
| create mode 100644 arch/arm/plat-s5pc1xx/s5pc100-clock.c |
| create mode 100644 arch/arm/plat-s5pc1xx/s5pc100-init.c |
| create mode 100644 arch/arm/plat-s5pc1xx/setup-i2c0.c |
| create mode 100644 arch/arm/plat-s5pc1xx/setup-i2c1.c |
| create mode 100644 drivers/hwmon/s3c-hwmon.c |
| create mode 100644 drivers/misc/ep93xx_pwm.c |
| create mode 100644 include/linux/amba/pl093.h |
| Merging davinci/for-next |
| $ git merge davinci/for-next |
| Auto-merging MAINTAINERS |
| Auto-merging arch/arm/mach-davinci/board-dm355-evm.c |
| Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c |
| Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c |
| Merge made by recursive. |
| MAINTAINERS | 6 + |
| arch/arm/configs/da830_omapl137_defconfig | 1254 ++++++++++++++++++++++ |
| arch/arm/configs/da850_omapl138_defconfig | 1229 +++++++++++++++++++++ |
| arch/arm/configs/davinci_all_defconfig | 173 ++-- |
| arch/arm/mach-davinci/Kconfig | 49 +- |
| arch/arm/mach-davinci/Makefile | 14 +- |
| arch/arm/mach-davinci/Makefile.boot | 10 + |
| arch/arm/mach-davinci/board-da830-evm.c | 127 +++ |
| arch/arm/mach-davinci/board-da850-evm.c | 120 ++ |
| arch/arm/mach-davinci/board-dm355-evm.c | 5 + |
| arch/arm/mach-davinci/board-dm365-evm.c | 492 +++++++++ |
| arch/arm/mach-davinci/board-dm644x-evm.c | 3 + |
| arch/arm/mach-davinci/board-dm646x-evm.c | 90 ++ |
| arch/arm/mach-davinci/clock.c | 5 +- |
| arch/arm/mach-davinci/da830.c | 1204 +++++++++++++++++++++ |
| arch/arm/mach-davinci/da850.c | 631 +++++++++++ |
| arch/arm/mach-davinci/devices-da8xx.c | 287 +++++ |
| arch/arm/mach-davinci/devices.c | 60 +- |
| arch/arm/mach-davinci/dm355.c | 85 ++- |
| arch/arm/mach-davinci/dm365.c | 909 ++++++++++++++++ |
| arch/arm/mach-davinci/dm644x.c | 85 ++- |
| arch/arm/mach-davinci/dm646x.c | 217 ++++- |
| arch/arm/mach-davinci/dma.c | 811 +++++++++----- |
| arch/arm/mach-davinci/gpio.c | 105 ++- |
| arch/arm/mach-davinci/include/mach/asp.h | 34 +- |
| arch/arm/mach-davinci/include/mach/common.h | 2 +- |
| arch/arm/mach-davinci/include/mach/cputype.h | 24 + |
| arch/arm/mach-davinci/include/mach/da8xx.h | 106 ++ |
| arch/arm/mach-davinci/include/mach/debug-macro.S | 8 + |
| arch/arm/mach-davinci/include/mach/dm355.h | 5 + |
| arch/arm/mach-davinci/include/mach/dm365.h | 29 + |
| arch/arm/mach-davinci/include/mach/dm644x.h | 2 + |
| arch/arm/mach-davinci/include/mach/dm646x.h | 6 + |
| arch/arm/mach-davinci/include/mach/edma.h | 57 +- |
| arch/arm/mach-davinci/include/mach/gpio.h | 8 +- |
| arch/arm/mach-davinci/include/mach/hardware.h | 17 + |
| arch/arm/mach-davinci/include/mach/io.h | 23 +- |
| arch/arm/mach-davinci/include/mach/irqs.h | 202 ++++- |
| arch/arm/mach-davinci/include/mach/memory.h | 9 +- |
| arch/arm/mach-davinci/include/mach/mux.h | 593 ++++++++++ |
| arch/arm/mach-davinci/include/mach/psc.h | 62 ++ |
| arch/arm/mach-davinci/include/mach/serial.h | 6 +- |
| arch/arm/mach-davinci/include/mach/system.h | 4 +- |
| arch/arm/mach-davinci/include/mach/uncompress.h | 7 +- |
| arch/arm/mach-davinci/include/mach/vmalloc.h | 2 +- |
| arch/arm/mach-davinci/mux.c | 14 + |
| arch/arm/mach-davinci/sram.c | 2 +- |
| arch/arm/mach-davinci/time.c | 16 +- |
| arch/arm/mach-davinci/usb.c | 13 + |
| sound/soc/davinci/davinci-pcm.c | 6 +- |
| 50 files changed, 8724 insertions(+), 504 deletions(-) |
| create mode 100644 arch/arm/configs/da830_omapl137_defconfig |
| create mode 100644 arch/arm/configs/da850_omapl138_defconfig |
| create mode 100644 arch/arm/mach-davinci/board-da830-evm.c |
| create mode 100644 arch/arm/mach-davinci/board-da850-evm.c |
| create mode 100644 arch/arm/mach-davinci/board-dm365-evm.c |
| create mode 100644 arch/arm/mach-davinci/da830.c |
| create mode 100644 arch/arm/mach-davinci/da850.c |
| create mode 100644 arch/arm/mach-davinci/devices-da8xx.c |
| create mode 100644 arch/arm/mach-davinci/dm365.c |
| create mode 100644 arch/arm/mach-davinci/include/mach/da8xx.h |
| create mode 100644 arch/arm/mach-davinci/include/mach/dm365.h |
| Merging pxa/for-next |
| $ git merge pxa/for-next |
| Resolved 'MAINTAINERS' using previous resolution. |
| Auto-merging MAINTAINERS |
| CONFLICT (content): Merge conflict in MAINTAINERS |
| Removing arch/arm/configs/littleton_defconfig |
| Removing arch/arm/configs/zylonite_defconfig |
| Auto-merging drivers/video/pxafb.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 044609e] Merge commit 'pxa/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| MAINTAINERS | 2 +- |
| arch/arm/configs/littleton_defconfig | 783 --------------- |
| arch/arm/configs/pxa3xx_defconfig | 1332 ++++++++++++++++++++++++++ |
| arch/arm/configs/zylonite_defconfig | 736 -------------- |
| arch/arm/mach-pxa/Kconfig | 10 + |
| arch/arm/mach-pxa/Makefile | 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 | 45 +- |
| 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/palmtc.h | 86 ++ |
| arch/arm/mach-pxa/include/mach/palmtx.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 | 113 +-- |
| arch/arm/mach-pxa/palmt5.c | 81 +-- |
| arch/arm/mach-pxa/palmtc.c | 455 +++++++++ |
| arch/arm/mach-pxa/palmte2.c | 80 +-- |
| arch/arm/mach-pxa/palmtx.c | 195 +++-- |
| 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/pxa930.c | 19 +- |
| 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 + |
| arch/arm/plat-pxa/include/plat/mfp.h | 68 ++ |
| drivers/mmc/host/pxamci.c | 104 ++- |
| drivers/pcmcia/pxa2xx_base.c | 18 +- |
| drivers/rtc/rtc-pxa.c | 27 +- |
| drivers/rtc/rtc-sa1100.c | 23 +- |
| drivers/serial/pxa.c | 20 +- |
| drivers/spi/pxa2xx_spi.c | 30 +- |
| drivers/usb/host/ohci-pxa27x.c | 26 +- |
| drivers/video/backlight/da903x_bl.c | 20 +- |
| drivers/video/pxafb.c | 29 +- |
| sound/arm/pxa2xx-ac97.c | 20 +- |
| 56 files changed, 2692 insertions(+), 2599 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 |
| create mode 100644 arch/arm/mach-pxa/include/mach/palmtc.h |
| create mode 100644 arch/arm/mach-pxa/palmtc.c |
| Merging thumb-2/thumb-2 |
| $ git merge thumb-2/thumb-2 |
| Auto-merging arch/arm/Kconfig |
| Auto-merging arch/arm/Makefile |
| Auto-merging arch/arm/boot/compressed/head.S |
| Auto-merging arch/arm/include/asm/assembler.h |
| Auto-merging arch/arm/kernel/entry-armv.S |
| Auto-merging arch/arm/kernel/entry-common.S |
| Auto-merging arch/arm/kernel/head-nommu.S |
| Auto-merging arch/arm/mm/proc-v7.S |
| Merge made by recursive. |
| Merging avr32/avr32-arch |
| $ git merge avr32/avr32-arch |
| Merge made by recursive. |
| arch/avr32/boards/atngw100/setup.c | 5 ----- |
| arch/avr32/mach-at32ap/include/mach/cpu.h | 2 ++ |
| 2 files changed, 2 insertions(+), 5 deletions(-) |
| 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/mca.h | 2 + |
| arch/ia64/kernel/crash.c | 83 ++++++++++++++++++++++++----------- |
| arch/ia64/kernel/head.S | 2 +- |
| arch/ia64/kernel/machine_kexec.c | 15 ++++++ |
| arch/ia64/kernel/mca.c | 15 ++++++- |
| arch/ia64/kernel/mca_asm.S | 47 ++++++++++++++++++++ |
| arch/ia64/kernel/relocate_kernel.S | 2 +- |
| arch/ia64/kernel/setup.c | 6 +++ |
| 8 files changed, 142 insertions(+), 30 deletions(-) |
| Merging m68k/for-next |
| $ git merge m68k/for-next |
| Merge made by recursive. |
| drivers/rtc/Kconfig | 19 +++ |
| drivers/rtc/Makefile | 2 + |
| drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ |
| drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ |
| 4 files changed, 511 insertions(+), 0 deletions(-) |
| create mode 100644 drivers/rtc/rtc-msm6242.c |
| create mode 100644 drivers/rtc/rtc-rp5c01.c |
| Merging m68knommu/for-next |
| $ git merge m68knommu/for-next |
| Removing arch/m68k/include/asm/checksum_mm.h |
| Removing arch/m68k/include/asm/checksum_no.h |
| Removing arch/m68k/include/asm/dma_mm.h |
| Removing arch/m68k/include/asm/dma_no.h |
| Removing arch/m68k/include/asm/elia.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_no.h | 10 +- |
| arch/m68k/include/asm/io_no.h | 2 +- |
| 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/mcfne.h | 83 ---- |
| arch/m68k/include/asm/mcfsim.h | 95 +---- |
| 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 | 173 +++++++- |
| arch/m68k/include/asm/processor_mm.h | 130 ------ |
| arch/m68k/include/asm/processor_no.h | 143 ------ |
| arch/m68k/include/asm/ptrace.h | 10 + |
| arch/m68k/include/asm/timex.h | 17 +- |
| arch/m68knommu/Kconfig | 6 + |
| arch/m68knommu/kernel/irq.c | 26 -- |
| arch/m68knommu/kernel/ptrace.c | 18 +- |
| 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 | 66 +--- |
| 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 +- |
| 87 files changed, 5226 insertions(+), 2311 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/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. |
| drivers/mtd/Kconfig | 2 +- |
| drivers/mtd/maps/Kconfig | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| Merging mips/mips-for-linux-next |
| $ git merge mips/mips-for-linux-next |
| Already up-to-date. |
| Merging parisc/next |
| $ git merge parisc/next |
| Auto-merging MAINTAINERS |
| Auto-merging arch/parisc/kernel/entry.S |
| Auto-merging arch/parisc/kernel/module.c |
| Merge made by recursive. |
| MAINTAINERS | 1 + |
| arch/parisc/Kconfig | 1 + |
| arch/parisc/include/asm/elf.h | 1 + |
| arch/parisc/include/asm/hardirq.h | 20 +-- |
| arch/parisc/include/asm/ptrace.h | 38 +++- |
| arch/parisc/include/asm/syscall.h | 40 +++ |
| arch/parisc/include/asm/thread_info.h | 10 +- |
| arch/parisc/kernel/asm-offsets.c | 4 +- |
| arch/parisc/kernel/entry.S | 29 +- |
| arch/parisc/kernel/irq.c | 5 - |
| arch/parisc/kernel/module.c | 2 +- |
| arch/parisc/kernel/ptrace.c | 457 +++++++++++++++++++++++++++++++-- |
| arch/parisc/kernel/signal.c | 9 + |
| arch/parisc/kernel/syscall.S | 22 +- |
| 14 files changed, 566 insertions(+), 73 deletions(-) |
| create mode 100644 arch/parisc/include/asm/syscall.h |
| Merging powerpc/next |
| $ git merge powerpc/next |
| Removing arch/powerpc/platforms/cell/spufs/sputrace.c |
| Merge made by recursive. |
| arch/powerpc/Kconfig | 22 +- |
| arch/powerpc/Makefile | 2 +- |
| arch/powerpc/boot/dts/canyonlands.dts | 49 +- |
| arch/powerpc/boot/dts/gef_sbc310.dts | 64 ++- |
| arch/powerpc/boot/dts/kilauea.dts | 44 +- |
| arch/powerpc/boot/dts/mgcoge.dts | 53 ++ |
| arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +- |
| arch/powerpc/boot/dts/mpc8377_wlan.dts | 464 ++++++++++++ |
| arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +- |
| arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +- |
| arch/powerpc/boot/dts/mpc8536ds.dts | 32 +- |
| arch/powerpc/boot/dts/mpc8536ds_36b.dts | 467 ++++++++++++ |
| arch/powerpc/boot/dts/mpc8548cds.dts | 20 + |
| arch/powerpc/boot/mktree.c | 10 +- |
| arch/powerpc/boot/wrapper | 3 +- |
| arch/powerpc/configs/40x/kilauea_defconfig | 298 +++++++- |
| arch/powerpc/configs/44x/canyonlands_defconfig | 350 ++++++++-- |
| arch/powerpc/include/asm/bitops.h | 194 ++---- |
| arch/powerpc/include/asm/cell-regs.h | 11 + |
| arch/powerpc/include/asm/cputhreads.h | 16 + |
| arch/powerpc/include/asm/exception-64e.h | 201 +++++ |
| .../include/asm/{exception.h => exception-64s.h} | 25 +- |
| arch/powerpc/include/asm/hardirq.h | 30 +- |
| arch/powerpc/include/asm/hw_irq.h | 5 + |
| arch/powerpc/include/asm/iommu.h | 10 - |
| arch/powerpc/include/asm/mmu-40x.h | 3 + |
| arch/powerpc/include/asm/mmu-44x.h | 6 + |
| arch/powerpc/include/asm/mmu-8xx.h | 3 + |
| arch/powerpc/include/asm/mmu-book3e.h | 196 ++++-- |
| arch/powerpc/include/asm/mmu-hash32.h | 6 + |
| arch/powerpc/include/asm/mmu-hash64.h | 20 - |
| arch/powerpc/include/asm/mmu.h | 37 + |
| arch/powerpc/include/asm/mmu_context.h | 15 +- |
| arch/powerpc/include/asm/paca.h | 23 +- |
| arch/powerpc/include/asm/page.h | 4 + |
| arch/powerpc/include/asm/page_64.h | 10 + |
| arch/powerpc/include/asm/pgalloc.h | 46 +- |
| arch/powerpc/include/asm/pgtable-ppc64-64k.h | 4 +- |
| arch/powerpc/include/asm/pgtable-ppc64.h | 64 ++- |
| arch/powerpc/include/asm/pgtable.h | 6 +- |
| arch/powerpc/include/asm/ppc-opcode.h | 6 + |
| arch/powerpc/include/asm/ppc_asm.h | 14 +- |
| arch/powerpc/include/asm/pte-book3e.h | 70 ++ |
| arch/powerpc/include/asm/pte-common.h | 3 + |
| arch/powerpc/include/asm/reg.h | 141 ++++- |
| arch/powerpc/include/asm/reg_booke.h | 42 +- |
| arch/powerpc/include/asm/smp.h | 10 + |
| arch/powerpc/include/asm/systbl.h | 4 +- |
| arch/powerpc/include/asm/tlb.h | 38 +- |
| arch/powerpc/include/asm/tlbflush.h | 11 +- |
| arch/powerpc/include/asm/vdso.h | 3 +- |
| arch/powerpc/kernel/Makefile | 19 +- |
| arch/powerpc/kernel/asm-offsets.c | 21 +- |
| arch/powerpc/kernel/cpu_setup_6xx.S | 2 +- |
| arch/powerpc/kernel/cputable.c | 57 ++- |
| arch/powerpc/kernel/entry_32.S | 20 +- |
| arch/powerpc/kernel/entry_64.S | 102 ++- |
| arch/powerpc/kernel/exceptions-64e.S | 784 ++++++++++++++++++++ |
| arch/powerpc/kernel/exceptions-64s.S | 97 ++- |
| arch/powerpc/kernel/fpu.S | 2 +- |
| arch/powerpc/kernel/head_32.S | 40 +- |
| arch/powerpc/kernel/head_40x.S | 124 ++-- |
| arch/powerpc/kernel/head_44x.S | 56 +- |
| arch/powerpc/kernel/head_64.S | 83 ++- |
| arch/powerpc/kernel/head_8xx.S | 13 +- |
| arch/powerpc/kernel/head_booke.h | 50 +- |
| arch/powerpc/kernel/head_fsl_booke.S | 60 +- |
| arch/powerpc/kernel/paca.c | 3 + |
| arch/powerpc/kernel/perf_callchain.c | 527 +++++++++++++ |
| arch/powerpc/kernel/process.c | 2 + |
| arch/powerpc/kernel/prom_init.c | 107 +++- |
| arch/powerpc/kernel/setup_64.c | 34 +- |
| arch/powerpc/kernel/sys_ppc32.c | 12 + |
| arch/powerpc/kernel/time.c | 3 +- |
| arch/powerpc/kernel/vdso.c | 7 +- |
| arch/powerpc/kernel/vdso32/Makefile | 1 + |
| arch/powerpc/kernel/vdso64/Makefile | 2 + |
| arch/powerpc/kernel/vector.S | 2 +- |
| arch/powerpc/kernel/vmlinux.lds.S | 8 +- |
| arch/powerpc/kvm/booke_interrupts.S | 18 +- |
| arch/powerpc/mm/Makefile | 1 + |
| arch/powerpc/mm/fsl_booke_mmu.c | 2 +- |
| arch/powerpc/mm/hash_low_32.S | 4 +- |
| arch/powerpc/mm/hugetlbpage.c | 8 +- |
| arch/powerpc/mm/init_32.c | 2 - |
| arch/powerpc/mm/init_64.c | 55 ++- |
| arch/powerpc/mm/mmu_context_nohash.c | 96 ++- |
| arch/powerpc/mm/mmu_decl.h | 37 +- |
| arch/powerpc/mm/pgtable.c | 14 +- |
| arch/powerpc/mm/pgtable_64.c | 59 ++- |
| arch/powerpc/mm/slb.c | 67 +- |
| arch/powerpc/mm/stab.c | 11 +- |
| arch/powerpc/mm/tlb_hash32.c | 3 + |
| arch/powerpc/mm/tlb_hash64.c | 20 +- |
| arch/powerpc/mm/tlb_low_64e.S | 734 ++++++++++++++++++ |
| arch/powerpc/mm/tlb_nohash.c | 268 +++++++- |
| arch/powerpc/mm/tlb_nohash_low.S | 85 ++- |
| arch/powerpc/platforms/82xx/mgcoge.c | 69 ++- |
| arch/powerpc/platforms/83xx/Kconfig | 4 +- |
| arch/powerpc/platforms/83xx/mpc837x_rdb.c | 28 +- |
| arch/powerpc/platforms/83xx/mpc83xx.h | 4 + |
| arch/powerpc/platforms/85xx/smp.c | 1 - |
| arch/powerpc/platforms/86xx/gef_ppc9a.c | 37 +- |
| arch/powerpc/platforms/86xx/mpc86xx_smp.c | 1 - |
| arch/powerpc/platforms/Kconfig.cputype | 38 +- |
| arch/powerpc/platforms/amigaone/setup.c | 6 +- |
| arch/powerpc/platforms/cell/Kconfig | 7 - |
| arch/powerpc/platforms/cell/celleb_setup.c | 3 +- |
| arch/powerpc/platforms/cell/smp.c | 2 - |
| arch/powerpc/platforms/cell/spufs/Makefile | 3 +- |
| arch/powerpc/platforms/cell/spufs/context.c | 1 + |
| arch/powerpc/platforms/cell/spufs/file.c | 1 + |
| arch/powerpc/platforms/cell/spufs/sched.c | 2 + |
| arch/powerpc/platforms/cell/spufs/spufs.h | 5 - |
| arch/powerpc/platforms/cell/spufs/sputrace.c | 272 ------- |
| arch/powerpc/platforms/cell/spufs/sputrace.h | 39 + |
| arch/powerpc/platforms/iseries/exception.S | 59 +- |
| arch/powerpc/platforms/iseries/exception.h | 6 +- |
| arch/powerpc/platforms/pasemi/idle.c | 2 +- |
| arch/powerpc/platforms/powermac/feature.c | 13 +- |
| arch/powerpc/platforms/powermac/smp.c | 2 +- |
| arch/powerpc/platforms/ps3/mm.c | 2 +- |
| arch/powerpc/platforms/ps3/system-bus.c | 2 +- |
| arch/powerpc/platforms/pseries/smp.c | 2 - |
| arch/powerpc/sysdev/fsl_rio.c | 18 +- |
| arch/powerpc/sysdev/ipic.c | 7 +- |
| arch/powerpc/sysdev/mmio_nvram.c | 32 + |
| arch/powerpc/sysdev/mpic.c | 13 +- |
| arch/powerpc/sysdev/qe_lib/qe_ic.c | 5 +- |
| arch/powerpc/xmon/Makefile | 2 + |
| arch/powerpc/xmon/xmon.c | 2 +- |
| drivers/block/ps3vram.c | 2 +- |
| drivers/char/agp/uninorth-agp.c | 49 +- |
| drivers/char/hvc_console.c | 2 - |
| drivers/char/hvsi.c | 3 +- |
| drivers/macintosh/macio_asic.c | 6 +- |
| drivers/video/ps3fb.c | 2 +- |
| kernel/gcov/Kconfig | 2 +- |
| lib/Kconfig.debug | 2 +- |
| 139 files changed, 6314 insertions(+), 1327 deletions(-) |
| create mode 100644 arch/powerpc/boot/dts/mpc8377_wlan.dts |
| create mode 100644 arch/powerpc/boot/dts/mpc8536ds_36b.dts |
| create mode 100644 arch/powerpc/include/asm/exception-64e.h |
| rename arch/powerpc/include/asm/{exception.h => exception-64s.h} (94%) |
| create mode 100644 arch/powerpc/include/asm/pte-book3e.h |
| create mode 100644 arch/powerpc/kernel/exceptions-64e.S |
| create mode 100644 arch/powerpc/kernel/perf_callchain.c |
| create mode 100644 arch/powerpc/mm/tlb_low_64e.S |
| delete mode 100644 arch/powerpc/platforms/cell/spufs/sputrace.c |
| create mode 100644 arch/powerpc/platforms/cell/spufs/sputrace.h |
| Merging 4xx/next |
| $ git merge 4xx/next |
| Merge made by recursive. |
| arch/powerpc/boot/Makefile | 4 +- |
| arch/powerpc/boot/cuboot-hotfoot.c | 142 ++++ |
| arch/powerpc/boot/dts/arches.dts | 50 ++ |
| arch/powerpc/boot/dts/eiger.dts | 421 ++++++++++ |
| arch/powerpc/boot/dts/hotfoot.dts | 297 +++++++ |
| arch/powerpc/boot/ppcboot-hotfoot.h | 133 +++ |
| arch/powerpc/configs/44x/arches_defconfig | 382 ++++++++-- |
| arch/powerpc/configs/44x/eiger_defconfig | 1252 ++++++++++++++++++++++++++++ |
| arch/powerpc/platforms/40x/Kconfig | 10 + |
| arch/powerpc/platforms/40x/ppc40x_simple.c | 3 +- |
| arch/powerpc/platforms/44x/Kconfig | 12 + |
| arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + |
| 12 files changed, 2655 insertions(+), 52 deletions(-) |
| create mode 100644 arch/powerpc/boot/cuboot-hotfoot.c |
| create mode 100644 arch/powerpc/boot/dts/eiger.dts |
| create mode 100644 arch/powerpc/boot/dts/hotfoot.dts |
| create mode 100644 arch/powerpc/boot/ppcboot-hotfoot.h |
| create mode 100644 arch/powerpc/configs/44x/eiger_defconfig |
| Merging galak/next |
| $ git merge galak/next |
| Merge made by recursive. |
| arch/powerpc/boot/dts/mpc8272ads.dts | 8 + |
| arch/powerpc/boot/dts/mpc8536ds.dts | 8 + |
| arch/powerpc/boot/dts/mpc8536ds_36b.dts | 8 + |
| arch/powerpc/boot/dts/mpc8569mds.dts | 45 ++ |
| arch/powerpc/boot/dts/p2020rdb.dts | 586 +++++++++++++++++++++++++++ |
| arch/powerpc/boot/dts/sbc8349.dts | 60 ++- |
| arch/powerpc/boot/dts/sbc8560.dts | 1 - |
| arch/powerpc/configs/83xx/sbc834x_defconfig | 320 ++++++++++++++- |
| arch/powerpc/configs/mgcoge_defconfig | 86 ++++- |
| arch/powerpc/configs/mpc85xx_defconfig | 1 + |
| arch/powerpc/include/asm/mmu-book3e.h | 12 + |
| arch/powerpc/include/asm/reg_booke.h | 6 - |
| arch/powerpc/mm/tlb_nohash_low.S | 2 - |
| arch/powerpc/platforms/82xx/mpc8272_ads.c | 22 +- |
| arch/powerpc/platforms/85xx/Kconfig | 9 + |
| arch/powerpc/platforms/85xx/Makefile | 3 +- |
| arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 + |
| arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 141 +++++++ |
| arch/powerpc/platforms/85xx/sbc8560.c | 39 ++- |
| arch/powerpc/sysdev/fsl_soc.c | 6 +- |
| arch/powerpc/sysdev/qe_lib/gpio.c | 4 +- |
| 21 files changed, 1321 insertions(+), 50 deletions(-) |
| create mode 100644 arch/powerpc/boot/dts/p2020rdb.dts |
| create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_rdb.c |
| 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 |
| Auto-merging drivers/s390/block/dasd.c |
| Auto-merging drivers/s390/cio/device.c |
| Merge made by recursive. |
| Documentation/sysctl/kernel.txt | 16 + |
| arch/s390/Kconfig | 1 - |
| arch/s390/Makefile | 3 +- |
| arch/s390/hypfs/inode.c | 6 +- |
| 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 +------------- |
| arch/s390/include/asm/hardirq.h | 7 - |
| arch/s390/include/asm/ipl.h | 5 +- |
| .../cio/scsw.c => arch/s390/include/asm/scsw.h | 345 +++++++++++++------- |
| arch/s390/include/asm/setup.h | 2 +- |
| arch/s390/include/asm/timex.h | 14 + |
| arch/s390/kernel/Makefile | 4 +- |
| arch/s390/kernel/early.c | 74 +++-- |
| arch/s390/kernel/entry.S | 16 +- |
| arch/s390/kernel/entry64.S | 4 + |
| arch/s390/kernel/ipl.c | 166 +++++++++- |
| arch/s390/kernel/mcount.S | 147 +-------- |
| arch/s390/kernel/mcount64.S | 78 +++++ |
| arch/s390/kernel/suspend.c | 73 ++++ |
| arch/s390/{power => kernel}/swsusp_asm64.S | 2 +- |
| arch/s390/kernel/time.c | 3 +- |
| arch/s390/kernel/vmlinux.lds.S | 87 +----- |
| arch/s390/power/Makefile | 8 - |
| arch/s390/power/suspend.c | 40 --- |
| arch/s390/power/swsusp.c | 42 --- |
| arch/s390/power/swsusp_64.c | 17 - |
| drivers/char/hvc_iucv.c | 2 +- |
| drivers/s390/block/dasd.c | 26 +- |
| drivers/s390/block/dasd_3990_erp.c | 2 +- |
| drivers/s390/block/dasd_alias.c | 5 +- |
| drivers/s390/block/dasd_diag.c | 5 +- |
| drivers/s390/block/dasd_eckd.c | 47 ++-- |
| drivers/s390/block/dasd_eer.c | 4 +- |
| drivers/s390/block/dasd_erp.c | 4 +- |
| drivers/s390/block/dasd_fba.c | 9 +- |
| drivers/s390/block/dasd_int.h | 11 +- |
| drivers/s390/block/dasd_ioctl.c | 24 +- |
| drivers/s390/block/xpram.c | 65 ---- |
| drivers/s390/char/Kconfig | 10 + |
| drivers/s390/char/Makefile | 1 + |
| drivers/s390/char/monreader.c | 2 +- |
| drivers/s390/char/sclp.h | 4 +- |
| drivers/s390/char/sclp_async.c | 224 +++++++++++++ |
| drivers/s390/char/tape_core.c | 4 +- |
| drivers/s390/char/tape_std.c | 2 +- |
| drivers/s390/char/vmlogrdr.c | 4 +- |
| drivers/s390/char/vmur.c | 19 +- |
| drivers/s390/cio/Makefile | 2 +- |
| drivers/s390/cio/chp.c | 3 +- |
| drivers/s390/cio/chsc.h | 24 -- |
| drivers/s390/cio/cio.c | 44 +-- |
| drivers/s390/cio/css.c | 26 +- |
| drivers/s390/cio/device.c | 128 ++++--- |
| drivers/s390/cio/device_fsm.c | 22 ++- |
| drivers/s390/cio/qdio.h | 4 +- |
| drivers/s390/cio/qdio_debug.c | 55 +--- |
| drivers/s390/cio/qdio_main.c | 4 +- |
| drivers/s390/crypto/ap_bus.c | 30 ++- |
| drivers/s390/net/netiucv.c | 9 +- |
| drivers/s390/net/smsgiucv.c | 6 +- |
| 62 files changed, 1329 insertions(+), 1143 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 (99%) |
| 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 |
| create mode 100644 drivers/s390/char/sclp_async.c |
| Merging sh/master |
| $ git merge sh/master |
| Auto-merging arch/arm/plat-omap/gpio.c |
| Removing arch/sh/boot/compressed/misc_32.c |
| Removing arch/sh/boot/compressed/misc_64.c |
| Removing arch/sh/boot/compressed/piggy.S |
| Removing arch/sh/include/mach-common/mach/migor.h |
| Removing arch/sh/kernel/Makefile_32 |
| Removing arch/sh/kernel/Makefile_64 |
| Auto-merging drivers/video/Kconfig |
| Merge made by recursive. |
| Documentation/power/runtime_pm.txt | 378 ++++ |
| 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/sh/Kconfig | 43 +- |
| arch/sh/Kconfig.debug | 23 +- |
| arch/sh/Makefile | 26 +- |
| arch/sh/boards/Kconfig | 14 + |
| arch/sh/boards/board-ap325rxa.c | 6 + |
| arch/sh/boards/mach-ecovec24/Makefile | 9 + |
| arch/sh/boards/mach-ecovec24/setup.c | 129 ++ |
| arch/sh/boards/mach-highlander/setup.c | 7 + |
| arch/sh/boards/mach-kfr2r09/Makefile | 2 + |
| arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 332 ++++ |
| arch/sh/boards/mach-kfr2r09/setup.c | 386 ++++ |
| arch/sh/boards/mach-migor/setup.c | 9 + |
| arch/sh/boards/mach-se/7722/setup.c | 4 + |
| arch/sh/boards/mach-se/7724/setup.c | 108 +- |
| arch/sh/boards/mach-x3proto/setup.c | 7 + |
| arch/sh/boot/.gitignore | 5 +- |
| arch/sh/boot/Makefile | 48 +- |
| arch/sh/boot/compressed/.gitignore | 1 + |
| arch/sh/boot/compressed/Makefile | 21 +- |
| arch/sh/boot/compressed/head_32.S | 2 +- |
| 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/boot/romimage/Makefile | 19 + |
| arch/sh/boot/romimage/head.S | 10 + |
| arch/sh/boot/romimage/vmlinux.scr | 6 + |
| arch/sh/configs/ecovec24_defconfig | 1550 +++++++++++++++ |
| arch/sh/configs/kfr2r09-romimage_defconfig | 774 ++++++++ |
| arch/sh/configs/kfr2r09_defconfig | 1059 ++++++++++ |
| arch/sh/configs/snapgear_defconfig | 77 +- |
| arch/sh/drivers/dma/Kconfig | 6 +- |
| arch/sh/drivers/heartbeat.c | 10 + |
| arch/sh/drivers/pci/pci.c | 4 + |
| arch/sh/include/asm/Kbuild | 2 +- |
| arch/sh/include/asm/bug.h | 31 + |
| arch/sh/include/asm/cachectl.h | 19 + |
| arch/sh/include/asm/device.h | 16 +- |
| arch/sh/include/asm/dma-sh.h | 1 + |
| arch/sh/include/asm/dwarf.h | 398 ++++ |
| arch/sh/include/asm/entry-macros.S | 86 +- |
| arch/sh/include/asm/ftrace.h | 8 +- |
| arch/sh/include/asm/hardirq.h | 13 +- |
| arch/sh/include/asm/heartbeat.h | 1 + |
| arch/sh/include/asm/hwblk.h | 72 + |
| arch/sh/include/asm/io.h | 16 +- |
| arch/sh/include/asm/lmb.h | 6 + |
| arch/sh/include/asm/pgtable_32.h | 22 +- |
| arch/sh/include/asm/processor.h | 2 +- |
| arch/sh/include/asm/sections.h | 1 + |
| arch/sh/include/asm/stacktrace.h | 25 + |
| arch/sh/include/asm/suspend.h | 9 + |
| arch/sh/include/asm/syscall_32.h | 1 + |
| arch/sh/include/asm/system.h | 5 + |
| arch/sh/include/asm/system_32.h | 26 +- |
| arch/sh/include/asm/thread_info.h | 11 +- |
| arch/sh/include/asm/unistd_32.h | 2 +- |
| arch/sh/include/asm/unistd_64.h | 2 +- |
| arch/sh/include/asm/unwinder.h | 31 + |
| arch/sh/include/asm/vmlinux.lds.h | 17 + |
| arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 3 +- |
| arch/sh/include/cpu-sh4/cpu/freq.h | 4 + |
| arch/sh/include/cpu-sh4/cpu/sh7722.h | 14 + |
| arch/sh/include/cpu-sh4/cpu/sh7723.h | 17 + |
| arch/sh/include/cpu-sh4/cpu/sh7724.h | 17 + |
| arch/sh/include/cpu-sh4/cpu/sh7757.h | 243 +++ |
| arch/sh/include/mach-common/mach/migor.h | 64 - |
| arch/sh/include/mach-common/mach/romimage.h | 1 + |
| arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 21 + |
| .../mach-kfr2r09/mach/partner-jet-setup.txt | 141 ++ |
| arch/sh/include/mach-kfr2r09/mach/romimage.h | 88 + |
| arch/sh/include/mach-migor/mach/migor.h | 14 + |
| arch/sh/kernel/Makefile | 43 +- |
| arch/sh/kernel/Makefile_32 | 37 - |
| arch/sh/kernel/Makefile_64 | 19 - |
| arch/sh/kernel/asm-offsets.c | 1 + |
| arch/sh/kernel/cpu/Makefile | 2 +- |
| arch/sh/kernel/cpu/hwblk.c | 155 ++ |
| arch/sh/kernel/cpu/init.c | 34 +- |
| arch/sh/kernel/cpu/irq/ipr.c | 1 + |
| arch/sh/kernel/cpu/sh2/entry.S | 3 +- |
| arch/sh/kernel/cpu/sh2a/entry.S | 3 +- |
| arch/sh/kernel/cpu/sh3/entry.S | 13 +- |
| arch/sh/kernel/cpu/sh4/probe.c | 11 +- |
| arch/sh/kernel/cpu/sh4a/Makefile | 9 +- |
| arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 63 +- |
| arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 113 +- |
| arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 124 +- |
| arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 130 ++ |
| arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c | 106 + |
| arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c | 117 ++ |
| arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c | 121 ++ |
| arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 2019 ++++++++++++++++++++ |
| arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 2 +- |
| arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 39 +- |
| arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 42 +- |
| arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 43 + |
| arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 513 +++++ |
| arch/sh/kernel/cpu/shmobile/Makefile | 2 + |
| arch/sh/kernel/cpu/shmobile/cpuidle.c | 113 ++ |
| arch/sh/kernel/cpu/shmobile/pm.c | 42 +- |
| arch/sh/kernel/cpu/shmobile/pm_runtime.c | 303 +++ |
| arch/sh/kernel/cpu/shmobile/sleep.S | 155 +- |
| arch/sh/kernel/dumpstack.c | 123 ++ |
| arch/sh/kernel/dwarf.c | 972 ++++++++++ |
| arch/sh/kernel/early_printk.c | 5 +- |
| arch/sh/kernel/entry-common.S | 103 +- |
| arch/sh/kernel/ftrace.c | 188 ++ |
| arch/sh/kernel/io.c | 97 +- |
| arch/sh/kernel/io_generic.c | 50 +- |
| arch/sh/kernel/io_trapped.c | 7 +- |
| arch/sh/kernel/irq.c | 19 +- |
| arch/sh/kernel/kgdb.c | 2 - |
| arch/sh/kernel/process_32.c | 25 +- |
| arch/sh/kernel/ptrace_32.c | 12 + |
| arch/sh/kernel/setup.c | 79 +- |
| arch/sh/kernel/sh_ksyms_32.c | 4 +- |
| arch/sh/kernel/signal_32.c | 12 +- |
| arch/sh/kernel/stacktrace.c | 98 +- |
| arch/sh/kernel/sys_sh.c | 43 + |
| arch/sh/kernel/syscalls_32.S | 2 +- |
| arch/sh/kernel/syscalls_64.S | 2 +- |
| arch/sh/kernel/time.c | 29 +- |
| arch/sh/kernel/traps.c | 24 +- |
| arch/sh/kernel/traps_32.c | 213 ++- |
| arch/sh/kernel/unwinder.c | 164 ++ |
| arch/sh/kernel/vmlinux.lds.S | 90 +- |
| arch/sh/lib/Makefile | 2 +- |
| arch/sh/lib/clear_page.S | 2 +- |
| arch/sh/lib/delay.c | 5 +- |
| arch/sh/lib/mcount.S | 228 +++- |
| arch/sh/mm/Kconfig | 7 +- |
| arch/sh/mm/cache-sh4.c | 45 + |
| arch/sh/mm/fault_32.c | 164 +- |
| arch/sh/mm/ioremap_32.c | 8 - |
| arch/sh/mm/ioremap_64.c | 6 +- |
| arch/sh/mm/numa.c | 36 +- |
| arch/sh/mm/tlb-sh4.c | 9 +- |
| arch/sh/oprofile/backtrace.c | 84 +- |
| arch/sh/tools/mach-types | 2 + |
| arch/sparc/include/asm/device.h | 3 + |
| arch/x86/include/asm/device.h | 3 + |
| drivers/base/dd.c | 11 + |
| drivers/base/platform.c | 84 +- |
| drivers/base/power/Makefile | 1 + |
| drivers/base/power/main.c | 30 +- |
| drivers/base/power/power.h | 31 +- |
| drivers/base/power/runtime.c | 1011 ++++++++++ |
| 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/i2c/busses/i2c-sh_mobile.c | 39 +- |
| drivers/media/video/sh_mobile_ceu_camera.c | 41 +- |
| drivers/pci/pci-driver.c | 16 +- |
| drivers/rtc/rtc-ds1302.c | 69 +- |
| drivers/rtc/rtc-sh.c | 93 +- |
| drivers/serial/sh-sci.c | 8 +- |
| drivers/serial/sh-sci.h | 17 + |
| drivers/sh/intc.c | 62 +- |
| drivers/uio/uio_pdrv_genirq.c | 54 + |
| drivers/usb/gadget/Kconfig | 28 +- |
| drivers/usb/gadget/Makefile | 1 + |
| drivers/usb/gadget/gadget_chips.h | 8 + |
| drivers/usb/gadget/m66592-udc.c | 286 ++-- |
| drivers/usb/gadget/m66592-udc.h | 90 +- |
| drivers/usb/gadget/r8a66597-udc.c | 1689 ++++++++++++++++ |
| drivers/usb/gadget/r8a66597-udc.h | 256 +++ |
| drivers/usb/host/Kconfig | 7 - |
| drivers/usb/host/r8a66597-hcd.c | 210 ++- |
| drivers/usb/host/r8a66597.h | 442 +---- |
| drivers/usb/musb/musb_core.c | 18 +- |
| drivers/video/Kconfig | 2 +- |
| drivers/video/sh_mobile_lcdcfb.c | 175 ++- |
| include/asm-generic/device.h | 3 + |
| include/linux/device.h | 9 +- |
| include/linux/platform_device.h | 5 +- |
| include/linux/pm.h | 101 +- |
| include/linux/pm_runtime.h | 114 ++ |
| include/linux/sh_intc.h | 1 - |
| include/linux/usb/m66592.h | 44 + |
| include/linux/usb/r8a66597.h | 375 ++++- |
| kernel/power/Kconfig | 14 + |
| kernel/power/main.c | 17 + |
| 192 files changed, 17631 insertions(+), 2401 deletions(-) |
| create mode 100644 Documentation/power/runtime_pm.txt |
| create mode 100644 arch/sh/boards/mach-ecovec24/Makefile |
| create mode 100644 arch/sh/boards/mach-ecovec24/setup.c |
| create mode 100644 arch/sh/boards/mach-kfr2r09/Makefile |
| create mode 100644 arch/sh/boards/mach-kfr2r09/lcd_wqvga.c |
| create mode 100644 arch/sh/boards/mach-kfr2r09/setup.c |
| 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/boot/romimage/Makefile |
| create mode 100644 arch/sh/boot/romimage/head.S |
| create mode 100644 arch/sh/boot/romimage/vmlinux.scr |
| create mode 100644 arch/sh/configs/ecovec24_defconfig |
| create mode 100644 arch/sh/configs/kfr2r09-romimage_defconfig |
| create mode 100644 arch/sh/configs/kfr2r09_defconfig |
| create mode 100644 arch/sh/include/asm/cachectl.h |
| create mode 100644 arch/sh/include/asm/dwarf.h |
| create mode 100644 arch/sh/include/asm/hwblk.h |
| create mode 100644 arch/sh/include/asm/lmb.h |
| create mode 100644 arch/sh/include/asm/stacktrace.h |
| create mode 100644 arch/sh/include/asm/unwinder.h |
| create mode 100644 arch/sh/include/asm/vmlinux.lds.h |
| create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7757.h |
| delete mode 100644 arch/sh/include/mach-common/mach/migor.h |
| create mode 100644 arch/sh/include/mach-common/mach/romimage.h |
| create mode 100644 arch/sh/include/mach-kfr2r09/mach/kfr2r09.h |
| create mode 100644 arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt |
| create mode 100644 arch/sh/include/mach-kfr2r09/mach/romimage.h |
| create mode 100644 arch/sh/include/mach-migor/mach/migor.h |
| delete mode 100644 arch/sh/kernel/Makefile_32 |
| delete mode 100644 arch/sh/kernel/Makefile_64 |
| create mode 100644 arch/sh/kernel/cpu/hwblk.c |
| create mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh7757.c |
| create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c |
| create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c |
| create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c |
| create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c |
| create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7757.c |
| create mode 100644 arch/sh/kernel/cpu/shmobile/cpuidle.c |
| create mode 100644 arch/sh/kernel/cpu/shmobile/pm_runtime.c |
| create mode 100644 arch/sh/kernel/dumpstack.c |
| create mode 100644 arch/sh/kernel/dwarf.c |
| create mode 100644 arch/sh/kernel/unwinder.c |
| create mode 100644 drivers/base/power/runtime.c |
| create mode 100644 drivers/usb/gadget/r8a66597-udc.c |
| create mode 100644 drivers/usb/gadget/r8a66597-udc.h |
| create mode 100644 include/linux/pm_runtime.h |
| create mode 100644 include/linux/usb/m66592.h |
| Merging sparc/master |
| $ git merge sparc/master |
| Merge made by recursive. |
| arch/sparc/Kconfig | 11 + |
| arch/sparc/Makefile | 12 +- |
| arch/sparc/boot/Makefile | 3 + |
| arch/sparc/include/asm/asi.h | 4 + |
| arch/sparc/include/asm/leon.h | 362 +++++++++++++++++++++++++++++++++++ |
| arch/sparc/include/asm/leon_amba.h | 263 +++++++++++++++++++++++++ |
| arch/sparc/include/asm/machines.h | 6 +- |
| arch/sparc/include/asm/pgtsrmmu.h | 4 + |
| arch/sparc/include/asm/prom.h | 3 + |
| arch/sparc/include/asm/system_32.h | 1 + |
| arch/sparc/include/asm/types.h | 27 +-- |
| arch/sparc/include/asm/uaccess_64.h | 2 +- |
| arch/sparc/kernel/Makefile | 2 + |
| arch/sparc/kernel/cpu.c | 5 + |
| arch/sparc/kernel/head_32.S | 5 + |
| arch/sparc/kernel/idprom.c | 2 + |
| arch/sparc/kernel/irq_32.c | 5 + |
| arch/sparc/kernel/leon_kernel.c | 203 ++++++++++++++++++++ |
| arch/sparc/kernel/of_device_32.c | 40 ++++ |
| arch/sparc/kernel/prom_32.c | 33 ++++ |
| arch/sparc/kernel/prom_common.c | 10 +- |
| arch/sparc/kernel/setup_32.c | 5 + |
| arch/sparc/kernel/sysfs.c | 1 + |
| arch/sparc/mm/Makefile | 1 + |
| arch/sparc/mm/init_32.c | 4 + |
| arch/sparc/mm/leon_mm.c | 260 +++++++++++++++++++++++++ |
| arch/sparc/mm/loadmmu.c | 1 + |
| arch/sparc/mm/srmmu.c | 53 +++++- |
| samples/kprobes/kretprobe_example.c | 1 + |
| 29 files changed, 1298 insertions(+), 31 deletions(-) |
| create mode 100644 arch/sparc/include/asm/leon.h |
| create mode 100644 arch/sparc/include/asm/leon_amba.h |
| create mode 100644 arch/sparc/kernel/leon_kernel.c |
| create mode 100644 arch/sparc/mm/leon_mm.c |
| Merging xtensa/master |
| $ git merge xtensa/master |
| Auto-merging arch/xtensa/Kconfig |
| Merge made by recursive. |
| Merging cifs/master |
| $ git merge cifs/master |
| Already up-to-date. |
| Merging configfs/linux-next |
| $ git merge configfs/linux-next |
| Already up-to-date. |
| Merging ecryptfs/next |
| $ git merge ecryptfs/next |
| Auto-merging fs/ecryptfs/keystore.c |
| Merge made by recursive. |
| fs/ecryptfs/crypto.c | 10 +++++----- |
| fs/ecryptfs/keystore.c | 11 ++++------- |
| fs/ecryptfs/super.c | 2 -- |
| 3 files changed, 9 insertions(+), 14 deletions(-) |
| Merging ext3/for_next |
| $ git merge ext3/for_next |
| Auto-merging MAINTAINERS |
| Merge made by recursive. |
| MAINTAINERS | 3 +-- |
| fs/ext3/inode.c | 19 +++++++++++++++---- |
| fs/jbd/checkpoint.c | 6 +++--- |
| fs/jbd/commit.c | 2 +- |
| fs/jbd/journal.c | 30 +++++++++++++++--------------- |
| fs/jbd/recovery.c | 18 +++++++++--------- |
| fs/jbd/revoke.c | 16 ++++++++-------- |
| fs/jbd/transaction.c | 9 +++++---- |
| include/linux/jbd.h | 26 +++++++++++++------------- |
| 9 files changed, 70 insertions(+), 59 deletions(-) |
| Merging ext4/next |
| $ git merge ext4/next |
| Merge made by recursive. |
| fs/ext4/Kconfig | 11 +++- |
| fs/ext4/balloc.c | 2 +- |
| fs/ext4/ext4.h | 49 ++++++++++---- |
| fs/ext4/ext4_extents.h | 3 +- |
| fs/ext4/extents.c | 52 +++++++++++----- |
| fs/ext4/ialloc.c | 2 +- |
| fs/ext4/inode.c | 30 +++++++--- |
| fs/ext4/mballoc.c | 165 +++++++++++++++++++++++++----------------------- |
| fs/ext4/mballoc.h | 16 ++++- |
| fs/ext4/move_extent.c | 1 + |
| fs/ext4/namei.c | 16 ++++- |
| fs/ext4/super.c | 107 ++++++++++++++++++------------- |
| fs/jbd2/journal.c | 6 ++ |
| fs/jbd2/transaction.c | 7 +- |
| include/linux/jbd2.h | 2 +- |
| 15 files changed, 291 insertions(+), 178 deletions(-) |
| Merging fatfs/master |
| $ git merge fatfs/master |
| Merge made by recursive. |
| Documentation/filesystems/vfat.txt | 2 +- |
| fs/fat/inode.c | 4 ++-- |
| fs/fat/namei_vfat.c | 15 ++++----------- |
| fs/nls/nls_base.c | 8 ++++---- |
| 4 files changed, 11 insertions(+), 18 deletions(-) |
| 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. |
| Documentation/filesystems/gfs2-uevents.txt | 100 ++++++++++++++++++++++++++++ |
| fs/gfs2/dentry.c | 18 +++++ |
| fs/gfs2/incore.h | 7 ++ |
| fs/gfs2/inode.c | 2 +- |
| fs/gfs2/ops_fstype.c | 14 ++++- |
| fs/gfs2/ops_inode.c | 2 +- |
| fs/gfs2/rgrp.c | 38 ++++++++--- |
| fs/gfs2/rgrp.h | 2 +- |
| fs/gfs2/super.c | 37 ++++++++++ |
| fs/gfs2/super.h | 4 +- |
| fs/gfs2/sys.c | 23 ++++++- |
| fs/gfs2/util.c | 41 ++++++++---- |
| 12 files changed, 254 insertions(+), 34 deletions(-) |
| create mode 100644 Documentation/filesystems/gfs2-uevents.txt |
| Merging jfs/next |
| $ git merge jfs/next |
| Already up-to-date. |
| Merging nfs/linux-next |
| $ git merge nfs/linux-next |
| Merge made by recursive. |
| Documentation/filesystems/nfs.txt | 98 ++ |
| Documentation/kernel-parameters.txt | 29 + |
| fs/lockd/host.c | 14 +- |
| fs/lockd/mon.c | 44 +- |
| fs/nfs/Makefile | 3 +- |
| fs/nfs/cache_lib.c | 140 +++ |
| fs/nfs/cache_lib.h | 27 + |
| fs/nfs/callback.c | 26 +- |
| fs/nfs/client.c | 15 +- |
| fs/nfs/direct.c | 3 - |
| fs/nfs/dns_resolve.c | 335 +++++++ |
| fs/nfs/dns_resolve.h | 14 + |
| fs/nfs/file.c | 49 +- |
| fs/nfs/idmap.c | 6 +- |
| fs/nfs/inode.c | 100 ++- |
| fs/nfs/internal.h | 29 +- |
| fs/nfs/mount_clnt.c | 83 ++- |
| fs/nfs/nfs4namespace.c | 24 +- |
| fs/nfs/nfs4proc.c | 40 +- |
| fs/nfs/nfs4xdr.c | 1460 ++++++++++++++++++------------ |
| fs/nfs/super.c | 257 ++---- |
| fs/nfs/write.c | 91 ++- |
| fs/nfsd/export.c | 14 +- |
| fs/nfsd/nfs4idmap.c | 20 +- |
| fs/nfsd/nfs4proc.c | 82 +- |
| fs/nfsd/nfs4state.c | 164 +++-- |
| fs/nfsd/nfs4xdr.c | 3 +- |
| fs/nfsd/nfsctl.c | 26 +- |
| fs/nfsd/nfssvc.c | 23 +- |
| include/linux/nfs4.h | 2 +- |
| include/linux/nfs_fs_sb.h | 9 + |
| include/linux/nfsd/nfsd.h | 3 + |
| include/linux/nfsd/state.h | 22 +- |
| include/linux/nfsd/xdr4.h | 12 - |
| include/linux/sunrpc/cache.h | 40 +- |
| include/linux/sunrpc/clnt.h | 43 +- |
| include/linux/sunrpc/msg_prot.h | 17 +- |
| include/linux/sunrpc/rpc_pipe_fs.h | 20 +- |
| include/linux/sunrpc/svc.h | 2 - |
| include/linux/sunrpc/xdr.h | 10 +- |
| include/linux/sunrpc/xprt.h | 2 - |
| net/sunrpc/Makefile | 2 +- |
| net/sunrpc/addr.c | 364 ++++++++ |
| net/sunrpc/auth_gss/auth_gss.c | 12 +- |
| net/sunrpc/auth_gss/svcauth_gss.c | 7 +- |
| net/sunrpc/cache.c | 690 +++++++++++---- |
| net/sunrpc/clnt.c | 60 +- |
| net/sunrpc/rpc_pipe.c | 685 ++++++++------ |
| net/sunrpc/rpcb_clnt.c | 420 ++++++--- |
| net/sunrpc/sunrpc_syms.c | 2 +- |
| net/sunrpc/svcauth_unix.c | 15 +- |
| net/sunrpc/svcsock.c | 84 ++- |
| net/sunrpc/timer.c | 45 +- |
| net/sunrpc/xdr.c | 12 +- |
| net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +- |
| net/sunrpc/xprtrdma/transport.c | 48 +- |
| net/sunrpc/xprtsock.c | 287 +++--- |
| 57 files changed, 4209 insertions(+), 1929 deletions(-) |
| create mode 100644 Documentation/filesystems/nfs.txt |
| create mode 100644 fs/nfs/cache_lib.c |
| create mode 100644 fs/nfs/cache_lib.h |
| create mode 100644 fs/nfs/dns_resolve.c |
| create mode 100644 fs/nfs/dns_resolve.h |
| create mode 100644 net/sunrpc/addr.c |
| Merging nfsd/nfsd-next |
| $ git merge nfsd/nfsd-next |
| Resolved 'net/sunrpc/cache.c' using previous resolution. |
| Auto-merging net/sunrpc/cache.c |
| CONFLICT (content): Merge conflict in net/sunrpc/cache.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master fcf917b] Merge commit 'nfsd/nfsd-next' |
| $ git diff -M --stat --summary HEAD^.. |
| fs/lockd/clntlock.c | 2 +- |
| fs/lockd/host.c | 4 +- |
| fs/lockd/mon.c | 2 +- |
| fs/lockd/svcsubs.c | 2 +- |
| fs/nfsd/nfs4acl.c | 2 +- |
| fs/nfsd/nfs4callback.c | 11 +-- |
| fs/nfsd/nfs4state.c | 163 ++++++++++++++----------------------- |
| fs/nfsd/nfsctl.c | 3 +- |
| fs/nfsd/nfssvc.c | 23 +++++- |
| include/linux/lockd/lockd.h | 43 ---------- |
| include/linux/nfsd/state.h | 6 +- |
| include/linux/sunrpc/clnt.h | 113 +++++++++++++++++++++++++ |
| net/sunrpc/auth_gss/svcauth_gss.c | 6 +- |
| net/sunrpc/svc_xprt.c | 11 --- |
| net/sunrpc/svcsock.c | 79 ++++++++++++------- |
| 15 files changed, 264 insertions(+), 206 deletions(-) |
| Merging nilfs2/for-next |
| $ git merge nilfs2/for-next |
| Merge made by recursive. |
| fs/Kconfig | 2 +- |
| fs/nilfs2/Kconfig | 2 +- |
| fs/nilfs2/bmap.c | 151 ++----------- |
| fs/nilfs2/bmap.h | 76 +++---- |
| fs/nilfs2/btree.c | 625 +++++++++++++++++++++++-------------------------- |
| fs/nilfs2/cpfile.c | 11 +- |
| fs/nilfs2/cpfile.h | 2 - |
| fs/nilfs2/dat.c | 42 +++- |
| fs/nilfs2/dat.h | 8 +- |
| fs/nilfs2/direct.c | 161 +++++-------- |
| fs/nilfs2/ifile.h | 1 - |
| fs/nilfs2/ioctl.c | 14 +- |
| fs/nilfs2/mdt.c | 17 +- |
| fs/nilfs2/mdt.h | 3 +- |
| fs/nilfs2/segbuf.c | 4 +- |
| fs/nilfs2/segment.c | 7 +- |
| fs/nilfs2/sufile.h | 1 - |
| fs/nilfs2/super.c | 100 +++----- |
| fs/nilfs2/the_nilfs.c | 15 +- |
| fs/nilfs2/the_nilfs.h | 41 ++-- |
| 20 files changed, 541 insertions(+), 742 deletions(-) |
| Merging ocfs2/linux-next |
| $ git merge ocfs2/linux-next |
| Auto-merging fs/ocfs2/ioctl.c |
| Auto-merging include/linux/fs.h |
| Auto-merging include/linux/security.h |
| Auto-merging include/linux/syscalls.h |
| Auto-merging security/capability.c |
| Merge made by recursive. |
| Documentation/filesystems/reflink.txt | 174 ++ |
| Documentation/filesystems/vfs.txt | 4 + |
| arch/x86/ia32/ia32entry.S | 1 + |
| arch/x86/include/asm/unistd_32.h | 1 + |
| arch/x86/include/asm/unistd_64.h | 2 + |
| arch/x86/kernel/syscall_table_32.S | 1 + |
| fs/namei.c | 137 ++ |
| fs/ocfs2/Makefile | 1 + |
| fs/ocfs2/alloc.c | 1342 ++++++----- |
| fs/ocfs2/alloc.h | 101 +- |
| fs/ocfs2/aops.c | 33 +- |
| fs/ocfs2/aops.h | 2 + |
| fs/ocfs2/buffer_head_io.c | 47 +- |
| fs/ocfs2/buffer_head_io.h | 8 +- |
| fs/ocfs2/cluster/masklog.c | 1 + |
| fs/ocfs2/cluster/masklog.h | 1 + |
| fs/ocfs2/dir.c | 107 +- |
| fs/ocfs2/dlmglue.c | 100 +- |
| fs/ocfs2/dlmglue.h | 6 + |
| fs/ocfs2/extent_map.c | 33 +- |
| fs/ocfs2/extent_map.h | 8 +- |
| fs/ocfs2/file.c | 151 ++- |
| fs/ocfs2/file.h | 2 + |
| fs/ocfs2/inode.c | 86 +- |
| fs/ocfs2/inode.h | 20 +- |
| fs/ocfs2/ioctl.c | 14 + |
| fs/ocfs2/journal.c | 82 +- |
| fs/ocfs2/journal.h | 94 +- |
| fs/ocfs2/localalloc.c | 12 +- |
| fs/ocfs2/namei.c | 343 +++- |
| fs/ocfs2/namei.h | 6 + |
| fs/ocfs2/ocfs2.h | 52 +- |
| fs/ocfs2/ocfs2_fs.h | 107 +- |
| fs/ocfs2/ocfs2_lockid.h | 5 + |
| fs/ocfs2/quota_global.c | 5 +- |
| fs/ocfs2/quota_local.c | 26 +- |
| fs/ocfs2/refcounttree.c | 4249 +++++++++++++++++++++++++++++++++ |
| fs/ocfs2/refcounttree.h | 108 + |
| fs/ocfs2/resize.c | 16 +- |
| fs/ocfs2/slot_map.c | 10 +- |
| fs/ocfs2/suballoc.c | 35 +- |
| fs/ocfs2/super.c | 13 +- |
| fs/ocfs2/uptodate.c | 265 ++- |
| fs/ocfs2/uptodate.h | 51 +- |
| fs/ocfs2/xattr.c | 2056 +++++++++++++++-- |
| fs/ocfs2/xattr.h | 15 +- |
| include/linux/fcntl.h | 8 + |
| include/linux/fs.h | 2 + |
| include/linux/security.h | 23 + |
| include/linux/syscalls.h | 3 + |
| security/capability.c | 7 + |
| security/security.c | 8 + |
| 52 files changed, 8810 insertions(+), 1174 deletions(-) |
| create mode 100644 Documentation/filesystems/reflink.txt |
| create mode 100644 fs/ocfs2/refcounttree.c |
| create mode 100644 fs/ocfs2/refcounttree.h |
| Merging squashfs/master |
| $ git merge squashfs/master |
| Already up-to-date. |
| Merging udf/for_next |
| $ git merge udf/for_next |
| Merge made by recursive. |
| fs/udf/directory.c | 86 ---------------------------------------------------- |
| fs/udf/file.c | 2 + |
| fs/udf/inode.c | 19 ++++++----- |
| fs/udf/lowlevel.c | 4 -- |
| fs/udf/namei.c | 1 - |
| 5 files changed, 12 insertions(+), 100 deletions(-) |
| Merging v9fs/for-next |
| $ git merge v9fs/for-next |
| Merge made by recursive. |
| Documentation/filesystems/9p.txt | 3 + |
| fs/9p/v9fs.c | 21 ++----- |
| fs/9p/v9fs.h | 1 - |
| fs/9p/vfs_inode.c | 126 +++++++++++++++++++------------------ |
| fs/9p/vfs_super.c | 39 ++++-------- |
| net/9p/client.c | 21 +++---- |
| net/9p/error.c | 2 +- |
| net/9p/trans_fd.c | 8 +- |
| net/9p/trans_rdma.c | 9 ++- |
| net/9p/trans_virtio.c | 11 +-- |
| 10 files changed, 107 insertions(+), 134 deletions(-) |
| Merging ubifs/linux-next |
| $ git merge ubifs/linux-next |
| Merge made by recursive. |
| fs/ubifs/commit.c | 2 +- |
| fs/ubifs/key.h | 36 ------------------------------------ |
| fs/ubifs/super.c | 37 ++++++++----------------------------- |
| fs/ubifs/xattr.c | 4 ++-- |
| 4 files changed, 11 insertions(+), 68 deletions(-) |
| Merging xfs/master |
| $ git merge xfs/master |
| Resolved 'fs/xfs/linux-2.6/xfs_sync.h' using previous resolution. |
| Auto-merging fs/xfs/linux-2.6/xfs_buf.c |
| Auto-merging fs/xfs/linux-2.6/xfs_super.c |
| Auto-merging fs/xfs/linux-2.6/xfs_sync.c |
| Auto-merging fs/xfs/linux-2.6/xfs_sync.h |
| CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_sync.h |
| Auto-merging fs/xfs/xfs_bmap.c |
| Auto-merging fs/xfs/xfs_btree.c |
| Auto-merging fs/xfs/xfs_iget.c |
| Auto-merging fs/xfs/xfs_inode.c |
| Auto-merging fs/xfs/xfs_inode.h |
| Auto-merging fs/xfs/xfs_vnodeops.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 547ef2c] Merge commit 'xfs/master' |
| $ git diff -M --stat --summary HEAD^.. |
| 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_trans_buf.c | 4 ++-- |
| fs/xfs/xfs_vnodeops.c | 2 +- |
| 23 files changed, 23 insertions(+), 158 deletions(-) |
| Merging reiserfs-bkl/reiserfs/kill-bkl |
| $ git merge reiserfs-bkl/reiserfs/kill-bkl |
| Merge made by recursive. |
| fs/reiserfs/Makefile | 2 +- |
| fs/reiserfs/bitmap.c | 4 ++ |
| fs/reiserfs/dir.c | 98 ++++++++++++++++++++++++----------- |
| fs/reiserfs/do_balan.c | 17 ++---- |
| fs/reiserfs/fix_node.c | 19 ++++++-- |
| fs/reiserfs/inode.c | 84 +++++++++++++++++++------------ |
| fs/reiserfs/ioctl.c | 6 ++- |
| fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ |
| fs/reiserfs/lock.c | 88 ++++++++++++++++++++++++++++++++ |
| fs/reiserfs/namei.c | 20 +++++-- |
| fs/reiserfs/prints.c | 4 -- |
| fs/reiserfs/resize.c | 2 + |
| fs/reiserfs/stree.c | 53 ++++++++++++++++--- |
| fs/reiserfs/super.c | 52 ++++++++++++++----- |
| fs/reiserfs/xattr.c | 6 +- |
| include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- |
| include/linux/reiserfs_fs_sb.h | 20 +++++++ |
| 17 files changed, 497 insertions(+), 155 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 |
| Auto-merging drivers/video/Kconfig |
| Merge made by recursive. |
| Documentation/ABI/testing/sysfs-bus-pci | 10 + |
| Documentation/PCI/pci-error-recovery.txt | 119 ++- |
| Documentation/vgaarbiter.txt | 194 +++++ |
| 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/powerpc/kernel/pci_64.c | 1 + |
| arch/powerpc/platforms/pseries/eeh.c | 10 +- |
| 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/kernel/pci-dma.c | 4 +- |
| arch/x86/pci/amd_bus.c | 64 +-- |
| arch/x86/pci/common.c | 69 ++ |
| drivers/acpi/pci_root.c | 17 +- |
| drivers/gpu/Makefile | 2 +- |
| drivers/gpu/vga/Kconfig | 10 + |
| drivers/gpu/vga/Makefile | 1 + |
| drivers/gpu/vga/vgaarb.c | 1205 ++++++++++++++++++++++++++++++ |
| drivers/pci/Makefile | 3 + |
| drivers/pci/hotplug/acpiphp_glue.c | 28 +- |
| drivers/pci/hotplug/pci_hotplug_core.c | 3 +- |
| drivers/pci/hotplug/pciehp_hpc.c | 10 +- |
| drivers/pci/legacy.c | 34 + |
| drivers/pci/msi.c | 283 ++++---- |
| drivers/pci/pci-sysfs.c | 37 + |
| drivers/pci/pci.c | 60 ++ |
| drivers/pci/pci.h | 1 + |
| drivers/pci/pcie/aspm.c | 495 ++++++------- |
| drivers/pci/probe.c | 12 +- |
| drivers/pci/quirks.c | 4 + |
| drivers/pci/search.c | 31 - |
| drivers/pci/setup-res.c | 1 + |
| drivers/pcmcia/yenta_socket.c | 16 +- |
| drivers/video/Kconfig | 2 + |
| include/acpi/acpi_bus.h | 16 + |
| include/asm-generic/pci.h | 13 +- |
| include/linux/pci.h | 4 + |
| include/linux/pci_hotplug.h | 3 +- |
| include/linux/pci_ids.h | 3 + |
| include/linux/vgaarb.h | 200 +++++ |
| 49 files changed, 2420 insertions(+), 595 deletions(-) |
| create mode 100644 Documentation/vgaarbiter.txt |
| create mode 100644 drivers/gpu/vga/Kconfig |
| create mode 100644 drivers/gpu/vga/Makefile |
| create mode 100644 drivers/gpu/vga/vgaarb.c |
| create mode 100644 drivers/pci/legacy.c |
| create mode 100644 include/linux/vgaarb.h |
| Merging hid/for-next |
| $ git merge hid/for-next |
| 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 | 70 +++++-- |
| drivers/hid/hid-cypress.c | 4 +- |
| drivers/hid/hid-debug.c | 439 ++++++++++++++++++++++++++++++++------- |
| drivers/hid/hid-ezkey.c | 4 +- |
| drivers/hid/hid-gyration.c | 4 +- |
| drivers/hid/hid-ids.h | 14 +- |
| 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 | 12 +- |
| drivers/hid/usbhid/hid-quirks.c | 2 +- |
| drivers/hid/usbhid/hiddev.c | 2 +- |
| include/linux/hid-debug.h | 48 +++-- |
| include/linux/hid.h | 22 +-- |
| 37 files changed, 755 insertions(+), 231 deletions(-) |
| create mode 100644 drivers/hid/hid-twinhan.c |
| Merging quilt/i2c |
| $ git merge quilt/i2c |
| Auto-merging include/linux/device.h |
| Merge made by recursive. |
| drivers/base/class.c | 87 +++++++++++++++++++ |
| drivers/i2c/Kconfig | 8 ++ |
| drivers/i2c/busses/i2c-taos-evm.c | 45 ++++++----- |
| drivers/i2c/chips/tsl2550.c | 42 ++------- |
| drivers/i2c/i2c-core.c | 165 +++++++++++++++++++++++++----------- |
| include/linux/device.h | 8 ++ |
| include/linux/i2c-id.h | 11 --- |
| include/linux/i2c.h | 2 - |
| 8 files changed, 251 insertions(+), 117 deletions(-) |
| Merging quilt/jdelvare-hwmon |
| $ git merge quilt/jdelvare-hwmon |
| Auto-merging drivers/hwmon/Kconfig |
| Auto-merging drivers/hwmon/Makefile |
| 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 |
| Merge made by recursive. |
| Documentation/kernel-doc-nano-HOWTO.txt | 4 +++- |
| Documentation/kref.txt | 1 - |
| mm/mmap.c | 2 +- |
| scripts/kernel-doc | 21 ++++++++++++++++----- |
| 4 files changed, 20 insertions(+), 8 deletions(-) |
| Merging v4l-dvb/master |
| $ git merge v4l-dvb/master |
| Resolved 'arch/arm/mach-davinci/board-dm646x-evm.c' using previous resolution. |
| Resolved 'arch/arm/mach-davinci/dm355.c' using previous resolution. |
| Resolved 'arch/arm/mach-davinci/dm644x.c' using previous resolution. |
| Resolved 'arch/arm/mach-davinci/dm646x.c' using previous resolution. |
| Resolved 'arch/arm/mach-davinci/include/mach/dm355.h' using previous resolution. |
| Resolved 'arch/arm/mach-davinci/include/mach/dm644x.h' using previous resolution. |
| Auto-merging arch/arm/mach-davinci/board-dm355-evm.c |
| Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c |
| Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c |
| Auto-merging arch/arm/mach-davinci/dm355.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c |
| Auto-merging arch/arm/mach-davinci/dm644x.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c |
| Auto-merging arch/arm/mach-davinci/dm646x.c |
| CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c |
| Auto-merging arch/arm/mach-davinci/include/mach/dm355.h |
| CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h |
| Auto-merging arch/arm/mach-davinci/include/mach/dm644x.h |
| CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h |
| Auto-merging arch/arm/mach-davinci/include/mach/dm646x.h |
| Auto-merging arch/arm/mach-davinci/include/mach/mux.h |
| Removing drivers/media/radio/radio-si470x.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 0c6943b] Merge commit 'v4l-dvb/master' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/video4linux/CARDLIST.cx23885 | 2 + |
| Documentation/video4linux/CARDLIST.cx88 | 1 + |
| Documentation/video4linux/CARDLIST.em28xx | 2 +- |
| Documentation/video4linux/CARDLIST.saa7134 | 1 + |
| Documentation/video4linux/CARDLIST.tuner | 1 + |
| Documentation/video4linux/CQcam.txt | 4 +- |
| Documentation/video4linux/gspca.txt | 5 + |
| arch/arm/mach-davinci/board-dm355-evm.c | 76 +- |
| arch/arm/mach-davinci/board-dm644x-evm.c | 72 +- |
| arch/arm/mach-davinci/board-dm646x-evm.c | 122 ++ |
| arch/arm/mach-davinci/dm355.c | 83 + |
| arch/arm/mach-davinci/dm644x.c | 56 + |
| arch/arm/mach-davinci/dm646x.c | 62 + |
| arch/arm/mach-davinci/include/mach/dm355.h | 2 + |
| arch/arm/mach-davinci/include/mach/dm644x.h | 2 + |
| arch/arm/mach-davinci/include/mach/dm646x.h | 24 + |
| arch/arm/mach-davinci/include/mach/mux.h | 9 + |
| drivers/media/common/ir-keymaps.c | 103 ++ |
| drivers/media/common/tuners/tuner-types.c | 25 + |
| drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 218 +-- |
| drivers/media/dvb/bt8xx/dst.c | 2 +- |
| drivers/media/dvb/dm1105/dm1105.c | 148 ++- |
| drivers/media/dvb/dvb-core/dmxdev.c | 231 ++- |
| drivers/media/dvb/dvb-core/dmxdev.h | 9 +- |
| drivers/media/dvb/dvb-core/dvb_demux.c | 8 +- |
| drivers/media/dvb/dvb-usb/Kconfig | 6 +- |
| drivers/media/dvb/dvb-usb/af9015.c | 16 +- |
| drivers/media/dvb/dvb-usb/cinergyT2-fe.c | 1 + |
| drivers/media/dvb/dvb-usb/cxusb.c | 16 +- |
| drivers/media/dvb/dvb-usb/dib0700_devices.c | 10 +- |
| drivers/media/dvb/dvb-usb/dibusb-mc.c | 10 +- |
| drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 2 +- |
| drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 5 + |
| drivers/media/dvb/dvb-usb/dw2102.c | 181 ++- |
| drivers/media/dvb/firewire/firedtv-avc.c | 40 +- |
| drivers/media/dvb/frontends/Kconfig | 7 + |
| drivers/media/dvb/frontends/Makefile | 1 + |
| drivers/media/dvb/frontends/cx24113.c | 6 +- |
| drivers/media/dvb/frontends/cx24123.c | 2 +- |
| drivers/media/dvb/frontends/dib0070.c | 2 +- |
| drivers/media/dvb/frontends/dib7000p.c | 2 +- |
| drivers/media/dvb/frontends/dvb-pll.c | 75 + |
| drivers/media/dvb/frontends/dvb-pll.h | 4 + |
| drivers/media/dvb/frontends/lgs8gxx.c | 484 ++++- |
| drivers/media/dvb/frontends/lgs8gxx.h | 11 +- |
| drivers/media/dvb/frontends/lgs8gxx_priv.h | 12 +- |
| drivers/media/dvb/frontends/mt312.c | 7 +- |
| drivers/media/dvb/frontends/stb6100.c | 4 +- |
| drivers/media/dvb/frontends/stv0900_core.c | 8 +- |
| drivers/media/dvb/frontends/stv0900_sw.c | 2 +- |
| drivers/media/dvb/frontends/stv6110.c | 48 +- |
| drivers/media/dvb/frontends/stv6110.h | 2 +- |
| drivers/media/dvb/frontends/tda10021.c | 2 +- |
| drivers/media/dvb/frontends/tda8261.c | 4 +- |
| drivers/media/dvb/frontends/ves1820.c | 2 +- |
| drivers/media/dvb/frontends/zl10036.c | 2 +- |
| drivers/media/dvb/frontends/zl10039.c | 308 ++++ |
| drivers/media/dvb/frontends/zl10039.h | 40 + |
| drivers/media/dvb/frontends/zl10353.c | 14 +- |
| drivers/media/dvb/pluto2/pluto2.c | 2 +- |
| drivers/media/dvb/siano/Kconfig | 40 +- |
| drivers/media/dvb/siano/Makefile | 9 +- |
| drivers/media/dvb/siano/smsdvb.c | 44 + |
| drivers/media/dvb/siano/smssdio.c | 54 +- |
| drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- |
| drivers/media/radio/Kconfig | 36 +- |
| drivers/media/radio/Makefile | 2 +- |
| drivers/media/radio/radio-cadet.c | 6 +- |
| drivers/media/radio/radio-si470x.c | 1863 ------------------- |
| drivers/media/radio/si470x/Kconfig | 37 + |
| drivers/media/radio/si470x/Makefile | 9 + |
| drivers/media/radio/si470x/radio-si470x-common.c | 798 ++++++++ |
| drivers/media/radio/si470x/radio-si470x-i2c.c | 401 ++++ |
| drivers/media/radio/si470x/radio-si470x-usb.c | 988 ++++++++++ |
| drivers/media/radio/si470x/radio-si470x.h | 225 +++ |
| drivers/media/video/Kconfig | 77 +- |
| drivers/media/video/Makefile | 4 + |
| drivers/media/video/adv7343.c | 1 - |
| drivers/media/video/au0828/au0828-dvb.c | 2 +- |
| drivers/media/video/au0828/au0828-i2c.c | 1 - |
| drivers/media/video/bt8xx/bttv-driver.c | 14 +- |
| drivers/media/video/bt8xx/bttv-i2c.c | 2 - |
| drivers/media/video/cafe_ccic.c | 1 - |
| drivers/media/video/cx18/cx18-cards.c | 8 +- |
| drivers/media/video/cx18/cx18-cards.h | 18 +- |
| drivers/media/video/cx18/cx18-driver.c | 41 +- |
| drivers/media/video/cx18/cx18-fileops.c | 2 +- |
| drivers/media/video/cx18/cx18-i2c.c | 58 +- |
| drivers/media/video/cx18/cx18-ioctl.c | 2 +- |
| drivers/media/video/cx231xx/cx231xx-conf-reg.h | 8 +- |
| drivers/media/video/cx231xx/cx231xx-i2c.c | 1 - |
| drivers/media/video/cx231xx/cx231xx-video.c | 4 +- |
| drivers/media/video/cx23885/cimax2.c | 1 + |
| drivers/media/video/cx23885/cx23885-417.c | 57 +- |
| drivers/media/video/cx23885/cx23885-cards.c | 77 +- |
| drivers/media/video/cx23885/cx23885-core.c | 30 +- |
| drivers/media/video/cx23885/cx23885-dvb.c | 54 +- |
| drivers/media/video/cx23885/cx23885-i2c.c | 1 - |
| drivers/media/video/cx23885/cx23885.h | 14 +- |
| drivers/media/video/cx25840/cx25840-core.c | 15 +- |
| drivers/media/video/cx25840/cx25840-firmware.c | 13 +- |
| drivers/media/video/cx88/cx88-cards.c | 56 +- |
| drivers/media/video/cx88/cx88-dvb.c | 10 +- |
| drivers/media/video/cx88/cx88-input.c | 26 +- |
| drivers/media/video/cx88/cx88.h | 1 + |
| drivers/media/video/davinci/Makefile | 15 + |
| drivers/media/video/davinci/ccdc_hw_device.h | 110 ++ |
| drivers/media/video/davinci/dm355_ccdc.c | 978 ++++++++++ |
| drivers/media/video/davinci/dm355_ccdc_regs.h | 310 ++++ |
| drivers/media/video/davinci/dm644x_ccdc.c | 878 +++++++++ |
| drivers/media/video/davinci/dm644x_ccdc_regs.h | 145 ++ |
| drivers/media/video/davinci/vpfe_capture.c | 2124 ++++++++++++++++++++++ |
| drivers/media/video/davinci/vpif.c | 234 +++ |
| drivers/media/video/davinci/vpif.h | 632 +++++++ |
| drivers/media/video/davinci/vpif_display.c | 1679 +++++++++++++++++ |
| drivers/media/video/davinci/vpif_display.h | 175 ++ |
| drivers/media/video/davinci/vpss.c | 301 +++ |
| drivers/media/video/em28xx/em28xx-cards.c | 46 +- |
| drivers/media/video/em28xx/em28xx-i2c.c | 1 - |
| drivers/media/video/em28xx/em28xx-video.c | 161 +- |
| drivers/media/video/em28xx/em28xx.h | 1 + |
| drivers/media/video/gspca/Kconfig | 23 +- |
| drivers/media/video/gspca/Makefile | 2 + |
| drivers/media/video/gspca/conex.c | 2 +- |
| drivers/media/video/gspca/etoms.c | 4 +- |
| drivers/media/video/gspca/gspca.c | 66 +- |
| drivers/media/video/gspca/gspca.h | 5 +- |
| drivers/media/video/gspca/jeilinj.c | 388 ++++ |
| drivers/media/video/gspca/m5602/m5602_s5k83a.c | 4 +- |
| drivers/media/video/gspca/pac7311.c | 1 + |
| drivers/media/video/gspca/sn9c20x.c | 38 +- |
| drivers/media/video/gspca/sonixj.c | 21 +- |
| drivers/media/video/gspca/spca501.c | 2 +- |
| drivers/media/video/gspca/spca506.c | 2 +- |
| drivers/media/video/gspca/spca508.c | 59 +- |
| drivers/media/video/gspca/stv06xx/stv06xx.c | 4 +- |
| drivers/media/video/gspca/sunplus.c | 14 +- |
| drivers/media/video/gspca/t613.c | 210 ++-- |
| drivers/media/video/gspca/tv8532.c | 2 +- |
| drivers/media/video/gspca/vc032x.c | 873 +++++---- |
| drivers/media/video/gspca/zc3xx.c | 2 +- |
| drivers/media/video/hdpvr/hdpvr-control.c | 24 +- |
| drivers/media/video/hdpvr/hdpvr-core.c | 12 +- |
| drivers/media/video/hdpvr/hdpvr-i2c.c | 1 - |
| drivers/media/video/hdpvr/hdpvr-video.c | 6 +- |
| drivers/media/video/ir-kbd-i2c.c | 44 +- |
| drivers/media/video/ivtv/ivtv-cards.c | 70 +- |
| drivers/media/video/ivtv/ivtv-cards.h | 3 +- |
| drivers/media/video/ivtv/ivtv-driver.c | 3 +- |
| drivers/media/video/ivtv/ivtv-gpio.c | 13 - |
| drivers/media/video/ivtv/ivtv-i2c.c | 2 - |
| drivers/media/video/meye.c | 3 +- |
| drivers/media/video/pvrusb2/pvrusb2-audio.c | 5 +- |
| drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 - |
| drivers/media/video/pwc/pwc-if.c | 78 +- |
| drivers/media/video/pwc/pwc-v4l.c | 2 +- |
| drivers/media/video/pwc/pwc.h | 7 +- |
| drivers/media/video/saa6588.c | 60 +- |
| drivers/media/video/saa7134/Kconfig | 1 + |
| drivers/media/video/saa7134/saa6752hs.c | 2 +- |
| drivers/media/video/saa7134/saa7134-alsa.c | 14 +- |
| drivers/media/video/saa7134/saa7134-cards.c | 49 +- |
| drivers/media/video/saa7134/saa7134-core.c | 4 +- |
| drivers/media/video/saa7134/saa7134-dvb.c | 17 +- |
| drivers/media/video/saa7134/saa7134-input.c | 9 +- |
| drivers/media/video/saa7134/saa7134-video.c | 5 +- |
| drivers/media/video/saa7134/saa7134.h | 2 + |
| drivers/media/video/stk-webcam.c | 1 - |
| drivers/media/video/stv680.c | 9 +- |
| drivers/media/video/tuner-core.c | 4 +- |
| drivers/media/video/tveeprom.c | 4 +- |
| drivers/media/video/tvp514x.c | 1030 +++++------ |
| drivers/media/video/tvp514x_regs.h | 10 - |
| drivers/media/video/uvc/uvc_ctrl.c | 255 ++-- |
| drivers/media/video/uvc/uvc_driver.c | 570 ++++--- |
| drivers/media/video/uvc/uvc_isight.c | 7 +- |
| drivers/media/video/uvc/uvc_v4l2.c | 277 ++-- |
| drivers/media/video/uvc/uvc_video.c | 434 +++--- |
| drivers/media/video/uvc/uvcvideo.h | 278 +--- |
| drivers/media/video/v4l1-compat.c | 5 +- |
| drivers/media/video/v4l2-ioctl.c | 23 +- |
| drivers/media/video/vino.c | 1 - |
| drivers/media/video/w9968cf.c | 1 - |
| drivers/media/video/zoran/zoran_card.c | 3 +- |
| drivers/media/video/zr364xx.c | 1228 ++++++++++--- |
| include/linux/dvb/dmx.h | 2 + |
| include/linux/usb/video.h | 164 ++ |
| include/linux/videodev2.h | 64 +- |
| include/media/davinci/ccdc_types.h | 43 + |
| include/media/davinci/dm355_ccdc.h | 321 ++++ |
| include/media/davinci/dm644x_ccdc.h | 184 ++ |
| include/media/davinci/vpfe_capture.h | 198 ++ |
| include/media/davinci/vpfe_types.h | 51 + |
| include/media/davinci/vpss.h | 69 + |
| include/media/ir-common.h | 2 + |
| include/media/ir-kbd-i2c.h | 17 + |
| include/media/tuner.h | 1 + |
| include/media/tvp514x.h | 4 - |
| include/media/v4l2-subdev.h | 3 + |
| 199 files changed, 17927 insertions(+), 5004 deletions(-) |
| create mode 100644 drivers/media/dvb/frontends/zl10039.c |
| create mode 100644 drivers/media/dvb/frontends/zl10039.h |
| delete mode 100644 drivers/media/radio/radio-si470x.c |
| create mode 100644 drivers/media/radio/si470x/Kconfig |
| create mode 100644 drivers/media/radio/si470x/Makefile |
| create mode 100644 drivers/media/radio/si470x/radio-si470x-common.c |
| create mode 100644 drivers/media/radio/si470x/radio-si470x-i2c.c |
| create mode 100644 drivers/media/radio/si470x/radio-si470x-usb.c |
| create mode 100644 drivers/media/radio/si470x/radio-si470x.h |
| create mode 100644 drivers/media/video/davinci/Makefile |
| create mode 100644 drivers/media/video/davinci/ccdc_hw_device.h |
| create mode 100644 drivers/media/video/davinci/dm355_ccdc.c |
| create mode 100644 drivers/media/video/davinci/dm355_ccdc_regs.h |
| create mode 100644 drivers/media/video/davinci/dm644x_ccdc.c |
| create mode 100644 drivers/media/video/davinci/dm644x_ccdc_regs.h |
| create mode 100644 drivers/media/video/davinci/vpfe_capture.c |
| create mode 100644 drivers/media/video/davinci/vpif.c |
| create mode 100644 drivers/media/video/davinci/vpif.h |
| create mode 100644 drivers/media/video/davinci/vpif_display.c |
| create mode 100644 drivers/media/video/davinci/vpif_display.h |
| create mode 100644 drivers/media/video/davinci/vpss.c |
| create mode 100644 drivers/media/video/gspca/jeilinj.c |
| create mode 100644 include/linux/usb/video.h |
| create mode 100644 include/media/davinci/ccdc_types.h |
| create mode 100644 include/media/davinci/dm355_ccdc.h |
| create mode 100644 include/media/davinci/dm644x_ccdc.h |
| create mode 100644 include/media/davinci/vpfe_capture.h |
| create mode 100644 include/media/davinci/vpfe_types.h |
| create mode 100644 include/media/davinci/vpss.h |
| Merging quota/for_next |
| $ git merge quota/for_next |
| Already up-to-date. |
| Merging kbuild/master |
| $ git merge kbuild/master |
| Removing scripts/binoffset.c |
| Auto-merging scripts/kconfig/mconf.c |
| Merge made by recursive. |
| Documentation/dontdiff | 1 - |
| scripts/.gitignore | 1 - |
| scripts/binoffset.c | 163 ------------------------------------------- |
| scripts/extract-ikconfig | 113 ++++++++++++------------------ |
| scripts/kconfig/conf.c | 22 +++--- |
| scripts/kconfig/expr.c | 2 + |
| scripts/kconfig/gconf.c | 21 +----- |
| scripts/kconfig/lkc_proto.h | 2 + |
| scripts/kconfig/mconf.c | 78 +-------------------- |
| scripts/kconfig/menu.c | 79 +++++++++++++++++++++ |
| scripts/kconfig/qconf.cc | 10 +-- |
| usr/Makefile | 2 +- |
| 12 files changed, 150 insertions(+), 344 deletions(-) |
| delete mode 100644 scripts/binoffset.c |
| Merging kconfig/for-next |
| $ git merge kconfig/for-next |
| Resolved 'scripts/extract-ikconfig' using previous resolution. |
| Auto-merging scripts/extract-ikconfig |
| CONFLICT (content): Merge conflict in scripts/extract-ikconfig |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 901a243] Merge commit 'kconfig/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| kernel/Makefile | 2 +- |
| scripts/kconfig/Makefile | 34 +++- |
| scripts/kconfig/streamline_config.pl | 366 ++++++++++++++++++++++++++++++++++ |
| 3 files changed, 400 insertions(+), 2 deletions(-) |
| create mode 100644 scripts/kconfig/streamline_config.pl |
| Merging ide/master |
| $ git merge ide/master |
| Merge made by recursive. |
| drivers/ide/ide-cd.c | 4 +- |
| drivers/ide/ide-ioctls.c | 8 +-- |
| drivers/ide/ide-iops.c | 16 +----- |
| drivers/ide/ide-probe.c | 31 +++++++---- |
| drivers/ide/ide-proc.c | 10 +--- |
| drivers/ide/ide-tape.c | 129 +++++++++++++++++++------------------------ |
| drivers/ide/ide-taskfile.c | 126 ++++++++++++++++++++++--------------------- |
| include/linux/ide.h | 6 ++- |
| 8 files changed, 155 insertions(+), 175 deletions(-) |
| Merging libata/NEXT |
| $ git merge libata/NEXT |
| Merge made by recursive. |
| Documentation/feature-removal-schedule.txt | 18 -- |
| drivers/ata/Kconfig | 21 ++ |
| drivers/ata/Makefile | 1 + |
| drivers/ata/ahci.c | 46 +++- |
| drivers/ata/libata-acpi.c | 7 +- |
| drivers/ata/libata-core.c | 36 ++- |
| drivers/ata/libata-eh.c | 146 ++++++++++- |
| drivers/ata/libata-scsi.c | 55 ---- |
| drivers/ata/libata.h | 1 + |
| drivers/ata/pata_octeon_cf.c | 2 +- |
| drivers/ata/pata_rdc.c | 400 ++++++++++++++++++++++++++++ |
| drivers/ata/sata_inic162x.c | 2 +- |
| drivers/ata/sata_sil.c | 13 + |
| drivers/ata/sata_sil24.c | 11 + |
| include/linux/ata.h | 36 +++- |
| include/linux/libata.h | 3 +- |
| 16 files changed, 704 insertions(+), 94 deletions(-) |
| create mode 100644 drivers/ata/pata_rdc.c |
| Merging infiniband/for-next |
| $ git merge infiniband/for-next |
| Merge made by recursive. |
| Documentation/Makefile | 3 +- |
| Documentation/ummunotify/Makefile | 7 + |
| Documentation/ummunotify/ummunotify.txt | 150 +++++ |
| Documentation/ummunotify/umn-test.c | 200 ++++++ |
| drivers/char/Kconfig | 12 + |
| drivers/char/Makefile | 1 + |
| drivers/char/ummunotify.c | 566 +++++++++++++++++ |
| drivers/infiniband/core/mad.c | 57 +- |
| drivers/infiniband/core/mad_priv.h | 3 +- |
| drivers/infiniband/core/multicast.c | 10 +- |
| drivers/infiniband/core/sa_query.c | 7 +- |
| drivers/infiniband/core/smi.c | 8 + |
| drivers/infiniband/core/uverbs_main.c | 10 +- |
| drivers/infiniband/hw/amso1100/c2.c | 6 +- |
| drivers/infiniband/hw/cxgb3/cxio_hal.c | 4 +- |
| drivers/infiniband/hw/cxgb3/cxio_wr.h | 6 + |
| drivers/infiniband/hw/cxgb3/iwch.c | 32 +- |
| drivers/infiniband/hw/cxgb3/iwch_cm.c | 68 ++- |
| drivers/infiniband/hw/cxgb3/iwch_cm.h | 9 +- |
| drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 + |
| drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 + |
| drivers/infiniband/hw/ehca/ehca_main.c | 8 +- |
| drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- |
| drivers/infiniband/hw/ipath/ipath_mad.c | 2 +- |
| drivers/infiniband/hw/mlx4/main.c | 6 +- |
| drivers/infiniband/hw/mlx4/qp.c | 12 +- |
| drivers/infiniband/hw/mthca/mthca_config_reg.h | 2 - |
| drivers/infiniband/hw/mthca/mthca_main.c | 6 +- |
| drivers/infiniband/hw/mthca/mthca_qp.c | 12 +- |
| drivers/infiniband/hw/mthca/mthca_reset.c | 1 - |
| drivers/infiniband/hw/nes/nes.h | 2 +- |
| drivers/infiniband/hw/nes/nes_cm.c | 128 ++-- |
| drivers/infiniband/hw/nes/nes_cm.h | 2 - |
| drivers/infiniband/hw/nes/nes_hw.c | 767 +++++++++++++++++------- |
| drivers/infiniband/hw/nes/nes_hw.h | 103 ++++ |
| drivers/infiniband/hw/nes/nes_utils.c | 5 +- |
| drivers/infiniband/hw/nes/nes_verbs.c | 204 +++++-- |
| drivers/infiniband/hw/nes/nes_verbs.h | 16 +- |
| drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 - |
| drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 - |
| drivers/infiniband/ulp/ipoib/ipoib_main.c | 7 +- |
| drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 + |
| drivers/net/cxgb3/cxgb3_main.c | 6 +- |
| drivers/net/cxgb3/cxgb3_offload.c | 6 +- |
| drivers/net/cxgb3/cxgb3_offload.h | 8 +- |
| drivers/net/mlx4/cq.c | 1 - |
| drivers/net/mlx4/eq.c | 43 -- |
| drivers/net/mlx4/icm.c | 1 - |
| drivers/net/mlx4/main.c | 37 +- |
| drivers/net/mlx4/mcg.c | 1 - |
| drivers/net/mlx4/mlx4.h | 7 +- |
| 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 - |
| drivers/scsi/cxgb3i/cxgb3i_init.c | 12 +- |
| include/linux/Kbuild | 1 + |
| include/linux/ummunotify.h | 121 ++++ |
| 60 files changed, 2146 insertions(+), 558 deletions(-) |
| create mode 100644 Documentation/ummunotify/Makefile |
| create mode 100644 Documentation/ummunotify/ummunotify.txt |
| create mode 100644 Documentation/ummunotify/umn-test.c |
| create mode 100644 drivers/char/ummunotify.c |
| create mode 100644 include/linux/ummunotify.h |
| Merging acpi/test |
| $ git merge acpi/test |
| Auto-merging MAINTAINERS |
| Auto-merging arch/x86/kernel/apic/io_apic.c |
| Auto-merging drivers/acpi/pci_root.c |
| Auto-merging drivers/acpi/processor_idle.c |
| Auto-merging drivers/acpi/system.c |
| Auto-merging include/acpi/acpi_bus.h |
| Merge made by recursive. |
| MAINTAINERS | 8 + |
| arch/ia64/hp/common/sba_iommu.c | 7 +- |
| arch/x86/include/asm/acpi.h | 1 - |
| arch/x86/include/asm/io_apic.h | 3 +- |
| arch/x86/kernel/acpi/boot.c | 22 -- |
| arch/x86/kernel/apic/io_apic.c | 28 ++- |
| arch/x86/pci/mmconfig-shared.c | 2 + |
| drivers/acpi/Kconfig | 17 +- |
| drivers/acpi/Makefile | 2 + |
| drivers/acpi/ac.c | 2 + |
| drivers/acpi/acpi_memhotplug.c | 51 ++-- |
| drivers/acpi/acpi_pad.c | 514 +++++++++++++++++++++++++++++++++ |
| 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/battery.c | 2 + |
| drivers/acpi/blacklist.c | 2 + |
| drivers/acpi/bus.c | 2 +- |
| drivers/acpi/button.c | 2 + |
| drivers/acpi/cm_sbs.c | 2 + |
| drivers/acpi/container.c | 13 +- |
| drivers/acpi/dock.c | 10 +- |
| drivers/acpi/ec.c | 119 +++----- |
| drivers/acpi/event.c | 2 + |
| drivers/acpi/fan.c | 2 + |
| drivers/acpi/glue.c | 10 +- |
| drivers/acpi/internal.h | 22 ++- |
| drivers/acpi/numa.c | 2 + |
| drivers/acpi/pci_irq.c | 2 + |
| drivers/acpi/pci_link.c | 2 + |
| drivers/acpi/pci_root.c | 2 + |
| drivers/acpi/power.c | 2 + |
| drivers/acpi/processor_core.c | 246 ++++++++-------- |
| drivers/acpi/processor_idle.c | 12 +- |
| drivers/acpi/processor_perflib.c | 2 + |
| drivers/acpi/processor_thermal.c | 5 +- |
| drivers/acpi/processor_throttling.c | 5 +- |
| drivers/acpi/sbs.c | 2 + |
| drivers/acpi/sbshc.c | 2 + |
| drivers/acpi/scan.c | 160 +++++++---- |
| drivers/acpi/sleep.c | 14 - |
| drivers/acpi/system.c | 2 + |
| drivers/acpi/tables.c | 6 + |
| drivers/acpi/thermal.c | 2 + |
| drivers/acpi/utils.c | 2 + |
| drivers/acpi/video.c | 2 + |
| drivers/acpi/video_detect.c | 2 + |
| drivers/char/agp/hp-agp.c | 9 +- |
| drivers/ide/ide-acpi.c | 5 +- |
| drivers/pci/dmar.c | 3 +- |
| drivers/pci/hotplug/acpiphp_ibm.c | 12 +- |
| drivers/platform/x86/fujitsu-laptop.c | 4 +- |
| drivers/platform/x86/sony-laptop.c | 7 +- |
| drivers/platform/x86/wmi.c | 1 - |
| drivers/pnp/pnpacpi/core.c | 6 +- |
| include/acpi/acpi_bus.h | 16 +- |
| include/acpi/acpixf.h | 10 +- |
| include/acpi/actbl.h | 19 +- |
| include/acpi/actbl1.h | 8 +- |
| include/acpi/actypes.h | 92 +++--- |
| include/linux/acpi.h | 9 + |
| 94 files changed, 2635 insertions(+), 1355 deletions(-) |
| create mode 100644 drivers/acpi/acpi_pad.c |
| create mode 100644 drivers/acpi/acpica/utids.c |
| Merging ieee1394/for-next |
| $ git merge ieee1394/for-next |
| Merge made by recursive. |
| drivers/ieee1394/raw1394.c | 4 +++- |
| 1 files changed, 3 insertions(+), 1 deletions(-) |
| Merging ubi/linux-next |
| $ git merge ubi/linux-next |
| Merge made by recursive. |
| drivers/mtd/ubi/debug.c | 32 +++++++++++++++++++++++++++++ |
| drivers/mtd/ubi/debug.h | 2 + |
| drivers/mtd/ubi/io.c | 51 +++++++++++++++++++++++++++++++--------------- |
| drivers/mtd/ubi/scan.c | 22 +++++++++++++++++-- |
| drivers/mtd/ubi/scan.h | 2 + |
| drivers/mtd/ubi/ubi.h | 3 +- |
| 6 files changed, 91 insertions(+), 21 deletions(-) |
| Merging kvm/master |
| $ git merge kvm/master |
| Auto-merging Documentation/ioctl/ioctl-number.txt |
| Auto-merging Documentation/kernel-parameters.txt |
| Removing arch/x86/kvm/kvm_svm.h |
| Auto-merging include/linux/Kbuild |
| Removing virt/kvm/kvm_trace.c |
| Merge made by recursive. |
| Documentation/ioctl/ioctl-number.txt | 2 +- |
| Documentation/kernel-parameters.txt | 39 + |
| Documentation/kvm/api.txt | 759 ++++++++++++++ |
| arch/ia64/include/asm/kvm.h | 1 + |
| arch/ia64/include/asm/kvm_host.h | 5 +- |
| arch/ia64/include/asm/kvm_para.h | 4 + |
| arch/ia64/kvm/Kconfig | 11 +- |
| arch/ia64/kvm/Makefile | 2 +- |
| arch/ia64/kvm/kvm-ia64.c | 92 +-- |
| arch/ia64/kvm/vcpu.c | 4 +- |
| 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 | 34 +- |
| arch/powerpc/kvm/trace.h | 104 ++ |
| arch/s390/include/asm/kvm.h | 9 - |
| arch/s390/include/asm/kvm_host.h | 15 +- |
| arch/s390/include/asm/kvm_para.h | 4 + |
| 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 | 80 +- |
| 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 | 11 + |
| .../asm/{kvm_x86_emulate.h => kvm_emulate.h} | 0 |
| arch/x86/include/asm/kvm_host.h | 68 +- |
| arch/x86/include/asm/kvm_para.h | 2 + |
| arch/x86/include/asm/msr-index.h | 1 + |
| arch/x86/include/asm/vmx.h | 8 + |
| arch/x86/kvm/Kconfig | 21 +- |
| arch/x86/kvm/Makefile | 36 +- |
| arch/x86/kvm/{x86_emulate.c => emulate.c} | 364 +++++++- |
| arch/x86/kvm/i8254.c | 158 ++-- |
| arch/x86/kvm/i8254.h | 5 +- |
| arch/x86/kvm/i8259.c | 158 ++-- |
| arch/x86/kvm/irq.h | 2 +- |
| 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 | 329 +++++-- |
| arch/x86/kvm/lapic.h | 4 + |
| arch/x86/kvm/mmu.c | 586 +++++++---- |
| arch/x86/kvm/mmu.h | 4 +- |
| arch/x86/kvm/mmutrace.h | 220 ++++ |
| arch/x86/kvm/paging_tmpl.h | 141 ++-- |
| arch/x86/kvm/svm.c | 988 +++++++++++-------- |
| arch/x86/kvm/timer.c | 16 +- |
| arch/x86/kvm/trace.h | 355 +++++++ |
| arch/x86/kvm/vmx.c | 573 ++++++++---- |
| arch/x86/kvm/x86.c | 836 +++++++++++----- |
| arch/x86/kvm/x86.h | 4 + |
| arch/x86/mm/highmem_32.c | 1 + |
| include/asm-generic/Kbuild.asm | 5 + |
| include/linux/Kbuild | 4 + |
| include/linux/kvm.h | 127 ++- |
| include/linux/kvm_host.h | 164 +++- |
| include/linux/kvm_para.h | 1 + |
| include/trace/events/kvm.h | 151 +++ |
| mm/hugetlb.c | 1 + |
| virt/kvm/Kconfig | 14 + |
| virt/kvm/assigned-dev.c | 818 +++++++++++++++ |
| virt/kvm/coalesced_mmio.c | 74 +- |
| virt/kvm/coalesced_mmio.h | 1 + |
| virt/kvm/eventfd.c | 576 +++++++++++ |
| virt/kvm/ioapic.c | 142 ++- |
| virt/kvm/ioapic.h | 5 + |
| virt/kvm/iodev.h | 55 +- |
| virt/kvm/irq_comm.c | 243 +++-- |
| virt/kvm/kvm_main.c | 1046 ++++---------------- |
| virt/kvm/kvm_trace.c | 285 ------ |
| 81 files changed, 6904 insertions(+), 3166 deletions(-) |
| create mode 100644 Documentation/kvm/api.txt |
| create mode 100644 arch/powerpc/kvm/trace.h |
| rename arch/x86/include/asm/{kvm_x86_emulate.h => kvm_emulate.h} (100%) |
| rename arch/x86/kvm/{x86_emulate.c => emulate.c} (86%) |
| 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/assigned-dev.c |
| create mode 100644 virt/kvm/eventfd.c |
| delete mode 100644 virt/kvm/kvm_trace.c |
| Merging dlm/next |
| $ git merge dlm/next |
| Merge made by recursive. |
| fs/dlm/lowcomms.c | 26 ++++++++++++++++---------- |
| 1 files changed, 16 insertions(+), 10 deletions(-) |
| Merging scsi/master |
| $ git merge scsi/master |
| Merge made by recursive. |
| drivers/md/dm-mpath.c | 42 ++- |
| drivers/message/fusion/mptbase.c | 84 +-- |
| drivers/message/fusion/mptbase.h | 21 +- |
| drivers/message/fusion/mptfc.c | 19 - |
| drivers/message/fusion/mptsas.c | 45 +- |
| drivers/message/fusion/mptscsih.c | 55 +-- |
| drivers/message/fusion/mptscsih.h | 1 - |
| drivers/message/fusion/mptspi.c | 21 - |
| drivers/misc/enclosure.c | 69 ++- |
| drivers/scsi/bnx2i/bnx2i_init.c | 100 ++-- |
| drivers/scsi/bnx2i/bnx2i_iscsi.c | 13 +- |
| drivers/scsi/ch.c | 6 + |
| drivers/scsi/constants.c | 95 +++- |
| drivers/scsi/device_handler/scsi_dh.c | 56 ++- |
| drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- |
| drivers/scsi/device_handler/scsi_dh_emc.c | 59 ++- |
| drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + |
| drivers/scsi/fcoe/fcoe.c | 250 +++++--- |
| drivers/scsi/fcoe/fcoe.h | 8 +- |
| drivers/scsi/fcoe/libfcoe.c | 20 +- |
| drivers/scsi/fnic/fnic_fcs.c | 2 +- |
| drivers/scsi/fnic/fnic_main.c | 20 +- |
| drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- |
| drivers/scsi/ipr.h | 2 +- |
| drivers/scsi/libfc/fc_exch.c | 337 ++++++----- |
| drivers/scsi/libfc/fc_fcp.c | 29 - |
| drivers/scsi/libfc/fc_lport.c | 61 ++- |
| drivers/scsi/libfc/fc_rport.c | 83 ++- |
| drivers/scsi/lpfc/Makefile | 2 +- |
| drivers/scsi/lpfc/lpfc.h | 19 + |
| drivers/scsi/lpfc/lpfc_attr.c | 10 +- |
| drivers/scsi/lpfc/lpfc_bsg.c | 904 ++++++++++++++++++++++++++++ |
| drivers/scsi/lpfc/lpfc_crtn.h | 18 +- |
| drivers/scsi/lpfc/lpfc_ct.c | 2 + |
| drivers/scsi/lpfc/lpfc_els.c | 2 +- |
| drivers/scsi/lpfc/lpfc_hbadisc.c | 259 +++++++- |
| drivers/scsi/lpfc/lpfc_hw.h | 4 +- |
| drivers/scsi/lpfc/lpfc_hw4.h | 74 ++- |
| drivers/scsi/lpfc/lpfc_init.c | 134 +++-- |
| drivers/scsi/lpfc/lpfc_mbox.c | 93 ++- |
| drivers/scsi/lpfc/lpfc_mem.c | 41 +- |
| drivers/scsi/lpfc/lpfc_nl.h | 20 + |
| drivers/scsi/lpfc/lpfc_scsi.c | 7 +- |
| drivers/scsi/lpfc/lpfc_sli.c | 263 +++++++-- |
| drivers/scsi/lpfc/lpfc_sli4.h | 5 + |
| drivers/scsi/lpfc/lpfc_version.h | 2 +- |
| drivers/scsi/lpfc/lpfc_vport.c | 53 +- |
| drivers/scsi/pcmcia/nsp_cs.c | 2 +- |
| drivers/scsi/qla2xxx/qla_attr.c | 4 +- |
| drivers/scsi/qla2xxx/qla_def.h | 3 +- |
| drivers/scsi/qla2xxx/qla_fw.h | 2 +- |
| drivers/scsi/qla2xxx/qla_gs.c | 4 + |
| drivers/scsi/qla2xxx/qla_init.c | 5 +- |
| drivers/scsi/qla2xxx/qla_iocb.c | 2 +- |
| drivers/scsi/qla2xxx/qla_isr.c | 58 ++- |
| drivers/scsi/qla2xxx/qla_mbx.c | 7 +- |
| drivers/scsi/qla2xxx/qla_mid.c | 3 + |
| drivers/scsi/qla2xxx/qla_os.c | 23 +- |
| drivers/scsi/qla2xxx/qla_version.h | 2 +- |
| drivers/scsi/scsi.c | 13 +- |
| drivers/scsi/scsi_error.c | 6 +- |
| drivers/scsi/scsi_lib.c | 1 + |
| drivers/scsi/scsi_transport_fc.c | 4 +- |
| drivers/scsi/scsi_transport_sas.c | 4 - |
| drivers/scsi/ses.c | 209 ++++--- |
| include/linux/enclosure.h | 5 +- |
| include/scsi/fc_frame.h | 7 - |
| include/scsi/libfc.h | 126 ++--- |
| include/scsi/scsi_device.h | 3 + |
| include/scsi/scsi_dh.h | 5 + |
| 70 files changed, 2834 insertions(+), 1080 deletions(-) |
| create mode 100644 drivers/scsi/lpfc/lpfc_bsg.c |
| Merging async_tx/next |
| $ git merge async_tx/next |
| Already up-to-date. |
| Merging net/master |
| $ git merge net/master |
| Auto-merging Documentation/kernel-parameters.txt |
| Auto-merging MAINTAINERS |
| Auto-merging arch/sparc/kernel/sys32.S |
| Removing drivers/isdn/hisax/isdnhdlc.h |
| Auto-merging drivers/net/Kconfig |
| Auto-merging drivers/net/arm/w90p910_ether.c |
| Auto-merging drivers/net/b44.c |
| Auto-merging drivers/net/bnx2.c |
| Auto-merging drivers/net/bnx2.h |
| Auto-merging drivers/net/cxgb3/cxgb3_main.c |
| Auto-merging drivers/net/e100.c |
| Auto-merging drivers/net/fec.c |
| Auto-merging drivers/net/ibm_newemac/core.c |
| Auto-merging drivers/net/irda/au1k_ir.c |
| Auto-merging drivers/net/irda/pxaficp_ir.c |
| Auto-merging drivers/net/irda/sa1100_ir.c |
| Auto-merging drivers/net/ixp2000/ixpdev.c |
| Auto-merging drivers/net/macb.c |
| Auto-merging drivers/net/mlx4/en_tx.c |
| Removing drivers/net/netxen/netxen_nic_niu.c |
| Removing drivers/net/netxen/netxen_nic_phan_reg.h |
| Auto-merging drivers/net/smc91x.c |
| Auto-merging drivers/net/tulip/tulip_core.c |
| Auto-merging drivers/net/ucc_geth.c |
| Auto-merging drivers/net/via-rhine.c |
| Auto-merging drivers/net/via-velocity.c |
| Removing drivers/net/wireless/iwmc3200wifi/wext.c |
| Auto-merging drivers/net/wireless/orinoco/hw.c |
| Removing drivers/net/wireless/p54/p54common.c |
| Removing drivers/net/wireless/p54/p54common.h |
| Removing drivers/net/wireless/rt2x00/rt2x00rfkill.c |
| Auto-merging drivers/net/wireless/rtl818x/rtl8187_dev.c |
| Removing drivers/net/wireless/wl12xx/acx.c |
| Removing drivers/net/wireless/wl12xx/boot.c |
| Removing drivers/net/wireless/wl12xx/cmd.c |
| Removing drivers/net/wireless/wl12xx/init.c |
| Removing drivers/net/wireless/wl12xx/wl1251.c |
| Auto-merging drivers/net/yellowfin.c |
| Auto-merging drivers/s390/net/netiucv.c |
| Removing firmware/bnx2x-e1-4.8.53.0.fw.ihex |
| Removing firmware/bnx2x-e1h-4.8.53.0.fw.ihex |
| Auto-merging include/linux/pci_ids.h |
| Removing include/net/ieee802154/nl802154.h |
| Auto-merging include/net/pkt_sched.h |
| Auto-merging include/net/sch_generic.h |
| Auto-merging net/core/netpoll.c |
| Auto-merging net/ipv4/ip_gre.c |
| Auto-merging net/ipv6/af_inet6.c |
| Removing net/mac80211/wext.c |
| Merge made by recursive. |
| Documentation/connector/Makefile | 5 + |
| Documentation/connector/cn_test.c | 33 +- |
| Documentation/connector/connector.txt | 119 +- |
| Documentation/connector/ucon.c | 62 +- |
| Documentation/kernel-parameters.txt | 5 + |
| Documentation/networking/00-INDEX | 2 + |
| Documentation/networking/ieee802154.txt | 20 +- |
| MAINTAINERS | 29 +- |
| arch/alpha/include/asm/socket.h | 2 + |
| arch/arm/include/asm/socket.h | 3 + |
| arch/avr32/include/asm/socket.h | 3 + |
| arch/cris/include/asm/socket.h | 3 + |
| arch/frv/include/asm/socket.h | 3 + |
| arch/h8300/include/asm/socket.h | 3 + |
| arch/ia64/hp/sim/simeth.c | 2 +- |
| arch/ia64/include/asm/socket.h | 3 + |
| arch/m32r/include/asm/socket.h | 3 + |
| arch/m68k/include/asm/socket.h | 3 + |
| arch/mips/ar7/platform.c | 15 + |
| arch/mips/include/asm/socket.h | 2 + |
| arch/mips/kernel/scall64-n32.S | 2 +- |
| arch/mips/kernel/scall64-o32.S | 4 +- |
| arch/mn10300/include/asm/socket.h | 3 + |
| arch/parisc/include/asm/socket.h | 2 + |
| arch/powerpc/include/asm/socket.h | 3 + |
| arch/s390/include/asm/socket.h | 3 + |
| arch/sparc/include/asm/socket.h | 3 + |
| arch/sparc/kernel/sys32.S | 2 +- |
| arch/um/drivers/net_kern.c | 2 +- |
| arch/x86/include/asm/socket.h | 3 + |
| arch/xtensa/include/asm/socket.h | 3 + |
| arch/xtensa/platforms/iss/network.c | 2 +- |
| drivers/atm/horizon.c | 4 +- |
| drivers/atm/solos-pci.c | 2 +- |
| drivers/connector/cn_proc.c | 3 +- |
| drivers/connector/cn_queue.c | 7 +- |
| drivers/connector/connector.c | 6 +- |
| drivers/ieee802154/fakehard.c | 188 +- |
| drivers/isdn/Kconfig | 6 +- |
| drivers/isdn/act2000/capi.c | 3 +- |
| drivers/isdn/act2000/module.c | 31 +- |
| drivers/isdn/hardware/eicon/message.c | 4 +- |
| drivers/isdn/hardware/eicon/os_4bri.c | 3 +- |
| drivers/isdn/hardware/mISDN/Kconfig | 51 + |
| drivers/isdn/hardware/mISDN/Makefile | 8 + |
| drivers/isdn/hardware/mISDN/avmfritz.c | 1152 ++ |
| drivers/isdn/hardware/mISDN/hfcmulti.c | 23 +- |
| drivers/isdn/hardware/mISDN/hfcpci.c | 16 +- |
| drivers/isdn/hardware/mISDN/hfcsusb.c | 16 +- |
| drivers/isdn/hardware/mISDN/iohelper.h | 109 + |
| drivers/isdn/hardware/mISDN/ipac.h | 405 + |
| drivers/isdn/hardware/mISDN/isar.h | 269 + |
| drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1178 ++ |
| drivers/isdn/hardware/mISDN/mISDNipac.c | 1655 +++ |
| drivers/isdn/hardware/mISDN/mISDNisar.c | 1726 +++ |
| drivers/isdn/hardware/mISDN/netjet.c | 1156 ++ |
| drivers/isdn/hardware/mISDN/netjet.h | 58 + |
| drivers/isdn/hardware/mISDN/speedfax.c | 526 + |
| drivers/isdn/hardware/mISDN/w6692.c | 1440 +++ |
| drivers/isdn/hardware/mISDN/w6692.h | 190 + |
| drivers/isdn/hisax/Kconfig | 6 +- |
| drivers/isdn/hisax/Makefile | 4 - |
| drivers/isdn/hisax/amd7930_fn.c | 2 - |
| drivers/isdn/hisax/callc.c | 4 +- |
| drivers/isdn/hisax/hfc_pci.c | 2 - |
| drivers/isdn/hisax/hfc_sx.c | 2 - |
| drivers/isdn/hisax/icc.c | 2 - |
| drivers/isdn/hisax/isac.c | 2 - |
| drivers/isdn/hisax/isdnhdlc.h | 70 - |
| drivers/isdn/hisax/isdnl1.c | 12 +- |
| drivers/isdn/hisax/isdnl2.c | 4 +- |
| drivers/isdn/hisax/isdnl3.c | 4 +- |
| drivers/isdn/hisax/l3_1tr6.c | 20 +- |
| drivers/isdn/hisax/l3dss1.c | 26 +- |
| drivers/isdn/hisax/l3ni1.c | 26 +- |
| drivers/isdn/hisax/q931.c | 24 +- |
| drivers/isdn/hisax/st5481.h | 2 +- |
| drivers/isdn/hisax/st5481_b.c | 5 +- |
| drivers/isdn/hisax/st5481_d.c | 2 +- |
| drivers/isdn/hisax/st5481_usb.c | 11 +- |
| drivers/isdn/hisax/tei.c | 4 +- |
| drivers/isdn/hisax/w6692.c | 2 - |
| drivers/isdn/hysdn/hysdn_net.c | 2 +- |
| drivers/isdn/i4l/Kconfig | 11 + |
| drivers/isdn/i4l/Makefile | 1 + |
| drivers/isdn/i4l/isdn_net.c | 16 +- |
| drivers/isdn/i4l/isdn_ppp.c | 6 +- |
| drivers/isdn/{hisax => i4l}/isdnhdlc.c | 429 +- |
| drivers/isdn/mISDN/hwchannel.c | 15 +- |
| drivers/isdn/mISDN/layer2.c | 2 - |
| 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/Kconfig | 9 +- |
| drivers/net/Makefile | 1 + |
| 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/arm/w90p910_ether.c | 206 +- |
| drivers/net/at1700.c | 2 +- |
| drivers/net/atarilance.c | 4 +- |
| drivers/net/atl1c/atl1c_main.c | 3 + |
| drivers/net/atl1e/atl1e_main.c | 3 + |
| drivers/net/atp.c | 2 +- |
| drivers/net/au1000_eth.c | 2 +- |
| drivers/net/b44.c | 11 +- |
| drivers/net/benet/Kconfig | 1 - |
| drivers/net/benet/be.h | 60 +- |
| drivers/net/benet/be_cmds.c | 391 +- |
| drivers/net/benet/be_cmds.h | 57 +- |
| drivers/net/benet/be_ethtool.c | 21 +- |
| drivers/net/benet/be_hw.h | 3 - |
| drivers/net/benet/be_main.c | 556 +- |
| drivers/net/bfin_mac.c | 2 +- |
| drivers/net/bmac.c | 2 +- |
| drivers/net/bnx2.c | 91 +- |
| drivers/net/bnx2.h | 3 +- |
| drivers/net/bnx2x.h | 128 +- |
| drivers/net/bnx2x_dump.h | 890 +- |
| drivers/net/bnx2x_fw_defs.h | 379 +- |
| drivers/net/bnx2x_hsi.h | 435 +- |
| drivers/net/bnx2x_init.h | 320 +- |
| drivers/net/bnx2x_init_ops.h | 419 +- |
| drivers/net/bnx2x_link.c | 2578 +++-- |
| drivers/net/bnx2x_link.h | 63 +- |
| drivers/net/bnx2x_main.c | 2322 +++-- |
| drivers/net/bnx2x_reg.h | 1065 +-- |
| drivers/net/bonding/bond_3ad.c | 101 +- |
| drivers/net/bonding/bond_alb.c | 28 +- |
| drivers/net/bonding/bond_ipv6.c | 4 +- |
| drivers/net/bonding/bond_main.c | 14 +- |
| drivers/net/bonding/bond_sysfs.c | 63 +- |
| drivers/net/can/Kconfig | 7 +- |
| drivers/net/can/sja1000/ems_pci.c | 152 +- |
| drivers/net/can/sja1000/sja1000.c | 2 +- |
| drivers/net/cassini.c | 4 +- |
| drivers/net/cpmac.c | 44 +- |
| drivers/net/cris/eth_v10.c | 2 +- |
| drivers/net/cs89x0.c | 7 +- |
| 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 | 19 +- |
| 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 | 127 +- |
| 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 | 48 +- |
| 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/ethoc.c | 2 +- |
| drivers/net/ewrk3.c | 2 +- |
| drivers/net/fealnx.c | 2 +- |
| drivers/net/fec.c | 2 +- |
| drivers/net/fs_enet/mii-fec.c | 37 +- |
| drivers/net/gianfar.c | 1 - |
| 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/igb/e1000_82575.c | 193 +- |
| drivers/net/igb/e1000_82575.h | 6 +- |
| drivers/net/igb/e1000_defines.h | 8 + |
| drivers/net/igb/e1000_hw.h | 18 +- |
| drivers/net/igb/e1000_mac.c | 175 +- |
| drivers/net/igb/e1000_mac.h | 3 + |
| drivers/net/igb/e1000_phy.c | 4 +- |
| drivers/net/igb/e1000_regs.h | 1 + |
| drivers/net/igb/igb_ethtool.c | 65 +- |
| drivers/net/igb/igb_main.c | 122 +- |
| drivers/net/igbvf/netdev.c | 8 +- |
| 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 | 7 +- |
| drivers/net/ixgbe/ixgbe.h | 39 - |
| drivers/net/ixgbe/ixgbe_82598.c | 7 +- |
| drivers/net/ixgbe/ixgbe_82599.c | 156 +- |
| drivers/net/ixgbe/ixgbe_common.c | 3 +- |
| drivers/net/ixgbe/ixgbe_common.h | 1 - |
| drivers/net/ixgbe/ixgbe_dcb_nl.c | 10 + |
| drivers/net/ixgbe/ixgbe_ethtool.c | 52 +- |
| drivers/net/ixgbe/ixgbe_main.c | 23 +- |
| drivers/net/ixgbe/ixgbe_type.h | 32 +- |
| drivers/net/ixp2000/ixpdev.c | 4 +- |
| drivers/net/jazzsonic.c | 10 +- |
| drivers/net/jme.c | 189 +- |
| drivers/net/jme.h | 21 +- |
| drivers/net/korina.c | 44 +- |
| 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 | 4 +- |
| drivers/net/mipsnet.c | 2 +- |
| drivers/net/mlx4/en_main.c | 5 +- |
| drivers/net/mlx4/en_netdev.c | 18 +- |
| drivers/net/mlx4/en_resources.c | 9 +- |
| drivers/net/mlx4/en_rx.c | 111 +- |
| drivers/net/mlx4/en_tx.c | 6 +- |
| drivers/net/mlx4/mlx4_en.h | 17 +- |
| drivers/net/myri10ge/myri10ge.c | 73 +- |
| drivers/net/myri_sbus.c | 2 +- |
| drivers/net/natsemi.c | 2 +- |
| drivers/net/netx-eth.c | 2 +- |
| drivers/net/netxen/Makefile | 2 +- |
| drivers/net/netxen/netxen_nic.h | 465 +- |
| drivers/net/netxen/netxen_nic_ctx.c | 80 +- |
| drivers/net/netxen/netxen_nic_ethtool.c | 109 +- |
| drivers/net/netxen/netxen_nic_hdr.h | 95 +- |
| drivers/net/netxen/netxen_nic_hw.c | 279 +- |
| drivers/net/netxen/netxen_nic_hw.h | 125 - |
| drivers/net/netxen/netxen_nic_init.c | 357 +- |
| drivers/net/netxen/netxen_nic_main.c | 797 +- |
| drivers/net/netxen/netxen_nic_niu.c | 550 - |
| drivers/net/netxen/netxen_nic_phan_reg.h | 178 - |
| drivers/net/ni5010.c | 2 +- |
| drivers/net/ni52.c | 4 +- |
| drivers/net/ni65.c | 2 +- |
| drivers/net/niu.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 | 4 +- |
| 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/phy/broadcom.c | 233 +- |
| drivers/net/plip.c | 2 +- |
| drivers/net/ppp_generic.c | 5 +- |
| drivers/net/pppoe.c | 22 +- |
| drivers/net/qlge/qlge_main.c | 5 + |
| drivers/net/r6040.c | 23 +- |
| drivers/net/r8169.c | 245 +- |
| drivers/net/rionet.c | 7 +- |
| drivers/net/rrunner.c | 2 +- |
| drivers/net/s2io.c | 13 +- |
| drivers/net/sb1000.c | 2 +- |
| drivers/net/sb1250-mac.c | 4 +- |
| drivers/net/seeq8005.c | 4 +- |
| drivers/net/sgiseeq.c | 6 +- |
| drivers/net/sh_eth.c | 2 +- |
| drivers/net/sis900.c | 2 +- |
| drivers/net/skfp/skfddi.c | 4 +- |
| drivers/net/sky2.c | 477 +- |
| drivers/net/sky2.h | 23 +- |
| drivers/net/slip.c | 6 +- |
| drivers/net/smc911x.c | 6 +- |
| drivers/net/smc911x.h | 1 - |
| drivers/net/smc9194.c | 8 +- |
| drivers/net/smc91x.c | 4 +- |
| drivers/net/smsc911x.c | 31 +- |
| 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 | 79 +- |
| drivers/net/tg3.c | 168 +- |
| drivers/net/tg3.h | 48 +- |
| 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 | 38 +- |
| 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 | 18 +- |
| 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/rndis_host.c | 48 +- |
| drivers/net/usb/rtl8150.c | 2 +- |
| drivers/net/usb/smsc95xx.c | 5 - |
| drivers/net/usb/usbnet.c | 88 +- |
| drivers/net/veth.c | 7 +- |
| drivers/net/via-rhine.c | 6 +- |
| drivers/net/via-velocity.c | 3431 +++--- |
| drivers/net/via-velocity.h | 6 +- |
| drivers/net/virtio_net.c | 3 +- |
| drivers/net/vxge/vxge-config.c | 10 - |
| drivers/net/vxge/vxge-config.h | 17 +- |
| drivers/net/vxge/vxge-main.c | 169 +- |
| drivers/net/vxge/vxge-main.h | 8 +- |
| drivers/net/vxge/vxge-reg.h | 9 +- |
| drivers/net/vxge/vxge-traffic.c | 12 +- |
| drivers/net/vxge/vxge-traffic.h | 4 +- |
| drivers/net/vxge/vxge-version.h | 4 +- |
| 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 | 9 +- |
| drivers/net/wan/sbni.c | 4 +- |
| drivers/net/wan/wanxl.c | 2 +- |
| drivers/net/wan/x25_asy.c | 10 +- |
| drivers/net/wimax/i2400m/sdio.c | 12 +- |
| drivers/net/wireless/Kconfig | 10 +- |
| drivers/net/wireless/adm8211.c | 62 +- |
| drivers/net/wireless/airo.c | 14 +- |
| drivers/net/wireless/arlan-main.c | 4 +- |
| drivers/net/wireless/at76c50x-usb.c | 33 +- |
| drivers/net/wireless/ath/Kconfig | 19 +- |
| drivers/net/wireless/ath/ar9170/Kconfig | 4 +- |
| drivers/net/wireless/ath/ar9170/ar9170.h | 68 +- |
| drivers/net/wireless/ath/ar9170/led.c | 11 +- |
| drivers/net/wireless/ath/ar9170/mac.c | 22 +- |
| drivers/net/wireless/ath/ar9170/main.c | 748 +- |
| drivers/net/wireless/ath/ar9170/usb.c | 2 +- |
| drivers/net/wireless/ath/ath.h | 48 + |
| drivers/net/wireless/ath/ath5k/Kconfig | 3 +- |
| drivers/net/wireless/ath/ath5k/ath5k.h | 41 +- |
| drivers/net/wireless/ath/ath5k/attach.c | 63 +- |
| drivers/net/wireless/ath/ath5k/base.c | 354 +- |
| drivers/net/wireless/ath/ath5k/base.h | 29 +- |
| drivers/net/wireless/ath/ath5k/debug.c | 8 +- |
| drivers/net/wireless/ath/ath5k/eeprom.c | 10 + |
| drivers/net/wireless/ath/ath5k/eeprom.h | 4 + |
| drivers/net/wireless/ath/ath5k/phy.c | 57 +- |
| drivers/net/wireless/ath/ath5k/qcu.c | 3 +- |
| drivers/net/wireless/ath/ath5k/reg.h | 12 +- |
| drivers/net/wireless/ath/ath5k/reset.c | 156 +- |
| drivers/net/wireless/ath/ath9k/Kconfig | 13 +- |
| drivers/net/wireless/ath/ath9k/Makefile | 3 + |
| drivers/net/wireless/ath/ath9k/ahb.c | 2 +- |
| drivers/net/wireless/ath/ath9k/ani.c | 207 +- |
| drivers/net/wireless/ath/ath9k/ani.h | 25 +- |
| drivers/net/wireless/ath/ath9k/ath9k.h | 81 +- |
| drivers/net/wireless/ath/ath9k/beacon.c | 15 +- |
| drivers/net/wireless/ath/ath9k/calib.c | 185 +- |
| drivers/net/wireless/ath/ath9k/calib.h | 4 +- |
| drivers/net/wireless/ath/ath9k/debug.c | 95 +- |
| drivers/net/wireless/ath/ath9k/debug.h | 54 + |
| drivers/net/wireless/ath/ath9k/eeprom.c | 2582 +---- |
| drivers/net/wireless/ath/ath9k/eeprom.h | 284 +- |
| drivers/net/wireless/ath/ath9k/eeprom_4k.c | 1188 ++ |
| drivers/net/wireless/ath/ath9k/eeprom_9287.c | 1177 ++ |
| drivers/net/wireless/ath/ath9k/eeprom_def.c | 1387 +++ |
| drivers/net/wireless/ath/ath9k/hw.c | 619 +- |
| drivers/net/wireless/ath/ath9k/hw.h | 53 +- |
| drivers/net/wireless/ath/ath9k/initvals.h | 2229 ++++- |
| drivers/net/wireless/ath/ath9k/mac.c | 47 +- |
| drivers/net/wireless/ath/ath9k/mac.h | 8 +- |
| drivers/net/wireless/ath/ath9k/main.c | 272 +- |
| drivers/net/wireless/ath/ath9k/pci.c | 14 +- |
| drivers/net/wireless/ath/ath9k/phy.c | 65 +- |
| drivers/net/wireless/ath/ath9k/phy.h | 32 +- |
| drivers/net/wireless/ath/ath9k/rc.c | 616 +- |
| drivers/net/wireless/ath/ath9k/rc.h | 29 +- |
| drivers/net/wireless/ath/ath9k/recv.c | 140 +- |
| drivers/net/wireless/ath/ath9k/reg.h | 137 + |
| drivers/net/wireless/ath/ath9k/virtual.c | 34 +- |
| drivers/net/wireless/ath/ath9k/xmit.c | 186 +- |
| drivers/net/wireless/ath/main.c | 36 + |
| drivers/net/wireless/ath/regd.c | 2 - |
| drivers/net/wireless/ath/regd.h | 20 +- |
| drivers/net/wireless/ath/regd_common.h | 2 +- |
| drivers/net/wireless/atmel.c | 6 +- |
| drivers/net/wireless/b43/Kconfig | 14 +- |
| drivers/net/wireless/b43/b43.h | 22 +- |
| drivers/net/wireless/b43/dma.c | 23 +- |
| drivers/net/wireless/b43/lo.c | 2 +- |
| drivers/net/wireless/b43/main.c | 455 +- |
| drivers/net/wireless/b43/main.h | 2 +- |
| drivers/net/wireless/b43/phy_common.c | 9 +- |
| drivers/net/wireless/b43/phy_common.h | 5 + |
| drivers/net/wireless/b43/phy_g.c | 6 +- |
| drivers/net/wireless/b43/phy_lp.c | 1784 +++- |
| drivers/net/wireless/b43/phy_lp.h | 55 +- |
| drivers/net/wireless/b43/phy_n.c | 3 +- |
| drivers/net/wireless/b43/pio.c | 6 +- |
| drivers/net/wireless/b43/tables_lpphy.c | 2161 ++++- |
| drivers/net/wireless/b43/tables_lpphy.h | 13 + |
| drivers/net/wireless/b43/wa.c | 4 +- |
| drivers/net/wireless/b43/xmit.c | 36 +- |
| drivers/net/wireless/b43/xmit.h | 3 +- |
| drivers/net/wireless/b43legacy/dma.c | 22 +- |
| drivers/net/wireless/b43legacy/main.c | 12 +- |
| drivers/net/wireless/b43legacy/xmit.c | 3 +- |
| drivers/net/wireless/hostap/hostap_80211_tx.c | 42 +- |
| drivers/net/wireless/hostap/hostap_cs.c | 3 +- |
| drivers/net/wireless/ipw2x00/ipw2100.c | 14 +- |
| drivers/net/wireless/ipw2x00/ipw2200.c | 86 +- |
| drivers/net/wireless/ipw2x00/libipw_tx.c | 4 +- |
| drivers/net/wireless/iwlwifi/Kconfig | 3 + |
| drivers/net/wireless/iwlwifi/iwl-1000.c | 96 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 9 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-led.c | 11 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 24 +- |
| drivers/net/wireless/iwlwifi/iwl-3945.c | 94 +- |
| drivers/net/wireless/iwlwifi/iwl-3945.h | 12 +- |
| drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 6 +- |
| drivers/net/wireless/iwlwifi/iwl-4965.c | 96 +- |
| drivers/net/wireless/iwlwifi/iwl-5000.c | 149 +- |
| drivers/net/wireless/iwlwifi/iwl-6000.c | 135 +- |
| drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 266 +- |
| drivers/net/wireless/iwlwifi/iwl-agn.c | 318 +- |
| drivers/net/wireless/iwlwifi/iwl-calib.c | 13 +- |
| drivers/net/wireless/iwlwifi/iwl-commands.h | 43 +- |
| drivers/net/wireless/iwlwifi/iwl-core.c | 878 +- |
| drivers/net/wireless/iwlwifi/iwl-core.h | 88 +- |
| drivers/net/wireless/iwlwifi/iwl-csr.h | 10 +- |
| drivers/net/wireless/iwlwifi/iwl-debug.h | 36 +- |
| drivers/net/wireless/iwlwifi/iwl-debugfs.c | 1105 ++- |
| drivers/net/wireless/iwlwifi/iwl-dev.h | 289 +- |
| drivers/net/wireless/iwlwifi/iwl-eeprom.c | 262 +- |
| drivers/net/wireless/iwlwifi/iwl-eeprom.h | 44 +- |
| drivers/net/wireless/iwlwifi/iwl-hcmd.c | 65 +- |
| drivers/net/wireless/iwlwifi/iwl-helpers.h | 21 + |
| drivers/net/wireless/iwlwifi/iwl-led.c | 40 +- |
| drivers/net/wireless/iwlwifi/iwl-power.c | 802 ++- |
| drivers/net/wireless/iwlwifi/iwl-power.h | 115 +- |
| drivers/net/wireless/iwlwifi/iwl-prph.h | 5 +- |
| drivers/net/wireless/iwlwifi/iwl-rx.c | 234 +- |
| drivers/net/wireless/iwlwifi/iwl-scan.c | 39 +- |
| drivers/net/wireless/iwlwifi/iwl-sta.c | 60 +- |
| drivers/net/wireless/iwlwifi/iwl-tx.c | 134 +- |
| drivers/net/wireless/iwlwifi/iwl3945-base.c | 272 +- |
| drivers/net/wireless/iwmc3200wifi/Kconfig | 1 - |
| drivers/net/wireless/iwmc3200wifi/Makefile | 2 +- |
| drivers/net/wireless/iwmc3200wifi/cfg80211.c | 378 +- |
| drivers/net/wireless/iwmc3200wifi/commands.c | 195 +- |
| 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/hal.c | 16 +- |
| drivers/net/wireless/iwmc3200wifi/iwm.h | 39 +- |
| drivers/net/wireless/iwmc3200wifi/lmac.h | 4 + |
| drivers/net/wireless/iwmc3200wifi/main.c | 45 +- |
| drivers/net/wireless/iwmc3200wifi/netdev.c | 28 +- |
| drivers/net/wireless/iwmc3200wifi/rx.c | 132 +- |
| drivers/net/wireless/iwmc3200wifi/sdio.c | 10 +- |
| drivers/net/wireless/iwmc3200wifi/sdio.h | 3 - |
| drivers/net/wireless/iwmc3200wifi/umac.h | 8 + |
| drivers/net/wireless/iwmc3200wifi/wext.c | 723 -- |
| drivers/net/wireless/libertas/assoc.c | 24 +- |
| 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 | 10 +- |
| drivers/net/wireless/libertas/if_usb.c | 3 +- |
| drivers/net/wireless/libertas/main.c | 3 +- |
| drivers/net/wireless/libertas/wext.c | 4 +- |
| drivers/net/wireless/libertas_tf/main.c | 40 +- |
| drivers/net/wireless/mac80211_hwsim.c | 95 +- |
| drivers/net/wireless/mwl8k.c | 1539 +-- |
| 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 | 203 + |
| 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 | 786 ++- |
| drivers/net/wireless/orinoco/hw.h | 16 +- |
| drivers/net/wireless/orinoco/main.c | 1167 +-- |
| drivers/net/wireless/orinoco/main.h | 3 +- |
| drivers/net/wireless/orinoco/orinoco.h | 65 +- |
| 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 | 1053 +-- |
| drivers/net/wireless/p54/Makefile | 3 + |
| drivers/net/wireless/p54/eeprom.c | 753 ++ |
| drivers/net/wireless/p54/eeprom.h | 226 + |
| drivers/net/wireless/p54/fwio.c | 716 ++ |
| drivers/net/wireless/p54/led.c | 162 + |
| drivers/net/wireless/p54/lmac.h | 558 + |
| drivers/net/wireless/p54/main.c | 648 + |
| drivers/net/wireless/p54/p54.h | 151 +- |
| 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 | 54 +- |
| drivers/net/wireless/p54/p54usb.c | 42 +- |
| drivers/net/wireless/p54/txrx.c | 866 ++ |
| drivers/net/wireless/prism54/islpci_eth.c | 2 +- |
| drivers/net/wireless/prism54/islpci_hotplug.c | 4 +- |
| drivers/net/wireless/ray_cs.c | 9 +- |
| drivers/net/wireless/rndis_wlan.c | 926 ++- |
| drivers/net/wireless/rt2x00/Kconfig | 16 +- |
| drivers/net/wireless/rt2x00/Makefile | 1 - |
| drivers/net/wireless/rt2x00/rt2400pci.c | 10 +- |
| drivers/net/wireless/rt2x00/rt2400pci.h | 2 +- |
| drivers/net/wireless/rt2x00/rt2500pci.c | 10 +- |
| drivers/net/wireless/rt2x00/rt2500pci.h | 2 +- |
| drivers/net/wireless/rt2x00/rt2500usb.c | 24 +- |
| drivers/net/wireless/rt2x00/rt2500usb.h | 2 +- |
| drivers/net/wireless/rt2x00/rt2800usb.c | 46 +- |
| drivers/net/wireless/rt2x00/rt2800usb.h | 12 +- |
| drivers/net/wireless/rt2x00/rt2x00.h | 57 +- |
| drivers/net/wireless/rt2x00/rt2x00config.c | 24 +- |
| drivers/net/wireless/rt2x00/rt2x00crypto.c | 8 +- |
| drivers/net/wireless/rt2x00/rt2x00dev.c | 68 +- |
| drivers/net/wireless/rt2x00/rt2x00lib.h | 23 +- |
| drivers/net/wireless/rt2x00/rt2x00link.c | 168 +- |
| drivers/net/wireless/rt2x00/rt2x00mac.c | 119 +- |
| drivers/net/wireless/rt2x00/rt2x00queue.c | 30 +- |
| drivers/net/wireless/rt2x00/rt2x00queue.h | 12 +- |
| drivers/net/wireless/rt2x00/rt2x00reg.h | 4 +- |
| drivers/net/wireless/rt2x00/rt2x00rfkill.c | 127 - |
| drivers/net/wireless/rt2x00/rt61pci.c | 25 +- |
| drivers/net/wireless/rt2x00/rt61pci.h | 2 +- |
| drivers/net/wireless/rt2x00/rt73usb.c | 19 +- |
| drivers/net/wireless/rt2x00/rt73usb.h | 4 +- |
| drivers/net/wireless/rtl818x/rtl8180_dev.c | 16 +- |
| drivers/net/wireless/rtl818x/rtl8187_dev.c | 16 +- |
| drivers/net/wireless/rtl818x/rtl8187_leds.c | 10 +- |
| drivers/net/wireless/rtl818x/rtl818x.h | 14 +- |
| drivers/net/wireless/strip.c | 11 +- |
| drivers/net/wireless/wavelan.c | 2 +- |
| drivers/net/wireless/wavelan_cs.c | 4 +- |
| drivers/net/wireless/wl12xx/Kconfig | 51 +- |
| drivers/net/wireless/wl12xx/Makefile | 18 +- |
| drivers/net/wireless/wl12xx/acx.c | 689 -- |
| drivers/net/wireless/wl12xx/boot.c | 295 - |
| drivers/net/wireless/wl12xx/cmd.c | 353 - |
| drivers/net/wireless/wl12xx/init.c | 200 - |
| drivers/net/wireless/wl12xx/wl1251.c | 709 -- |
| drivers/net/wireless/wl12xx/wl1251.h | 467 +- |
| drivers/net/wireless/wl12xx/wl1251_acx.c | 918 ++ |
| .../net/wireless/wl12xx/{acx.h => wl1251_acx.h} | 345 +- |
| drivers/net/wireless/wl12xx/wl1251_boot.c | 530 + |
| .../net/wireless/wl12xx/{boot.h => wl1251_boot.h} | 13 +- |
| drivers/net/wireless/wl12xx/wl1251_cmd.c | 412 + |
| .../net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} | 196 +- |
| .../wl12xx/{debugfs.c => wl1251_debugfs.c} | 60 +- |
| .../wl12xx/{debugfs.h => wl1251_debugfs.h} | 16 +- |
| .../wireless/wl12xx/{event.c => wl1251_event.c} | 57 +- |
| .../wireless/wl12xx/{event.h => wl1251_event.h} | 12 +- |
| drivers/net/wireless/wl12xx/wl1251_init.c | 413 + |
| .../net/wireless/wl12xx/{init.h => wl1251_init.h} | 29 +- |
| drivers/net/wireless/wl12xx/wl1251_io.c | 196 + |
| drivers/net/wireless/wl12xx/wl1251_io.h | 64 + |
| .../net/wireless/wl12xx/{main.c => wl1251_main.c} | 890 +- |
| .../wireless/wl12xx/{init.h => wl1251_netlink.h} | 22 +- |
| drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} | 80 +- |
| drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} | 18 +- |
| .../net/wireless/wl12xx/{reg.h => wl1251_reg.h} | 105 +- |
| drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} | 93 +- |
| drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} | 24 +- |
| drivers/net/wireless/wl12xx/wl1251_sdio.c | 205 + |
| drivers/net/wireless/wl12xx/wl1251_spi.c | 344 + |
| drivers/net/wireless/wl12xx/wl1251_spi.h | 61 + |
| drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} | 174 +- |
| drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} | 21 +- |
| drivers/net/wireless/wl12xx/{wl12xx.h => wl1271.h} | 210 +- |
| drivers/net/wireless/wl12xx/wl1271_acx.c | 961 ++ |
| .../net/wireless/wl12xx/{acx.h => wl1271_acx.h} | 622 +- |
| drivers/net/wireless/wl12xx/wl1271_boot.c | 541 + |
| drivers/net/wireless/wl12xx/wl1271_boot.h | 72 + |
| drivers/net/wireless/wl12xx/wl1271_cmd.c | 813 ++ |
| drivers/net/wireless/wl12xx/wl1271_cmd.h | 464 + |
| .../wl12xx/{debugfs.c => wl1271_debugfs.c} | 62 +- |
| .../wl12xx/{debugfs.h => wl1271_debugfs.h} | 18 +- |
| .../wireless/wl12xx/{event.c => wl1271_event.c} | 64 +- |
| drivers/net/wireless/wl12xx/wl1271_event.h | 110 + |
| drivers/net/wireless/wl12xx/wl1271_init.c | 397 + |
| drivers/net/wireless/wl12xx/wl1271_init.h | 115 + |
| drivers/net/wireless/wl12xx/wl1271_main.c | 1394 +++ |
| drivers/net/wireless/wl12xx/wl1271_ps.c | 142 + |
| .../net/wireless/wl12xx/{debugfs.h => wl1271_ps.h} | 22 +- |
| .../net/wireless/wl12xx/{reg.h => wl1271_reg.h} | 223 +- |
| drivers/net/wireless/wl12xx/wl1271_rx.c | 200 + |
| drivers/net/wireless/wl12xx/wl1271_rx.h | 121 + |
| .../net/wireless/wl12xx/{spi.c => wl1271_spi.c} | 194 +- |
| .../net/wireless/wl12xx/{spi.h => wl1271_spi.h} | 68 +- |
| drivers/net/wireless/wl12xx/wl1271_tx.c | 378 + |
| drivers/net/wireless/wl12xx/wl1271_tx.h | 130 + |
| drivers/net/wireless/wl3501_cs.c | 3 +- |
| drivers/net/wireless/zd1201.c | 4 +- |
| drivers/net/wireless/zd1211rw/zd_chip.c | 6 +- |
| drivers/net/wireless/zd1211rw/zd_chip.h | 6 +- |
| drivers/net/wireless/zd1211rw/zd_mac.c | 51 +- |
| drivers/net/wireless/zd1211rw/zd_usb.c | 74 +- |
| drivers/net/xen-netfront.c | 4 +- |
| drivers/net/xilinx_emaclite.c | 1041 ++ |
| drivers/net/xtsonic.c | 2 +- |
| 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/ssb/pci.c | 55 +- |
| drivers/staging/agnx/xmit.c | 3 +- |
| drivers/staging/at76_usb/at76_usb.c | 8 +- |
| drivers/staging/dst/dcore.c | 3 +- |
| 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 | 93 +- |
| drivers/usb/gadget/u_ether.c | 6 +- |
| drivers/video/uvesafb.c | 3 +- |
| drivers/w1/w1_netlink.c | 3 +- |
| firmware/Makefile | 7 +- |
| firmware/WHENCE | 17 + |
| firmware/bnx2x-e1-4.8.53.0.fw.ihex |10364 ---------------- |
| firmware/bnx2x-e1-5.0.21.0.fw.ihex |10184 ++++++++++++++++ |
| firmware/bnx2x-e1h-4.8.53.0.fw.ihex |12028 ------------------ |
| firmware/bnx2x-e1h-5.0.21.0.fw.ihex |12855 ++++++++++++++++++++ |
| 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/asm-generic/socket.h | 3 + |
| include/linux/connector.h | 6 +- |
| include/linux/ethtool.h | 1 + |
| include/linux/icmpv6.h | 2 - |
| include/linux/ieee80211.h | 29 + |
| include/linux/if_arp.h | 1 - |
| include/linux/if_ether.h | 4 +- |
| include/linux/if_tun.h | 1 + |
| include/linux/isdn/hdlc.h | 82 + |
| include/linux/mISDNhw.h | 1 + |
| include/linux/mISDNif.h | 16 +- |
| include/linux/mdio.h | 2 +- |
| include/linux/mmc/sdio_ids.h | 6 + |
| include/linux/net_dropmon.h | 1 - |
| include/linux/netdevice.h | 5 +- |
| include/linux/nl80211.h | 174 +- |
| include/linux/nl802154.h | 6 +- |
| include/linux/pci_ids.h | 2 + |
| include/linux/rds.h | 12 + |
| include/linux/rfkill.h | 15 + |
| include/linux/skbuff.h | 6 +- |
| include/linux/ssb/ssb.h | 44 +- |
| include/linux/ssb/ssb_regs.h | 66 +- |
| include/linux/tipc.h | 2 + |
| include/linux/usb/rndis_host.h | 13 +- |
| include/linux/usb/usbnet.h | 15 +- |
| include/linux/wireless.h | 8 + |
| include/net/{ieee802154 => }/af_ieee802154.h | 6 +- |
| include/net/cfg80211.h | 570 +- |
| include/net/genetlink.h | 66 +- |
| include/net/{ieee802154/mac_def.h => ieee802154.h} | 4 +- |
| include/net/ieee802154/nl802154.h | 41 - |
| .../netdevice.h => ieee802154_netdev.h} | 6 +- |
| include/net/ip6_fib.h | 6 + |
| include/net/ip_vs.h | 119 +- |
| include/net/ipv6.h | 12 + |
| include/net/irda/ircomm_event.h | 2 +- |
| include/net/irda/ircomm_tty_attach.h | 4 +- |
| include/net/irda/irlap_event.h | 2 +- |
| include/net/irda/irlmp_event.h | 4 +- |
| include/net/iw_handler.h | 2 +- |
| include/net/mac80211.h | 198 +- |
| include/net/neighbour.h | 4 +- |
| include/net/net_namespace.h | 26 +- |
| include/net/netns/x_tables.h | 3 + |
| include/net/nl802154.h | 126 + |
| include/net/phonet/pn_dev.h | 2 + |
| include/net/pkt_sched.h | 3 + |
| include/net/sch_generic.h | 15 +- |
| include/net/scm.h | 2 - |
| include/net/sctp/constants.h | 4 +- |
| include/net/udp.h | 3 + |
| include/net/wpan-phy.h | 63 + |
| include/net/xfrm.h | 2 +- |
| include/trace/events/skb.h | 20 + |
| kernel/taskstats.c | 10 +- |
| net/8021q/vlan.c | 22 +- |
| net/8021q/vlan_dev.c | 39 + |
| net/8021q/vlanproc.c | 2 +- |
| net/Kconfig | 20 + |
| net/Makefile | 1 - |
| net/appletalk/ddp.c | 25 +- |
| net/atm/br2684.c | 4 +- |
| net/atm/clip.c | 12 +- |
| net/atm/lec.c | 17 +- |
| net/atm/mpc.c | 2 +- |
| net/atm/proc.c | 9 +- |
| net/bluetooth/af_bluetooth.c | 4 +- |
| net/bluetooth/bnep/netdev.c | 6 +- |
| net/bridge/br_device.c | 2 +- |
| net/bridge/br_forward.c | 3 +- |
| net/bridge/br_if.c | 1 + |
| net/bridge/br_netfilter.c | 96 +- |
| net/bridge/br_private.h | 3 + |
| net/bridge/br_stp.c | 2 +- |
| net/bridge/br_sysfs_if.c | 17 + |
| net/can/af_can.c | 18 +- |
| net/compat.c | 17 +- |
| net/core/datagram.c | 3 + |
| net/core/dev.c | 63 +- |
| net/core/ethtool.c | 16 +- |
| net/core/neighbour.c | 95 +- |
| net/core/net-sysfs.c | 2 +- |
| net/core/net_namespace.c | 35 +- |
| net/core/netpoll.c | 6 +- |
| net/core/rtnetlink.c | 21 +- |
| net/core/skbuff.c | 3 - |
| net/core/sock.c | 16 +- |
| net/dccp/ccids/ccid3.c | 4 +- |
| net/dccp/feat.c | 7 +- |
| net/dccp/proto.c | 4 +- |
| net/decnet/dn_route.c | 2 +- |
| net/econet/af_econet.c | 4 +- |
| net/ieee802154/Makefile | 2 +- |
| net/ieee802154/af_ieee802154.c | 8 +- |
| net/ieee802154/dgram.c | 78 +- |
| net/ieee802154/netlink.c | 172 +- |
| net/ieee802154/nl_policy.c | 4 +- |
| net/ieee802154/raw.c | 5 +- |
| net/ieee802154/wpan-class.c | 159 + |
| net/ipv4/af_inet.c | 12 +- |
| net/ipv4/fib_trie.c | 52 +- |
| net/ipv4/ip_gre.c | 6 +- |
| net/ipv4/ipip.c | 6 +- |
| net/ipv4/ipmr.c | 2 +- |
| net/ipv4/route.c | 2 +- |
| net/ipv4/tcp_output.c | 58 +- |
| net/ipv4/udp.c | 144 +- |
| net/ipv4/xfrm4_policy.c | 37 +- |
| net/ipv6/af_inet6.c | 20 +- |
| net/ipv6/icmp.c | 17 +- |
| net/ipv6/ip6_fib.c | 16 +- |
| net/ipv6/ip6_input.c | 6 +- |
| net/ipv6/ip6_output.c | 41 +- |
| net/ipv6/ip6_tunnel.c | 4 +- |
| net/ipv6/ip6mr.c | 2 +- |
| net/ipv6/ipv6_sockglue.c | 5 +- |
| net/ipv6/mcast.c | 1 - |
| net/ipv6/ndisc.c | 4 +- |
| net/ipv6/proc.c | 4 +- |
| net/ipv6/raw.c | 5 +- |
| net/ipv6/sit.c | 6 +- |
| net/ipv6/sysctl_net_ipv6.c | 4 +- |
| net/ipv6/udp.c | 146 +- |
| net/ipv6/xfrm6_policy.c | 38 + |
| net/irda/ircomm/ircomm_event.c | 4 +- |
| net/irda/ircomm/ircomm_tty_attach.c | 4 +- |
| net/irda/iriap.c | 4 +- |
| net/irda/irlan/irlan_common.c | 4 +- |
| net/irda/irlan/irlan_eth.c | 4 +- |
| net/irda/irlap.c | 2 +- |
| net/irda/irlap_event.c | 4 +- |
| net/irda/irlmp_event.c | 6 +- |
| net/irda/irnetlink.c | 2 +- |
| net/lapb/lapb_iface.c | 2 +- |
| net/llc/llc_proc.c | 2 +- |
| net/mac80211/Kconfig | 37 +- |
| net/mac80211/Makefile | 4 +- |
| net/mac80211/agg-tx.c | 3 - |
| net/mac80211/cfg.c | 234 +- |
| net/mac80211/debugfs.c | 2 +- |
| net/mac80211/debugfs_netdev.c | 52 +- |
| net/mac80211/debugfs_sta.c | 98 +- |
| net/mac80211/driver-ops.h | 107 +- |
| net/mac80211/driver-trace.c | 9 + |
| net/mac80211/driver-trace.h | 672 + |
| net/mac80211/event.c | 23 +- |
| net/mac80211/ibss.c | 23 +- |
| net/mac80211/ieee80211_i.h | 246 +- |
| net/mac80211/iface.c | 130 +- |
| net/mac80211/main.c | 198 +- |
| net/mac80211/mesh.c | 158 +- |
| net/mac80211/mesh.h | 35 +- |
| net/mac80211/mesh_hwmp.c | 47 +- |
| net/mac80211/mesh_pathtbl.c | 177 +- |
| net/mac80211/mesh_plink.c | 2 +- |
| net/mac80211/mlme.c | 1992 ++-- |
| net/mac80211/pm.c | 8 +- |
| net/mac80211/rate.c | 31 +- |
| net/mac80211/rc80211_minstrel.c | 23 +- |
| net/mac80211/rc80211_pid_algo.c | 28 +- |
| net/mac80211/rx.c | 222 +- |
| net/mac80211/scan.c | 368 +- |
| net/mac80211/sta_info.c | 2 + |
| net/mac80211/sta_info.h | 30 +- |
| net/mac80211/tx.c | 572 +- |
| net/mac80211/util.c | 120 +- |
| net/mac80211/wep.c | 52 +- |
| net/mac80211/wep.h | 7 +- |
| net/mac80211/wext.c | 633 - |
| net/mac80211/wme.c | 6 +- |
| net/mac80211/wme.h | 3 +- |
| net/mac80211/wpa.c | 3 +- |
| net/netfilter/ipvs/ip_vs_app.c | 19 +- |
| net/netfilter/ipvs/ip_vs_conn.c | 17 +- |
| net/netfilter/ipvs/ip_vs_core.c | 27 +- |
| net/netfilter/ipvs/ip_vs_ctl.c | 67 +- |
| net/netfilter/ipvs/ip_vs_dh.c | 7 +- |
| net/netfilter/ipvs/ip_vs_est.c | 4 + |
| net/netfilter/ipvs/ip_vs_ftp.c | 7 +- |
| net/netfilter/ipvs/ip_vs_lblc.c | 9 +- |
| net/netfilter/ipvs/ip_vs_lblcr.c | 17 +- |
| net/netfilter/ipvs/ip_vs_lc.c | 5 +- |
| net/netfilter/ipvs/ip_vs_nq.c | 5 +- |
| net/netfilter/ipvs/ip_vs_proto.c | 12 +- |
| net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 7 +- |
| net/netfilter/ipvs/ip_vs_proto_tcp.c | 7 +- |
| net/netfilter/ipvs/ip_vs_proto_udp.c | 7 +- |
| net/netfilter/ipvs/ip_vs_rr.c | 5 +- |
| net/netfilter/ipvs/ip_vs_sched.c | 41 +- |
| net/netfilter/ipvs/ip_vs_sed.c | 5 +- |
| net/netfilter/ipvs/ip_vs_sh.c | 5 +- |
| net/netfilter/ipvs/ip_vs_sync.c | 53 +- |
| net/netfilter/ipvs/ip_vs_wlc.c | 3 + |
| net/netfilter/ipvs/ip_vs_wrr.c | 7 +- |
| net/netfilter/ipvs/ip_vs_xmit.c | 43 +- |
| net/netlabel/netlabel_kapi.c | 6 +- |
| net/netlink/af_netlink.c | 72 +- |
| net/netlink/genetlink.c | 186 +- |
| net/netrom/nr_dev.c | 4 +- |
| net/packet/af_packet.c | 246 +- |
| net/phonet/datagram.c | 5 +- |
| net/phonet/pep-gprs.c | 4 +- |
| net/phonet/pep.c | 7 +- |
| net/phonet/pn_dev.c | 8 + |
| net/phonet/socket.c | 99 + |
| net/rds/Kconfig | 26 +- |
| net/rds/Makefile | 11 +- |
| net/rds/af_rds.c | 8 - |
| net/rds/bind.c | 3 + |
| net/rds/cong.c | 1 + |
| net/rds/connection.c | 54 +- |
| net/rds/ib.c | 7 +- |
| net/rds/ib.h | 18 +- |
| net/rds/ib_cm.c | 62 +- |
| net/rds/ib_rdma.c | 12 +- |
| net/rds/ib_recv.c | 53 +- |
| net/rds/ib_stats.c | 2 +- |
| net/rds/ib_sysctl.c | 12 +- |
| net/rds/info.c | 3 + |
| net/rds/iw.c | 16 +- |
| net/rds/iw.h | 1 - |
| net/rds/iw_rdma.c | 28 +- |
| net/rds/iw_send.c | 2 +- |
| net/rds/iw_stats.c | 2 +- |
| net/rds/message.c | 6 + |
| net/rds/page.c | 1 + |
| net/rds/rdma_transport.c | 16 +- |
| net/rds/rds.h | 9 +- |
| net/rds/recv.c | 28 +- |
| net/rds/send.c | 3 + |
| net/rds/stats.c | 6 +- |
| net/rds/tcp.c | 320 + |
| net/rds/tcp.h | 93 + |
| net/rds/tcp_connect.c | 153 + |
| net/rds/tcp_listen.c | 199 + |
| net/rds/tcp_recv.c | 356 + |
| net/rds/tcp_send.c | 263 + |
| net/rds/tcp_stats.c | 74 + |
| net/rds/threads.c | 2 + |
| net/rds/transport.c | 31 +- |
| net/rfkill/core.c | 14 +- |
| net/rose/rose_dev.c | 2 +- |
| net/rxrpc/ar-ack.c | 2 +- |
| net/sched/sch_generic.c | 93 +- |
| net/sched/sch_teql.c | 6 +- |
| net/sctp/debug.c | 14 +- |
| net/tipc/netlink.c | 2 +- |
| net/tipc/socket.c | 6 + |
| net/wireless/Kconfig | 43 +- |
| net/wireless/Makefile | 5 +- |
| net/wireless/chan.c | 89 + |
| net/wireless/core.c | 549 +- |
| net/wireless/core.h | 234 +- |
| net/wireless/debugfs.c | 14 +- |
| net/wireless/debugfs.h | 8 +- |
| net/wireless/ibss.c | 290 +- |
| net/wireless/mlme.c | 627 +- |
| net/wireless/nl80211.c | 1716 ++- |
| net/wireless/nl80211.h | 71 +- |
| net/wireless/reg.c | 169 +- |
| net/wireless/reg.h | 15 + |
| net/wireless/scan.c | 99 +- |
| net/wireless/sme.c | 927 ++ |
| net/wireless/util.c | 82 +- |
| net/wireless/wext-compat.c | 866 ++- |
| net/wireless/wext-compat.h | 49 + |
| net/wireless/wext-sme.c | 404 + |
| net/wireless/wext.c | 257 +- |
| 975 files changed, 98789 insertions(+), 58678 deletions(-) |
| create mode 100644 drivers/isdn/hardware/mISDN/avmfritz.c |
| create mode 100644 drivers/isdn/hardware/mISDN/iohelper.h |
| create mode 100644 drivers/isdn/hardware/mISDN/ipac.h |
| create mode 100644 drivers/isdn/hardware/mISDN/isar.h |
| create mode 100644 drivers/isdn/hardware/mISDN/mISDNinfineon.c |
| create mode 100644 drivers/isdn/hardware/mISDN/mISDNipac.c |
| create mode 100644 drivers/isdn/hardware/mISDN/mISDNisar.c |
| create mode 100644 drivers/isdn/hardware/mISDN/netjet.c |
| create mode 100644 drivers/isdn/hardware/mISDN/netjet.h |
| create mode 100644 drivers/isdn/hardware/mISDN/speedfax.c |
| create mode 100644 drivers/isdn/hardware/mISDN/w6692.c |
| create mode 100644 drivers/isdn/hardware/mISDN/w6692.h |
| delete mode 100644 drivers/isdn/hisax/isdnhdlc.h |
| rename drivers/isdn/{hisax => i4l}/isdnhdlc.c (54%) |
| delete mode 100644 drivers/net/netxen/netxen_nic_niu.c |
| delete mode 100644 drivers/net/netxen/netxen_nic_phan_reg.h |
| create mode 100644 drivers/net/phy/bcm63xx.c |
| create mode 100644 drivers/net/wireless/ath/ath.h |
| create mode 100644 drivers/net/wireless/ath/ath9k/eeprom_4k.c |
| create mode 100644 drivers/net/wireless/ath/ath9k/eeprom_9287.c |
| create mode 100644 drivers/net/wireless/ath/ath9k/eeprom_def.c |
| delete mode 100644 drivers/net/wireless/iwmc3200wifi/wext.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/boot.c |
| delete mode 100644 drivers/net/wireless/wl12xx/cmd.c |
| delete mode 100644 drivers/net/wireless/wl12xx/init.c |
| delete mode 100644 drivers/net/wireless/wl12xx/wl1251.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.c |
| copy drivers/net/wireless/wl12xx/{acx.h => wl1251_acx.h} (84%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_boot.c |
| rename drivers/net/wireless/wl12xx/{boot.h => wl1251_boot.h} (76%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.c |
| rename drivers/net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} (59%) |
| copy drivers/net/wireless/wl12xx/{debugfs.c => wl1251_debugfs.c} (92%) |
| copy drivers/net/wireless/wl12xx/{debugfs.h => wl1251_debugfs.h} (74%) |
| copy drivers/net/wireless/wl12xx/{event.c => wl1251_event.c} (57%) |
| rename drivers/net/wireless/wl12xx/{event.h => wl1251_event.h} (94%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_init.c |
| copy drivers/net/wireless/wl12xx/{init.h => wl1251_init.h} (53%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_io.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_io.h |
| rename drivers/net/wireless/wl12xx/{main.c => wl1251_main.c} (53%) |
| rename drivers/net/wireless/wl12xx/{init.h => wl1251_netlink.h} (53%) |
| rename drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} (51%) |
| rename drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} (72%) |
| copy drivers/net/wireless/wl12xx/{reg.h => wl1251_reg.h} (81%) |
| rename drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} (68%) |
| rename drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} (88%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_sdio.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_spi.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1251_spi.h |
| rename drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} (73%) |
| rename drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} (93%) |
| rename drivers/net/wireless/wl12xx/{wl12xx.h => wl1271.h} (67%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_acx.c |
| rename drivers/net/wireless/wl12xx/{acx.h => wl1271_acx.h} (73%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_boot.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_boot.h |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_cmd.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_cmd.h |
| rename drivers/net/wireless/wl12xx/{debugfs.c => wl1271_debugfs.c} (92%) |
| copy drivers/net/wireless/wl12xx/{debugfs.h => wl1271_debugfs.h} (69%) |
| rename drivers/net/wireless/wl12xx/{event.c => wl1271_event.c} (51%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_event.h |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_init.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_init.h |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_main.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_ps.c |
| rename drivers/net/wireless/wl12xx/{debugfs.h => wl1271_ps.h} (60%) |
| rename drivers/net/wireless/wl12xx/{reg.h => wl1271_reg.h} (93%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_rx.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_rx.h |
| rename drivers/net/wireless/wl12xx/{spi.c => wl1271_spi.c} (61%) |
| rename drivers/net/wireless/wl12xx/{spi.h => wl1271_spi.h} (58%) |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_tx.c |
| create mode 100644 drivers/net/wireless/wl12xx/wl1271_tx.h |
| create mode 100755 drivers/net/xilinx_emaclite.c |
| delete mode 100644 firmware/bnx2x-e1-4.8.53.0.fw.ihex |
| create mode 100644 firmware/bnx2x-e1-5.0.21.0.fw.ihex |
| delete mode 100644 firmware/bnx2x-e1h-4.8.53.0.fw.ihex |
| create mode 100644 firmware/bnx2x-e1h-5.0.21.0.fw.ihex |
| 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 include/linux/isdn/hdlc.h |
| rename include/net/{ieee802154 => }/af_ieee802154.h (95%) |
| rename include/net/{ieee802154/mac_def.h => ieee802154.h} (98%) |
| delete mode 100644 include/net/ieee802154/nl802154.h |
| rename include/net/{ieee802154/netdevice.h => ieee802154_netdev.h} (95%) |
| create mode 100644 include/net/nl802154.h |
| create mode 100644 include/net/wpan-phy.h |
| create mode 100644 net/ieee802154/wpan-class.c |
| create mode 100644 net/mac80211/driver-trace.c |
| create mode 100644 net/mac80211/driver-trace.h |
| delete mode 100644 net/mac80211/wext.c |
| create mode 100644 net/rds/tcp.c |
| create mode 100644 net/rds/tcp.h |
| create mode 100644 net/rds/tcp_connect.c |
| create mode 100644 net/rds/tcp_listen.c |
| create mode 100644 net/rds/tcp_recv.c |
| create mode 100644 net/rds/tcp_send.c |
| create mode 100644 net/rds/tcp_stats.c |
| create mode 100644 net/wireless/chan.c |
| create mode 100644 net/wireless/sme.c |
| create mode 100644 net/wireless/wext-compat.h |
| create mode 100644 net/wireless/wext-sme.c |
| Merging wireless/master |
| $ git merge wireless/master |
| Auto-merging MAINTAINERS |
| Auto-merging drivers/net/wireless/rtl818x/rtl8187_dev.c |
| Merge made by recursive. |
| MAINTAINERS | 14 +- |
| drivers/net/wireless/ath/ar9170/ar9170.h | 1 + |
| drivers/net/wireless/ath/ar9170/mac.c | 24 +- |
| drivers/net/wireless/ath/ar9170/main.c | 20 +- |
| drivers/net/wireless/ath/ath5k/ath5k.h | 1 + |
| drivers/net/wireless/ath/ath5k/attach.c | 10 + |
| drivers/net/wireless/ath/ath5k/base.c | 83 +- |
| drivers/net/wireless/ath/ath5k/led.c | 2 + |
| drivers/net/wireless/ath/ath9k/Makefile | 3 +- |
| drivers/net/wireless/ath/ath9k/ath9k.h | 5 + |
| drivers/net/wireless/ath/ath9k/btcoex.c | 319 ++++++ |
| drivers/net/wireless/ath/ath9k/btcoex.h | 98 ++ |
| drivers/net/wireless/ath/ath9k/calib.c | 35 +- |
| drivers/net/wireless/ath/ath9k/calib.h | 7 + |
| drivers/net/wireless/ath/ath9k/debug.c | 4 + |
| drivers/net/wireless/ath/ath9k/debug.h | 2 + |
| drivers/net/wireless/ath/ath9k/eeprom.c | 16 +- |
| drivers/net/wireless/ath/ath9k/hw.c | 239 ++++- |
| drivers/net/wireless/ath/ath9k/hw.h | 58 +- |
| drivers/net/wireless/ath/ath9k/initvals.h | 10 +- |
| drivers/net/wireless/ath/ath9k/main.c | 40 +- |
| drivers/net/wireless/ath/ath9k/recv.c | 7 +- |
| drivers/net/wireless/ath/ath9k/reg.h | 64 ++- |
| drivers/net/wireless/ath/ath9k/xmit.c | 9 +- |
| drivers/net/wireless/b43/phy_common.c | 27 +- |
| drivers/net/wireless/b43/phy_common.h | 3 + |
| drivers/net/wireless/b43/phy_lp.c | 121 ++-- |
| drivers/net/wireless/b43/phy_lp.h | 3 + |
| drivers/net/wireless/b43/tables_lpphy.c | 79 +- |
| drivers/net/wireless/ipw2x00/ipw2100.c | 206 ++-- |
| drivers/net/wireless/ipw2x00/ipw2100.h | 16 +- |
| drivers/net/wireless/ipw2x00/ipw2200.c | 1043 +++++++++++--------- |
| drivers/net/wireless/ipw2x00/ipw2200.h | 16 +- |
| .../net/wireless/ipw2x00/{ieee80211.h => libipw.h} | 666 +++++++------- |
| drivers/net/wireless/ipw2x00/libipw_geo.c | 82 +- |
| drivers/net/wireless/ipw2x00/libipw_module.c | 124 ++- |
| drivers/net/wireless/ipw2x00/libipw_rx.c | 403 ++++---- |
| drivers/net/wireless/ipw2x00/libipw_tx.c | 70 +- |
| drivers/net/wireless/ipw2x00/libipw_wx.c | 94 +- |
| drivers/net/wireless/iwlwifi/iwl-6000.c | 5 +- |
| drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 + |
| drivers/net/wireless/iwlwifi/iwl-agn.c | 15 +- |
| drivers/net/wireless/iwlwifi/iwl-commands.h | 19 +- |
| drivers/net/wireless/iwlwifi/iwl-core.c | 45 +- |
| drivers/net/wireless/iwlwifi/iwl-debug.h | 1 + |
| drivers/net/wireless/iwlwifi/iwl-debugfs.c | 54 + |
| drivers/net/wireless/iwlwifi/iwl-dev.h | 2 +- |
| drivers/net/wireless/iwlwifi/iwl-eeprom.c | 252 +++++ |
| drivers/net/wireless/iwlwifi/iwl-eeprom.h | 80 ++- |
| drivers/net/wireless/iwlwifi/iwl-rx.c | 10 + |
| drivers/net/wireless/iwlwifi/iwl-scan.c | 3 +- |
| drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- |
| drivers/net/wireless/iwlwifi/iwl-tx.c | 10 +- |
| drivers/net/wireless/iwlwifi/iwl3945-base.c | 9 +- |
| drivers/net/wireless/libertas/assoc.c | 57 +- |
| drivers/net/wireless/libertas/if_cs.c | 39 +- |
| drivers/net/wireless/mwl8k.c | 30 +- |
| drivers/net/wireless/p54/txrx.c | 3 + |
| drivers/net/wireless/prism54/islpci_eth.c | 4 +- |
| drivers/net/wireless/rndis_wlan.c | 17 +- |
| drivers/net/wireless/rt2x00/rt2x00mac.c | 8 - |
| drivers/net/wireless/rtl818x/Makefile | 2 +- |
| drivers/net/wireless/rtl818x/rtl8187.h | 1 + |
| drivers/net/wireless/rtl818x/rtl8187_dev.c | 31 +- |
| drivers/net/wireless/rtl818x/rtl8187_leds.c | 4 +- |
| drivers/net/wireless/rtl818x/rtl8187_rfkill.c | 63 ++ |
| drivers/net/wireless/rtl818x/rtl8187_rfkill.h | 8 + |
| drivers/net/wireless/rtl818x/rtl818x.h | 5 +- |
| drivers/ssb/driver_chipcommon_pmu.c | 94 ++ |
| include/linux/ieee80211.h | 2 +- |
| include/linux/ssb/ssb_driver_chipcommon.h | 10 + |
| include/net/iw_handler.h | 6 +- |
| include/net/mac80211.h | 11 +- |
| net/mac80211/driver-ops.h | 14 +- |
| net/mac80211/ieee80211_i.h | 8 + |
| net/mac80211/iface.c | 41 +- |
| net/mac80211/main.c | 2 - |
| net/mac80211/mesh.c | 49 +- |
| net/mac80211/mlme.c | 28 +- |
| net/mac80211/pm.c | 13 +- |
| net/mac80211/rc80211_minstrel.h | 1 - |
| net/mac80211/rc80211_minstrel_debugfs.c | 2 +- |
| net/mac80211/rx.c | 39 +- |
| net/mac80211/scan.c | 9 +- |
| net/mac80211/util.c | 10 + |
| net/wireless/Kconfig | 17 + |
| net/wireless/core.c | 58 +- |
| net/wireless/core.h | 17 +- |
| net/wireless/ibss.c | 4 +- |
| net/wireless/nl80211.c | 18 +- |
| net/wireless/scan.c | 21 +- |
| net/wireless/sme.c | 12 +- |
| net/wireless/util.c | 108 ++ |
| net/wireless/wext-compat.c | 16 +- |
| 94 files changed, 3572 insertions(+), 1842 deletions(-) |
| create mode 100644 drivers/net/wireless/ath/ath9k/btcoex.c |
| create mode 100644 drivers/net/wireless/ath/ath9k/btcoex.h |
| rename drivers/net/wireless/ipw2x00/{ieee80211.h => libipw.h} (54%) |
| create mode 100644 drivers/net/wireless/rtl818x/rtl8187_rfkill.c |
| create mode 100644 drivers/net/wireless/rtl818x/rtl8187_rfkill.h |
| 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/s390/crypto/sha512_s390.c | 36 ++ |
| arch/x86/crypto/aesni-intel_glue.c | 2 +- |
| crypto/Kconfig | 18 +- |
| crypto/Makefile | 4 +- |
| crypto/ablkcipher.c | 29 ++- |
| crypto/aes_generic.c | 9 +- |
| crypto/ahash.c | 336 +++++++++++++++++-- |
| crypto/algapi.c | 103 +++++- |
| crypto/algboss.c | 5 + |
| crypto/ansi_cprng.c | 34 +-- |
| crypto/api.c | 54 ++-- |
| crypto/authenc.c | 358 ++++++++++++++++---- |
| crypto/cryptd.c | 321 ++++++++++++------- |
| crypto/ctr.c | 2 + |
| crypto/gcm.c | 580 +++++++++++++++++++++++---------- |
| crypto/ghash-generic.c | 170 ++++++++++ |
| crypto/hmac.c | 302 ++++++++--------- |
| crypto/internal.h | 28 +-- |
| crypto/pcompress.c | 6 +- |
| crypto/rng.c | 2 +- |
| crypto/sha1_generic.c | 41 ++- |
| crypto/sha256_generic.c | 100 +++--- |
| crypto/sha512_generic.c | 48 +-- |
| crypto/shash.c | 270 +++++++++++---- |
| crypto/tcrypt.c | 18 +- |
| crypto/testmgr.c | 21 +- |
| crypto/xcbc.c | 370 ++++++++------------- |
| drivers/char/hw_random/amd-rng.c | 4 +- |
| drivers/char/hw_random/geode-rng.c | 3 +- |
| drivers/char/random.c | 14 + |
| drivers/crypto/Kconfig | 15 +- |
| drivers/crypto/Makefile | 1 + |
| drivers/crypto/amcc/crypto4xx_alg.c | 3 +- |
| drivers/crypto/amcc/crypto4xx_core.c | 73 ++--- |
| drivers/crypto/amcc/crypto4xx_core.h | 25 ++- |
| drivers/crypto/mv_cesa.c | 606 ++++++++++++++++++++++++++++++++++ |
| drivers/crypto/mv_cesa.h | 119 +++++++ |
| drivers/crypto/padlock-sha.c | 329 ++++++++++--------- |
| drivers/crypto/talitos.c | 216 ++++++------- |
| drivers/crypto/talitos.h | 1 + |
| include/crypto/algapi.h | 37 ++- |
| include/crypto/cryptd.h | 17 + |
| include/crypto/hash.h | 147 ++++++--- |
| include/crypto/internal/hash.h | 147 ++++++++- |
| include/crypto/sha.h | 20 ++ |
| include/linux/crypto.h | 43 +--- |
| include/linux/fips.h | 10 + |
| 50 files changed, 3670 insertions(+), 1490 deletions(-) |
| create mode 100644 crypto/ghash-generic.c |
| create mode 100644 drivers/crypto/mv_cesa.c |
| create mode 100644 drivers/crypto/mv_cesa.h |
| create mode 100644 include/linux/fips.h |
| Merging sound/for-next |
| $ git merge sound/for-next |
| Auto-merging Documentation/feature-removal-schedule.txt |
| Auto-merging arch/arm/mach-omap2/mcbsp.c |
| Auto-merging arch/arm/plat-omap/dma.c |
| Auto-merging arch/arm/plat-omap/include/mach/mcbsp.h |
| Auto-merging arch/arm/plat-omap/mcbsp.c |
| Auto-merging include/linux/fs.h |
| Auto-merging sound/arm/pxa2xx-ac97.c |
| Auto-merging sound/soc/atmel/sam9g20_wm8731.c |
| Auto-merging sound/soc/davinci/davinci-pcm.c |
| Merge made by recursive. |
| Documentation/feature-removal-schedule.txt | 24 + |
| Documentation/sound/alsa/ALSA-Configuration.txt | 4 + |
| Documentation/sound/alsa/HD-Audio-Models.txt | 31 +- |
| Documentation/sound/alsa/HD-Audio.txt | 64 + |
| arch/arm/mach-omap2/mcbsp.c | 5 + |
| arch/arm/mach-pxa/include/mach/audio.h | 3 + |
| arch/arm/plat-omap/dma.c | 10 + |
| arch/arm/plat-omap/include/mach/mcbsp.h | 51 +- |
| arch/arm/plat-omap/mcbsp.c | 401 ++- |
| arch/arm/plat-s3c/include/plat/audio-simtec.h | 37 + |
| arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h | 5 + |
| fs/char_dev.c | 39 +- |
| include/linux/fs.h | 19 +- |
| include/linux/tty.h | 4 +- |
| include/sound/ac97_codec.h | 9 + |
| include/sound/memalloc.h | 6 + |
| include/sound/pcm.h | 23 + |
| include/sound/sh_fsi.h | 83 + |
| include/sound/soc-dai.h | 40 +- |
| include/sound/soc-dapm.h | 10 + |
| include/sound/soc.h | 48 +- |
| include/sound/tlv.h | 14 + |
| include/sound/uda1380.h | 22 + |
| include/sound/wm8993.h | 44 + |
| include/sound/ymfpci.h | 1 + |
| sound/Kconfig | 28 + |
| sound/arm/pxa2xx-ac97.c | 10 + |
| sound/arm/pxa2xx-pcm-lib.c | 3 + |
| sound/core/Kconfig | 4 + |
| sound/core/Makefile | 2 +- |
| sound/core/control.c | 34 +- |
| sound/core/info.c | 4 +- |
| sound/core/memalloc.c | 4 + |
| sound/core/pcm_memory.c | 2 + |
| sound/core/pcm_native.c | 12 + |
| 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/oss/midibuf.c | 7 +- |
| sound/oss/vwsnd.c | 6 +- |
| sound/pci/Kconfig | 4 +- |
| sound/pci/ali5451/ali5451.c | 65 - |
| sound/pci/azt3328.c | 1116 ++++--- |
| sound/pci/azt3328.h | 103 +- |
| sound/pci/ctxfi/ct20k2reg.h | 9 +- |
| sound/pci/ctxfi/ctamixer.c | 20 +- |
| sound/pci/ctxfi/ctatc.c | 77 +- |
| sound/pci/ctxfi/ctdaio.c | 30 +- |
| sound/pci/ctxfi/cthw20k1.c | 22 +- |
| sound/pci/ctxfi/cthw20k2.c | 73 +- |
| sound/pci/ctxfi/ctmixer.c | 8 +- |
| sound/pci/ctxfi/ctpcm.c | 6 +- |
| sound/pci/ctxfi/ctresource.c | 4 +- |
| sound/pci/ctxfi/ctsrc.c | 10 +- |
| sound/pci/ctxfi/ctvmem.c | 6 +- |
| sound/pci/hda/Kconfig | 27 + |
| sound/pci/hda/Makefile | 4 + |
| sound/pci/hda/hda_beep.c | 4 + |
| sound/pci/hda/hda_codec.c | 66 +- |
| sound/pci/hda/hda_codec.h | 10 +- |
| sound/pci/hda/hda_generic.c | 18 +- |
| sound/pci/hda/hda_hwdep.c | 236 ++- |
| sound/pci/hda/hda_intel.c | 74 +- |
| sound/pci/hda/hda_local.h | 14 +- |
| sound/pci/hda/hda_proc.c | 7 +- |
| sound/pci/hda/patch_analog.c | 3 +- |
| sound/pci/hda/patch_atihdmi.c | 3 +- |
| sound/pci/hda/patch_ca0110.c | 3 +- |
| sound/pci/hda/patch_cirrus.c | 1194 ++++++ |
| sound/pci/hda/patch_cmedia.c | 3 +- |
| sound/pci/hda/patch_conexant.c | 479 +++ |
| sound/pci/hda/patch_intelhdmi.c | 104 +- |
| sound/pci/hda/patch_realtek.c | 4015 ++++++++++----------- |
| sound/pci/hda/patch_sigmatel.c | 886 +++-- |
| sound/pci/hda/patch_via.c | 3 +- |
| sound/pci/ice1712/ice1712.h | 9 + |
| sound/pci/ice1712/ice1724.c | 112 +- |
| sound/pci/ice1712/prodigy_hifi.c | 46 +- |
| sound/pci/rme9652/hdsp.c | 39 +- |
| sound/pci/ymfpci/ymfpci_main.c | 20 +- |
| sound/soc/Kconfig | 1 + |
| sound/soc/Makefile | 3 +- |
| sound/soc/atmel/sam9g20_wm8731.c | 138 +- |
| sound/soc/blackfin/Kconfig | 23 +- |
| sound/soc/blackfin/Makefile | 6 + |
| sound/soc/blackfin/bf5xx-ac97.c | 10 +- |
| sound/soc/blackfin/bf5xx-ad1938.c | 142 + |
| sound/soc/blackfin/bf5xx-ad73311.c | 16 +- |
| sound/soc/blackfin/bf5xx-i2s.c | 8 +- |
| sound/soc/blackfin/bf5xx-ssm2602.c | 16 +- |
| sound/soc/blackfin/bf5xx-tdm-pcm.c | 330 ++ |
| sound/soc/blackfin/bf5xx-tdm-pcm.h | 21 + |
| sound/soc/blackfin/bf5xx-tdm.c | 343 ++ |
| sound/soc/blackfin/bf5xx-tdm.h | 14 + |
| sound/soc/codecs/Kconfig | 44 + |
| sound/soc/codecs/Makefile | 26 + |
| sound/soc/codecs/ad1836.c | 446 +++ |
| sound/soc/codecs/ad1836.h | 64 + |
| sound/soc/codecs/ad1938.c | 682 ++++ |
| sound/soc/codecs/ad1938.h | 100 + |
| sound/soc/codecs/ak4535.c | 16 - |
| sound/soc/codecs/ak4642.c | 502 +++ |
| sound/soc/codecs/ak4642.h | 20 + |
| sound/soc/codecs/cs4270.c | 27 +- |
| sound/soc/codecs/cx20442.c | 501 +++ |
| sound/soc/codecs/cx20442.h | 20 + |
| sound/soc/codecs/max9877.c | 308 ++ |
| sound/soc/codecs/max9877.h | 37 + |
| sound/soc/codecs/spdif_transciever.c | 3 + |
| sound/soc/codecs/stac9766.c | 4 +- |
| sound/soc/codecs/tlv320aic3x.c | 233 +- |
| sound/soc/codecs/tlv320aic3x.h | 2 - |
| sound/soc/codecs/twl4030.c | 260 +- |
| sound/soc/codecs/twl4030.h | 2 + |
| sound/soc/codecs/uda134x.c | 2 +- |
| sound/soc/codecs/uda1380.c | 313 +- |
| sound/soc/codecs/uda1380.h | 8 - |
| sound/soc/codecs/wm8350.c | 49 +- |
| sound/soc/codecs/wm8400.c | 26 +- |
| sound/soc/codecs/wm8510.c | 175 +- |
| sound/soc/codecs/wm8523.c | 699 ++++ |
| sound/soc/codecs/wm8523.h | 160 + |
| sound/soc/codecs/wm8580.c | 209 +- |
| sound/soc/codecs/wm8728.c | 111 +- |
| sound/soc/codecs/wm8731.c | 218 +- |
| sound/soc/codecs/wm8750.c | 154 +- |
| sound/soc/codecs/wm8753.c | 35 + |
| sound/soc/codecs/wm8776.c | 744 ++++ |
| sound/soc/codecs/wm8776.h | 51 + |
| sound/soc/codecs/wm8900.c | 345 +-- |
| sound/soc/codecs/wm8903.c | 267 +- |
| sound/soc/codecs/wm8940.c | 160 +- |
| sound/soc/codecs/wm8960.c | 233 +- |
| sound/soc/codecs/wm8961.c | 1265 +++++++ |
| sound/soc/codecs/wm8961.h | 866 +++++ |
| sound/soc/codecs/wm8971.c | 127 +- |
| sound/soc/codecs/wm8974.c | 808 +++++ |
| sound/soc/codecs/wm8974.h | 99 + |
| sound/soc/codecs/wm8988.c | 180 +- |
| sound/soc/codecs/wm8990.c | 194 +- |
| sound/soc/codecs/wm8993.c | 1675 +++++++++ |
| sound/soc/codecs/wm8993.h | 2132 +++++++++++ |
| sound/soc/codecs/wm9081.c | 317 +- |
| sound/soc/codecs/wm9705.c | 2 +- |
| sound/soc/codecs/wm_hubs.c | 751 ++++ |
| sound/soc/codecs/wm_hubs.h | 24 + |
| sound/soc/davinci/Kconfig | 33 + |
| sound/soc/davinci/Makefile | 5 + |
| sound/soc/davinci/davinci-evm.c | 154 +- |
| sound/soc/davinci/davinci-i2s.c | 340 +- |
| sound/soc/davinci/davinci-mcasp.c | 973 +++++ |
| sound/soc/davinci/davinci-mcasp.h | 60 + |
| sound/soc/davinci/davinci-pcm.c | 10 +- |
| sound/soc/davinci/davinci-pcm.h | 19 +- |
| sound/soc/fsl/mpc5200_dma.c | 17 + |
| sound/soc/fsl/mpc5200_psc_ac97.c | 3 +- |
| sound/soc/imx/Kconfig | 21 + |
| sound/soc/imx/Makefile | 10 + |
| sound/soc/imx/mx1_mx2-pcm.c | 488 +++ |
| sound/soc/imx/mx1_mx2-pcm.h | 26 + |
| sound/soc/imx/mx27vis_wm8974.c | 317 ++ |
| sound/soc/imx/mxc-ssi.c | 868 +++++ |
| sound/soc/imx/mxc-ssi.h | 238 ++ |
| sound/soc/omap/Kconfig | 15 + |
| sound/soc/omap/Makefile | 4 + |
| sound/soc/omap/ams-delta.c | 646 ++++ |
| sound/soc/omap/n810.c | 12 +- |
| sound/soc/omap/omap-mcbsp.c | 82 +- |
| sound/soc/omap/omap-pcm.c | 53 +- |
| sound/soc/omap/omap-pcm.h | 2 + |
| sound/soc/omap/sdp3430.c | 18 +- |
| sound/soc/omap/zoom2.c | 314 ++ |
| sound/soc/pxa/magician.c | 56 +- |
| sound/soc/pxa/palm27x.c | 204 +- |
| sound/soc/pxa/pxa-ssp.c | 77 +- |
| sound/soc/pxa/pxa2xx-ac97.c | 12 +- |
| sound/soc/s3c24xx/Kconfig | 35 +- |
| sound/soc/s3c24xx/Makefile | 9 + |
| sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 498 +++ |
| sound/soc/s3c24xx/s3c-i2s-v2.c | 17 +- |
| sound/soc/s3c24xx/s3c2443-ac97.c | 20 +- |
| sound/soc/s3c24xx/s3c24xx-i2s.c | 5 + |
| sound/soc/s3c24xx/s3c24xx-pcm.c | 2 +- |
| sound/soc/s3c24xx/s3c24xx_simtec.c | 394 ++ |
| sound/soc/s3c24xx/s3c24xx_simtec.h | 22 + |
| sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 153 + |
| sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 137 + |
| sound/soc/s6000/s6105-ipcam.c | 12 +- |
| sound/soc/sh/Kconfig | 15 +- |
| sound/soc/sh/Makefile | 4 + |
| sound/soc/sh/fsi-ak4642.c | 107 + |
| sound/soc/sh/fsi.c | 1004 +++++ |
| sound/soc/soc-cache.c | 218 ++ |
| sound/soc/soc-core.c | 148 +- |
| sound/soc/soc-dapm.c | 498 +++- |
| sound/soc/soc-jack.c | 24 +- |
| sound/soc/txx9/txx9aclc.c | 10 +- |
| sound/sound_core.c | 100 +- |
| sound/usb/usbaudio.c | 2 + |
| sound/usb/usbmidi.c | 290 +- |
| sound/usb/usbmixer.c | 73 +- |
| 203 files changed, 29485 insertions(+), 6318 deletions(-) |
| create mode 100644 arch/arm/plat-s3c/include/plat/audio-simtec.h |
| create mode 100644 include/sound/sh_fsi.h |
| create mode 100644 include/sound/uda1380.h |
| create mode 100644 include/sound/wm8993.h |
| create mode 100644 sound/pci/hda/patch_cirrus.c |
| create mode 100644 sound/soc/blackfin/bf5xx-ad1938.c |
| create mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.c |
| create mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h |
| create mode 100644 sound/soc/blackfin/bf5xx-tdm.c |
| create mode 100644 sound/soc/blackfin/bf5xx-tdm.h |
| create mode 100644 sound/soc/codecs/ad1836.c |
| create mode 100644 sound/soc/codecs/ad1836.h |
| create mode 100644 sound/soc/codecs/ad1938.c |
| create mode 100644 sound/soc/codecs/ad1938.h |
| create mode 100644 sound/soc/codecs/ak4642.c |
| create mode 100644 sound/soc/codecs/ak4642.h |
| create mode 100644 sound/soc/codecs/cx20442.c |
| create mode 100644 sound/soc/codecs/cx20442.h |
| create mode 100644 sound/soc/codecs/max9877.c |
| create mode 100644 sound/soc/codecs/max9877.h |
| create mode 100644 sound/soc/codecs/wm8523.c |
| create mode 100644 sound/soc/codecs/wm8523.h |
| create mode 100644 sound/soc/codecs/wm8776.c |
| create mode 100644 sound/soc/codecs/wm8776.h |
| create mode 100644 sound/soc/codecs/wm8961.c |
| create mode 100644 sound/soc/codecs/wm8961.h |
| create mode 100644 sound/soc/codecs/wm8974.c |
| create mode 100644 sound/soc/codecs/wm8974.h |
| create mode 100644 sound/soc/codecs/wm8993.c |
| create mode 100644 sound/soc/codecs/wm8993.h |
| create mode 100644 sound/soc/codecs/wm_hubs.c |
| create mode 100644 sound/soc/codecs/wm_hubs.h |
| create mode 100644 sound/soc/davinci/davinci-mcasp.c |
| create mode 100644 sound/soc/davinci/davinci-mcasp.h |
| create mode 100644 sound/soc/imx/Kconfig |
| create mode 100644 sound/soc/imx/Makefile |
| create mode 100644 sound/soc/imx/mx1_mx2-pcm.c |
| create mode 100644 sound/soc/imx/mx1_mx2-pcm.h |
| create mode 100644 sound/soc/imx/mx27vis_wm8974.c |
| create mode 100644 sound/soc/imx/mxc-ssi.c |
| create mode 100644 sound/soc/imx/mxc-ssi.h |
| create mode 100644 sound/soc/omap/ams-delta.c |
| create mode 100644 sound/soc/omap/zoom2.c |
| create mode 100644 sound/soc/s3c24xx/neo1973_gta02_wm8753.c |
| create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec.c |
| create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec.h |
| create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec_hermes.c |
| create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c |
| create mode 100644 sound/soc/sh/fsi-ak4642.c |
| create mode 100644 sound/soc/sh/fsi.c |
| create mode 100644 sound/soc/soc-cache.c |
| Merging cpufreq/next |
| $ git merge cpufreq/next |
| Merge made by recursive. |
| Documentation/cpu-freq/user-guide.txt | 9 +- |
| drivers/cpufreq/cpufreq.c | 560 +++++++++++++++++++++------------ |
| drivers/cpufreq/cpufreq_ondemand.c | 139 +++++++-- |
| drivers/cpufreq/cpufreq_userspace.c | 34 ++- |
| include/linux/cpufreq.h | 14 +- |
| 5 files changed, 523 insertions(+), 233 deletions(-) |
| Merging quilt/rr |
| $ git merge quilt/rr |
| Resolved 'include/linux/cpumask.h' using previous resolution. |
| Auto-merging arch/arm/include/asm/mmu_context.h |
| Auto-merging arch/mips/kernel/smtc.c |
| Auto-merging arch/mips/mm/c-octeon.c |
| Auto-merging arch/powerpc/include/asm/smp.h |
| Auto-merging arch/powerpc/platforms/powermac/smp.c |
| Auto-merging arch/x86/kernel/apic/io_apic.c |
| Auto-merging arch/x86/kernel/process.c |
| Auto-merging arch/x86/mm/tlb.c |
| Auto-merging drivers/acpi/processor_perflib.c |
| Auto-merging drivers/acpi/processor_throttling.c |
| Auto-merging drivers/net/virtio_net.c |
| Auto-merging include/linux/cpumask.h |
| CONFLICT (content): Merge conflict in include/linux/cpumask.h |
| Auto-merging include/linux/pci.h |
| Auto-merging include/linux/sched.h |
| Auto-merging init/main.c |
| Auto-merging kernel/smp.c |
| Auto-merging kernel/trace/trace.c |
| Auto-merging net/9p/trans_virtio.c |
| Auto-merging virt/kvm/kvm_main.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 263a692] Merge branch 'quilt/rr' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/lguest/lguest.c | 26 +- |
| 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/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/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/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 | 10 +- |
| arch/x86/mm/tlb.c | 15 +- |
| arch/x86/xen/mmu.c | 4 +- |
| drivers/acpi/osl.c | 2 +- |
| drivers/acpi/processor_perflib.c | 3 +- |
| drivers/acpi/processor_throttling.c | 97 ++-- |
| drivers/block/virtio_blk.c | 3 +- |
| drivers/char/hw_random/virtio-rng.c | 3 +- |
| drivers/char/virtio_console.c | 5 +- |
| drivers/firmware/dcdbas.c | 49 +-- |
| drivers/lguest/core.c | 5 +- |
| drivers/lguest/page_tables.c | 45 +- |
| drivers/net/sfc/efx.c | 3 +- |
| drivers/net/virtio_net.c | 289 +++++------ |
| drivers/oprofile/buffer_sync.c | 3 +- |
| drivers/virtio/virtio_balloon.c | 3 +- |
| drivers/virtio/virtio_pci.c | 115 +++-- |
| drivers/virtio/virtio_ring.c | 6 +- |
| include/asm-generic/topology.h | 17 - |
| include/linux/cpumask.h | 709 +++++++++----------------- |
| include/linux/interrupt.h | 2 - |
| include/linux/pci.h | 4 +- |
| include/linux/sched.h | 3 + |
| include/linux/smp.h | 11 - |
| include/linux/topology.h | 6 - |
| include/linux/virtio.h | 2 +- |
| include/linux/virtio_9p.h | 2 - |
| include/linux/virtio_balloon.h | 3 - |
| include/linux/virtio_blk.h | 3 - |
| include/linux/virtio_console.h | 3 - |
| include/linux/virtio_ids.h | 17 + |
| include/linux/virtio_net.h | 3 - |
| include/linux/virtio_rng.h | 3 - |
| init/main.c | 5 - |
| kernel/smp.c | 7 - |
| kernel/trace/trace.c | 7 +- |
| mm/quicklist.c | 3 +- |
| net/9p/trans_virtio.c | 5 +- |
| virt/kvm/kvm_main.c | 3 +- |
| 100 files changed, 769 insertions(+), 1092 deletions(-) |
| create mode 100644 include/linux/virtio_ids.h |
| Merging mmc/next |
| $ git merge mmc/next |
| Already up-to-date. |
| Merging input/next |
| $ git merge input/next |
| Resolved 'drivers/base/platform.c' using previous resolution. |
| Auto-merging drivers/base/platform.c |
| CONFLICT (content): Merge conflict in drivers/base/platform.c |
| Auto-merging drivers/base/power/main.c |
| Auto-merging drivers/input/misc/wistron_btns.c |
| Removing drivers/input/mouse/hil_ptr.c |
| Auto-merging drivers/input/touchscreen/ucb1400_ts.c |
| Auto-merging drivers/pci/pci-driver.c |
| Auto-merging include/linux/device.h |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 012f323] Merge commit 'input/next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/input/sentelic.txt | 475 +++++++++++ |
| arch/arm/mach-pxa/include/mach/pxa27x_keypad.h | 3 +- |
| .../arm/mach-w90x900/include/mach/w90p910_keypad.h | 15 + |
| arch/blackfin/include/asm/bfin_rotary.h | 39 + |
| drivers/input/joystick/xpad.c | 2 + |
| drivers/input/keyboard/Kconfig | 15 +- |
| drivers/input/keyboard/Makefile | 1 + |
| drivers/input/keyboard/bf54x-keys.c | 26 +- |
| drivers/input/keyboard/gpio_keys.c | 19 +- |
| drivers/input/keyboard/hil_kbd.c | 607 +++++++++----- |
| drivers/input/keyboard/lkkbd.c | 62 +- |
| drivers/input/keyboard/pxa27x_keypad.c | 62 +- |
| drivers/input/keyboard/sh_keysc.c | 22 +- |
| drivers/input/keyboard/sunkbd.c | 26 +- |
| drivers/input/keyboard/w90p910_keypad.c | 291 +++++++ |
| drivers/input/misc/Kconfig | 10 + |
| drivers/input/misc/Makefile | 1 + |
| drivers/input/misc/bfin_rotary.c | 283 +++++++ |
| drivers/input/misc/cobalt_btns.c | 2 +- |
| drivers/input/misc/dm355evm_keys.c | 42 +- |
| drivers/input/misc/wistron_btns.c | 66 +- |
| drivers/input/mouse/Kconfig | 16 +- |
| drivers/input/mouse/Makefile | 2 +- |
| drivers/input/mouse/hgpk.c | 55 ++- |
| drivers/input/mouse/hil_ptr.c | 447 ---------- |
| drivers/input/mouse/psmouse-base.c | 26 +- |
| drivers/input/mouse/psmouse.h | 22 +- |
| drivers/input/mouse/sentelic.c | 867 ++++++++++++++++++++ |
| drivers/input/mouse/sentelic.h | 98 +++ |
| drivers/input/mouse/vsxxxaa.c | 8 +- |
| drivers/input/serio/at32psif.c | 2 +- |
| drivers/input/serio/i8042.c | 44 +- |
| drivers/input/serio/libps2.c | 15 +- |
| drivers/input/serio/serio.c | 23 +- |
| drivers/input/touchscreen/Kconfig | 16 +- |
| drivers/input/touchscreen/atmel_tsadcc.c | 8 +- |
| drivers/input/touchscreen/eeti_ts.c | 22 +- |
| drivers/input/touchscreen/h3600_ts_input.c | 9 +- |
| drivers/input/touchscreen/mainstone-wm97xx.c | 53 +- |
| drivers/input/touchscreen/tsc2007.c | 264 +++--- |
| drivers/input/touchscreen/ucb1400_ts.c | 5 +- |
| drivers/input/touchscreen/usbtouchscreen.c | 81 ++ |
| drivers/input/touchscreen/w90p910_ts.c | 34 +- |
| drivers/input/touchscreen/wm97xx-core.c | 6 +- |
| include/linux/input/eeti_ts.h | 9 + |
| include/linux/libps2.h | 1 + |
| include/linux/serio.h | 2 - |
| include/linux/wm97xx.h | 7 + |
| 48 files changed, 3151 insertions(+), 1060 deletions(-) |
| create mode 100644 Documentation/input/sentelic.txt |
| create mode 100644 arch/arm/mach-w90x900/include/mach/w90p910_keypad.h |
| create mode 100644 arch/blackfin/include/asm/bfin_rotary.h |
| create mode 100644 drivers/input/keyboard/w90p910_keypad.c |
| create mode 100644 drivers/input/misc/bfin_rotary.c |
| delete mode 100644 drivers/input/mouse/hil_ptr.c |
| create mode 100644 drivers/input/mouse/sentelic.c |
| create mode 100644 drivers/input/mouse/sentelic.h |
| create mode 100644 include/linux/input/eeti_ts.h |
| 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 drivers/staging/dst/dcore.c |
| Auto-merging include/linux/interrupt.h |
| Merge made by recursive. |
| block/Makefile | 2 +- |
| block/blk-core.c | 156 ++++++++++++++++++++++++----- |
| block/blk-iopoll.c | 227 +++++++++++++++++++++++++++++++++++++++++++ |
| block/blk-merge.c | 49 ++++++++- |
| block/blk.h | 1 + |
| block/cfq-iosched.c | 69 +++++-------- |
| block/elevator.c | 16 +-- |
| block/genhd.c | 18 +++- |
| drivers/block/cciss.c | 4 +- |
| drivers/block/loop.c | 2 +- |
| drivers/block/osdblk.c | 2 +- |
| drivers/block/paride/pcd.c | 12 +-- |
| drivers/block/sx8.c | 4 +- |
| drivers/block/viodasd.c | 12 +-- |
| drivers/md/dm-raid1.c | 2 +- |
| drivers/md/dm-stripe.c | 2 +- |
| drivers/md/dm.c | 12 +- |
| drivers/md/linear.c | 2 +- |
| drivers/md/multipath.c | 4 +- |
| drivers/md/raid0.c | 2 +- |
| drivers/md/raid1.c | 14 ++- |
| drivers/md/raid10.c | 6 +- |
| drivers/md/raid5.c | 2 +- |
| drivers/scsi/scsi_lib.c | 6 +- |
| drivers/staging/dst/dcore.c | 5 +- |
| fs/btrfs/volumes.c | 4 +- |
| fs/splice.c | 8 +- |
| include/linux/bio.h | 69 ++++++------- |
| include/linux/blk-iopoll.h | 48 +++++++++ |
| include/linux/blkdev.h | 32 +++++-- |
| include/linux/interrupt.h | 1 + |
| kernel/sysctl.c | 10 ++- |
| 32 files changed, 616 insertions(+), 187 deletions(-) |
| create mode 100644 block/blk-iopoll.c |
| create mode 100644 include/linux/blk-iopoll.h |
| 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/ds2760_battery.c | 141 +++++++++++++++++++++++----- |
| drivers/power/olpc_battery.c | 50 ++++++++++ |
| drivers/power/power_supply_core.c | 44 +++++++-- |
| drivers/power/power_supply_sysfs.c | 12 +++ |
| drivers/power/wm8350_power.c | 22 +++++ |
| include/linux/power_supply.h | 21 ++++ |
| 7 files changed, 266 insertions(+), 31 deletions(-) |
| 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 include/linux/sched.h |
| Merge made by recursive. |
| arch/x86/kernel/kgdb.c | 12 ++++++++---- |
| include/linux/sched.h | 4 ++++ |
| kernel/kgdb.c | 31 +++++++++++++++++++++++-------- |
| kernel/softlockup.c | 16 ++++++++++++++++ |
| 4 files changed, 51 insertions(+), 12 deletions(-) |
| Merging slab/for-next |
| $ git merge slab/for-next |
| Auto-merging init/Kconfig |
| Auto-merging lib/Kconfig.debug |
| 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/slob_def.h | 5 - |
| include/linux/slqb_def.h | 301 ++++ |
| include/linux/slub_def.h | 2 - |
| init/Kconfig | 28 +- |
| lib/Kconfig.debug | 20 + |
| mm/Makefile | 1 + |
| mm/slob.c | 5 + |
| mm/slqb.c | 3768 +++++++++++++++++++++++++++++++++++++++++++ |
| mm/slub.c | 51 +- |
| 14 files changed, 5247 insertions(+), 30 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 |
| Resolved 'drivers/input/misc/Kconfig' using previous resolution. |
| Auto-merging MAINTAINERS |
| Auto-merging drivers/hwmon/Kconfig |
| Auto-merging drivers/hwmon/Makefile |
| Auto-merging drivers/input/misc/Kconfig |
| CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig |
| Auto-merging drivers/input/misc/Makefile |
| Auto-merging drivers/input/touchscreen/Kconfig |
| Auto-merging drivers/rtc/Kconfig |
| Auto-merging drivers/rtc/Makefile |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 9a0e9c4] Merge commit 'mfd/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/hwmon/wm831x | 37 + |
| Documentation/hwmon/wm8350 | 26 + |
| MAINTAINERS | 18 + |
| drivers/gpio/Kconfig | 7 + |
| drivers/gpio/Makefile | 1 + |
| drivers/gpio/wm831x-gpio.c | 252 ++++++ |
| drivers/hwmon/Kconfig | 21 + |
| drivers/hwmon/Makefile | 2 + |
| drivers/hwmon/wm831x-hwmon.c | 226 +++++ |
| drivers/hwmon/wm8350-hwmon.c | 151 ++++ |
| drivers/input/misc/Kconfig | 20 + |
| drivers/input/misc/Makefile | 3 + |
| drivers/input/misc/pcap_keys.c | 144 ++++ |
| drivers/input/misc/wm831x-on.c | 163 ++++ |
| drivers/input/touchscreen/Kconfig | 9 + |
| drivers/input/touchscreen/Makefile | 1 + |
| drivers/input/touchscreen/pcap_ts.c | 271 ++++++ |
| drivers/mfd/Kconfig | 20 + |
| drivers/mfd/Makefile | 4 + |
| drivers/mfd/ab3100-core.c | 57 +- |
| drivers/mfd/dm355evm_msp.c | 12 +- |
| drivers/mfd/ezx-pcap.c | 105 ++- |
| drivers/mfd/mc13783-core.c | 427 ++++++++++ |
| drivers/mfd/mfd-core.c | 2 +- |
| drivers/mfd/pcf50633-adc.c | 32 +- |
| drivers/mfd/pcf50633-core.c | 5 +- |
| drivers/mfd/twl4030-core.c | 13 + |
| drivers/mfd/twl4030-irq.c | 2 +- |
| drivers/mfd/wm831x-core.c | 1549 ++++++++++++++++++++++++++++++++++ |
| drivers/mfd/wm831x-irq.c | 559 ++++++++++++ |
| drivers/mfd/wm831x-otp.c | 83 ++ |
| drivers/mfd/wm8350-core.c | 3 + |
| drivers/regulator/Kconfig | 22 + |
| drivers/regulator/Makefile | 5 + |
| drivers/regulator/core.c | 24 + |
| drivers/regulator/mc13783.c | 410 +++++++++ |
| drivers/regulator/pcap-regulator.c | 318 +++++++ |
| drivers/regulator/wm831x-dcdc.c | 862 +++++++++++++++++++ |
| drivers/regulator/wm831x-isink.c | 260 ++++++ |
| drivers/regulator/wm831x-ldo.c | 852 +++++++++++++++++++ |
| drivers/rtc/Kconfig | 10 + |
| drivers/rtc/Makefile | 1 + |
| drivers/rtc/rtc-wm831x.c | 538 ++++++++++++ |
| include/linux/mfd/ab3100.h | 8 +- |
| include/linux/mfd/core.h | 1 + |
| include/linux/mfd/ezx-pcap.h | 7 +- |
| include/linux/mfd/mc13783-private.h | 396 +++++++++ |
| include/linux/mfd/mc13783.h | 84 ++ |
| include/linux/mfd/pcf50633/adc.h | 3 +- |
| include/linux/mfd/pcf50633/core.h | 1 + |
| include/linux/mfd/wm831x/auxadc.h | 216 +++++ |
| include/linux/mfd/wm831x/core.h | 289 +++++++ |
| include/linux/mfd/wm831x/gpio.h | 55 ++ |
| include/linux/mfd/wm831x/irq.h | 764 +++++++++++++++++ |
| include/linux/mfd/wm831x/otp.h | 162 ++++ |
| include/linux/mfd/wm831x/pdata.h | 113 +++ |
| include/linux/mfd/wm831x/regulator.h | 1218 ++++++++++++++++++++++++++ |
| include/linux/mfd/wm8350/core.h | 6 + |
| include/linux/regulator/driver.h | 2 + |
| 59 files changed, 10765 insertions(+), 87 deletions(-) |
| create mode 100644 Documentation/hwmon/wm831x |
| create mode 100644 Documentation/hwmon/wm8350 |
| create mode 100644 drivers/gpio/wm831x-gpio.c |
| create mode 100644 drivers/hwmon/wm831x-hwmon.c |
| create mode 100644 drivers/hwmon/wm8350-hwmon.c |
| create mode 100644 drivers/input/misc/pcap_keys.c |
| create mode 100644 drivers/input/misc/wm831x-on.c |
| create mode 100644 drivers/input/touchscreen/pcap_ts.c |
| create mode 100644 drivers/mfd/mc13783-core.c |
| create mode 100644 drivers/mfd/wm831x-core.c |
| create mode 100644 drivers/mfd/wm831x-irq.c |
| create mode 100644 drivers/mfd/wm831x-otp.c |
| create mode 100644 drivers/regulator/mc13783.c |
| create mode 100644 drivers/regulator/pcap-regulator.c |
| create mode 100644 drivers/regulator/wm831x-dcdc.c |
| create mode 100644 drivers/regulator/wm831x-isink.c |
| create mode 100644 drivers/regulator/wm831x-ldo.c |
| create mode 100644 drivers/rtc/rtc-wm831x.c |
| create mode 100644 include/linux/mfd/mc13783-private.h |
| create mode 100644 include/linux/mfd/mc13783.h |
| create mode 100644 include/linux/mfd/wm831x/auxadc.h |
| create mode 100644 include/linux/mfd/wm831x/core.h |
| create mode 100644 include/linux/mfd/wm831x/gpio.h |
| create mode 100644 include/linux/mfd/wm831x/irq.h |
| create mode 100644 include/linux/mfd/wm831x/otp.h |
| create mode 100644 include/linux/mfd/wm831x/pdata.h |
| create mode 100644 include/linux/mfd/wm831x/regulator.h |
| Merging hdlc/hdlc-next |
| $ git merge hdlc/hdlc-next |
| Already up-to-date. |
| Merging drm/drm-next |
| $ git merge drm/drm-next |
| Auto-merging drivers/gpu/drm/drm_sysfs.c |
| Auto-merging drivers/gpu/drm/radeon/r300.c |
| Merge made by recursive. |
| drivers/gpu/drm/Makefile | 2 +- |
| drivers/gpu/drm/drm_crtc.c | 76 +++- |
| drivers/gpu/drm/drm_crtc_helper.c | 44 +- |
| drivers/gpu/drm/drm_drv.c | 4 +- |
| drivers/gpu/drm/drm_edid.c | 70 +++- |
| drivers/gpu/drm/drm_encoder_slave.c | 116 +++++ |
| drivers/gpu/drm/drm_modes.c | 424 ++++++++++++++++++- |
| drivers/gpu/drm/drm_sysfs.c | 28 ++ |
| drivers/gpu/drm/i915/i915_dma.c | 35 +- |
| drivers/gpu/drm/i915/intel_lvds.c | 22 +- |
| drivers/gpu/drm/i915/intel_sdvo.c | 41 +- |
| drivers/gpu/drm/radeon/Makefile | 15 + |
| drivers/gpu/drm/radeon/mkregtable.c | 726 +++++++++++++++++++++++++++++++ |
| drivers/gpu/drm/radeon/r300.c | 45 +-- |
| drivers/gpu/drm/radeon/radeon_object.h | 1 + |
| drivers/gpu/drm/radeon/radeon_ttm.c | 33 ++- |
| drivers/gpu/drm/radeon/reg_srcs/r300 | 728 ++++++++++++++++++++++++++++++++ |
| drivers/gpu/drm/radeon/reg_srcs/rv515 | 486 +++++++++++++++++++++ |
| drivers/gpu/drm/radeon/rv515.c | 64 +--- |
| drivers/gpu/drm/ttm/ttm_bo.c | 295 +++++++++----- |
| drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- |
| drivers/gpu/drm/ttm/ttm_global.c | 4 +- |
| drivers/gpu/drm/ttm/ttm_memory.c | 508 +++++++++++++++++++---- |
| drivers/gpu/drm/ttm/ttm_module.c | 58 +++- |
| drivers/gpu/drm/ttm/ttm_tt.c | 37 +- |
| include/drm/drmP.h | 50 ++- |
| include/drm/drm_crtc.h | 12 + |
| include/drm/drm_encoder_slave.h | 162 +++++++ |
| include/drm/drm_mode.h | 11 +- |
| include/drm/drm_sysfs.h | 12 + |
| include/drm/ttm/ttm_bo_api.h | 13 +- |
| include/drm/ttm/ttm_bo_driver.h | 94 +++-- |
| include/drm/ttm/ttm_memory.h | 43 +- |
| include/drm/ttm/ttm_module.h | 2 + |
| 34 files changed, 3763 insertions(+), 502 deletions(-) |
| create mode 100644 drivers/gpu/drm/drm_encoder_slave.c |
| create mode 100644 drivers/gpu/drm/radeon/mkregtable.c |
| create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r300 |
| create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rv515 |
| create mode 100644 include/drm/drm_encoder_slave.h |
| create mode 100644 include/drm/drm_sysfs.h |
| Merging voltage/for-next |
| $ git merge voltage/for-next |
| Resolved 'drivers/regulator/Kconfig' using previous resolution. |
| Auto-merging drivers/regulator/Kconfig |
| CONFLICT (content): Merge conflict in drivers/regulator/Kconfig |
| Auto-merging drivers/regulator/Makefile |
| Auto-merging drivers/regulator/core.c |
| Auto-merging include/linux/regulator/driver.h |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master d599fde] Merge commit 'voltage/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/power/regulator/overview.txt | 2 +- |
| Documentation/power/regulator/regulator.txt | 5 +- |
| drivers/regulator/Kconfig | 16 + |
| drivers/regulator/Makefile | 3 + |
| drivers/regulator/core.c | 285 ++++++++--- |
| drivers/regulator/da903x.c | 75 +++- |
| drivers/regulator/fixed.c | 91 ++++- |
| drivers/regulator/pcf50633-regulator.c | 98 +++-- |
| drivers/regulator/tps65023-regulator.c | 632 ++++++++++++++++++++++++ |
| drivers/regulator/tps6507x-regulator.c | 714 +++++++++++++++++++++++++++ |
| drivers/regulator/userspace-consumer.c | 45 +- |
| drivers/regulator/virtual.c | 56 ++- |
| drivers/regulator/wm8350-regulator.c | 2 + |
| include/linux/mfd/da903x.h | 4 +- |
| include/linux/regulator/consumer.h | 4 + |
| include/linux/regulator/driver.h | 2 + |
| include/linux/regulator/fixed.h | 24 + |
| include/linux/regulator/machine.h | 20 +- |
| 18 files changed, 1920 insertions(+), 158 deletions(-) |
| create mode 100644 drivers/regulator/tps65023-regulator.c |
| create mode 100644 drivers/regulator/tps6507x-regulator.c |
| Merging security-testing/next |
| $ git merge security-testing/next |
| Auto-merging include/linux/sched.h |
| Auto-merging include/linux/security.h |
| Auto-merging net/core/dev.c |
| Auto-merging security/capability.c |
| Auto-merging security/security.c |
| Merge made by recursive. |
| drivers/staging/comedi/comedi_fops.c | 8 +- |
| fs/locks.c | 2 +- |
| fs/open.c | 10 +- |
| include/linux/cred.h | 3 +- |
| include/linux/lsm_audit.h | 12 +- |
| include/linux/sched.h | 2 +- |
| include/linux/security.h | 25 +++- |
| kernel/acct.c | 8 +- |
| kernel/kmod.c | 4 + |
| kernel/ptrace.c | 2 +- |
| lib/is_single_threaded.c | 61 +++++--- |
| net/core/dev.c | 2 +- |
| net/ipv4/tcp_cong.c | 4 +- |
| security/Makefile | 4 +- |
| security/capability.c | 8 +- |
| security/commoncap.c | 4 +- |
| security/keys/proc.c | 4 + |
| security/keys/process_keys.c | 2 +- |
| security/lsm_audit.c | 2 + |
| security/security.c | 9 +- |
| security/selinux/avc.c | 205 ++++++-------------------- |
| security/selinux/hooks.c | 190 +++++++++++++----------- |
| security/selinux/include/av_perm_to_string.h | 1 + |
| security/selinux/include/av_permissions.h | 1 + |
| security/selinux/include/avc.h | 55 +------ |
| security/selinux/include/netlabel.h | 4 +- |
| security/selinux/include/xfrm.h | 8 +- |
| security/selinux/netlabel.c | 2 +- |
| security/selinux/ss/services.c | 142 +++++++++++++++--- |
| security/selinux/xfrm.c | 4 +- |
| security/smack/smack.h | 2 +- |
| security/smack/smack_access.c | 11 +- |
| security/smack/smack_lsm.c | 10 +- |
| 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 +- |
| 38 files changed, 459 insertions(+), 439 deletions(-) |
| Merging lblnet/master |
| $ git merge lblnet/master |
| Already up-to-date. |
| Merging agp/agp-next |
| $ git merge agp/agp-next |
| Resolved 'drivers/char/agp/uninorth-agp.c' using previous resolution. |
| Auto-merging drivers/char/agp/hp-agp.c |
| Auto-merging drivers/char/agp/uninorth-agp.c |
| CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 5a44809] Merge commit 'agp/agp-next' |
| $ git diff -M --stat --summary HEAD^.. |
| arch/alpha/include/asm/agp.h | 4 - |
| arch/ia64/include/asm/agp.h | 4 - |
| arch/parisc/include/asm/agp.h | 4 - |
| arch/powerpc/include/asm/agp.h | 4 - |
| arch/sparc/include/asm/agp.h | 4 - |
| arch/x86/include/asm/agp.h | 4 - |
| drivers/char/agp/agp.h | 15 ++-- |
| drivers/char/agp/ali-agp.c | 4 +- |
| drivers/char/agp/amd-k7-agp.c | 10 ++- |
| drivers/char/agp/amd64-agp.c | 7 +- |
| drivers/char/agp/ati-agp.c | 7 +- |
| drivers/char/agp/backend.c | 32 ++++++- |
| drivers/char/agp/efficeon-agp.c | 4 +- |
| drivers/char/agp/generic.c | 20 ++++- |
| drivers/char/agp/hp-agp.c | 8 +- |
| drivers/char/agp/i460-agp.c | 17 +--- |
| drivers/char/agp/intel-agp.c | 173 +++++++++++++++++++++++++++++++++++---- |
| drivers/char/agp/nvidia-agp.c | 2 +- |
| drivers/char/agp/parisc-agp.c | 12 +-- |
| drivers/char/agp/sgi-agp.c | 8 +- |
| drivers/char/agp/sworks-agp.c | 10 ++- |
| drivers/char/agp/uninorth-agp.c | 4 +- |
| include/linux/agp_backend.h | 5 +- |
| 23 files changed, 254 insertions(+), 108 deletions(-) |
| Merging uwb/for-upstream |
| $ git merge uwb/for-upstream |
| Merge made by recursive. |
| drivers/uwb/hwa-rc.c | 3 +-- |
| drivers/uwb/lc-rc.c | 2 +- |
| drivers/uwb/reset.c | 21 +++++++++++---------- |
| drivers/uwb/umc-bus.c | 2 +- |
| drivers/uwb/uwbd.c | 4 ++-- |
| drivers/uwb/whc-rc.c | 3 +-- |
| include/linux/uwb.h | 2 +- |
| 7 files changed, 18 insertions(+), 19 deletions(-) |
| Merging watchdog/master |
| $ git merge watchdog/master |
| Auto-merging drivers/watchdog/ar7_wdt.c |
| Merge made by recursive. |
| drivers/watchdog/Kconfig | 38 +++ |
| drivers/watchdog/Makefile | 3 + |
| drivers/watchdog/ar7_wdt.c | 106 +++++----- |
| drivers/watchdog/coh901327_wdt.c | 2 +- |
| drivers/watchdog/davinci_wdt.c | 19 ++- |
| drivers/watchdog/nuc900_wdt.c | 353 ++++++++++++++++++++++++++++ |
| drivers/watchdog/sbc_fitpc2_wdt.c | 267 +++++++++++++++++++++ |
| drivers/watchdog/txx9wdt.c | 29 ++- |
| drivers/watchdog/wdt_pci.c | 21 +- |
| drivers/watchdog/wm831x_wdt.c | 441 +++++++++++++++++++++++++++++++++++ |
| include/linux/mfd/wm831x/watchdog.h | 52 ++++ |
| 11 files changed, 1255 insertions(+), 76 deletions(-) |
| create mode 100644 drivers/watchdog/nuc900_wdt.c |
| create mode 100644 drivers/watchdog/sbc_fitpc2_wdt.c |
| create mode 100644 drivers/watchdog/wm831x_wdt.c |
| create mode 100644 include/linux/mfd/wm831x/watchdog.h |
| Merging bdev/master |
| $ git merge bdev/master |
| Already up-to-date. |
| Merging dwmw2-iommu/master |
| $ git merge dwmw2-iommu/master |
| Auto-merging drivers/pci/dmar.c |
| Merge made by recursive. |
| arch/ia64/kernel/pci-swiotlb.c | 2 +- |
| arch/x86/kernel/pci-swiotlb.c | 5 +- |
| drivers/pci/dmar.c | 22 +++- |
| drivers/pci/intel-iommu.c | 289 +++++++++++++++++++--------------------- |
| drivers/pci/iova.c | 16 +-- |
| drivers/usb/host/pci-quirks.c | 2 +- |
| include/linux/iova.h | 1 - |
| 7 files changed, 165 insertions(+), 172 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 |
| Merge made by recursive. |
| Documentation/filesystems/00-INDEX | 2 ++ |
| Documentation/filesystems/exofs.txt | 23 ++++++++++++----------- |
| fs/exofs/inode.c | 13 +++++++++---- |
| fs/exofs/super.c | 6 ------ |
| 4 files changed, 23 insertions(+), 21 deletions(-) |
| 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 Documentation/sound/alsa/HD-Audio-Models.txt |
| Auto-merging Documentation/sysctl/kernel.txt |
| Auto-merging MAINTAINERS |
| Auto-merging arch/arm/Makefile |
| Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c |
| 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 arch/arm/mach-w90x900/w90p910.c |
| Auto-merging arch/arm/plat-mxc/irq.c |
| Auto-merging arch/s390/hypfs/inode.c |
| Auto-merging arch/s390/kvm/interrupt.c |
| Auto-merging arch/um/drivers/net_kern.c |
| Auto-merging drivers/char/agp/uninorth-agp.c |
| Auto-merging drivers/gpu/drm/radeon/r300.c |
| Auto-merging drivers/ide/ide-probe.c |
| Auto-merging drivers/lguest/page_tables.c |
| Auto-merging drivers/media/video/cx88/cx88-dvb.c |
| Auto-merging drivers/message/fusion/mptbase.c |
| Auto-merging drivers/mtd/ubi/ubi.h |
| Auto-merging drivers/net/bnx2x_reg.h |
| Auto-merging drivers/net/bonding/bond_3ad.c |
| Auto-merging drivers/net/e1000/e1000_hw.c |
| Auto-merging drivers/net/ibm_newemac/core.c |
| Auto-merging drivers/net/igb/igb_main.c |
| Auto-merging drivers/net/ll_temac_main.c |
| Auto-merging drivers/net/macb.c |
| Auto-merging drivers/net/ni52.c |
| Auto-merging drivers/net/qlge/qlge_main.c |
| Auto-merging drivers/net/rionet.c |
| Auto-merging drivers/net/sky2.c |
| Auto-merging drivers/net/vxge/vxge-config.h |
| Auto-merging drivers/net/vxge/vxge-main.c |
| Auto-merging drivers/net/wireless/ath/ath5k/reg.h |
| Auto-merging drivers/net/wireless/atmel.c |
| Auto-merging drivers/net/wireless/zd1211rw/zd_chip.c |
| Auto-merging drivers/s390/block/dasd_eckd.c |
| Auto-merging drivers/s390/net/netiucv.c |
| Auto-merging drivers/scsi/lpfc/lpfc_ct.c |
| Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.h |
| Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c |
| Auto-merging drivers/usb/host/xhci.h |
| Auto-merging drivers/video/imxfb.c |
| Auto-merging fs/ext4/inode.c |
| Auto-merging fs/gfs2/rgrp.c |
| Auto-merging fs/ocfs2/quota_global.c |
| Auto-merging include/acpi/actypes.h |
| Auto-merging include/linux/mISDNif.h |
| Auto-merging net/wireless/wext-compat.c |
| Auto-merging sound/soc/codecs/wm9081.c |
| Auto-merging sound/soc/pxa/pxa-ssp.c |
| Merge made by recursive. |
| Documentation/DocBook/mtdnand.tmpl | 2 +- |
| Documentation/DocBook/scsi.tmpl | 2 +- |
| Documentation/SubmittingPatches | 2 +- |
| Documentation/filesystems/nfsroot.txt | 2 +- |
| Documentation/gcov.txt | 2 +- |
| Documentation/hwmon/hpfall.c | 115 +++++++++++++++------- |
| Documentation/hwmon/pc87427 | 2 +- |
| Documentation/networking/regulatory.txt | 2 +- |
| Documentation/powerpc/dts-bindings/marvell.txt | 2 +- |
| Documentation/scsi/ChangeLog.megaraid | 2 +- |
| Documentation/scsi/scsi_fc_transport.txt | 2 +- |
| Documentation/sound/alsa/HD-Audio-Models.txt | 2 +- |
| Documentation/sysctl/kernel.txt | 30 +++--- |
| Documentation/trace/ftrace.txt | 2 +- |
| MAINTAINERS | 2 +- |
| arch/arm/Makefile | 2 +- |
| arch/arm/mach-at91/at91cap9_devices.c | 2 +- |
| arch/arm/mach-at91/at91sam9rl_devices.c | 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/arm/mach-w90x900/w90p910.c | 2 +- |
| arch/arm/plat-mxc/irq.c | 2 +- |
| arch/blackfin/mach-bf538/include/mach/defBF539.h | 2 +- |
| arch/frv/lib/cache.S | 2 +- |
| arch/h8300/kernel/timer/tpu.c | 1 - |
| arch/ia64/ia32/sys_ia32.c | 2 +- |
| arch/mn10300/include/asm/cacheflush.h | 4 +- |
| arch/powerpc/kernel/udbg_16550.c | 2 +- |
| arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- |
| arch/s390/hypfs/inode.c | 2 +- |
| arch/s390/kvm/interrupt.c | 2 +- |
| arch/sparc/kernel/irq_64.c | 2 +- |
| arch/um/drivers/net_kern.c | 2 +- |
| arch/um/include/shared/ptrace_user.h | 2 +- |
| arch/x86/kernel/cpu/amd.c | 2 +- |
| drivers/block/DAC960.c | 8 +- |
| drivers/block/swim3.c | 2 +- |
| drivers/char/agp/uninorth-agp.c | 2 +- |
| drivers/char/epca.c | 2 +- |
| drivers/char/ipmi/ipmi_poweroff.c | 4 +- |
| drivers/edac/edac_core.h | 2 +- |
| drivers/gpio/bt8xxgpio.c | 4 +- |
| drivers/gpu/drm/i915/intel_dp.c | 2 +- |
| drivers/gpu/drm/mga/mga_state.c | 4 +- |
| drivers/gpu/drm/radeon/r300.c | 4 +- |
| drivers/ide/ide-probe.c | 2 +- |
| drivers/ide/umc8672.c | 4 +- |
| drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- |
| drivers/input/keyboard/atkbd.c | 2 +- |
| drivers/isdn/capi/capiutil.c | 2 +- |
| drivers/isdn/i4l/isdn_common.c | 4 +- |
| drivers/lguest/page_tables.c | 2 +- |
| drivers/macintosh/rack-meter.c | 2 +- |
| drivers/md/md.h | 2 +- |
| drivers/media/dvb/siano/smscoreapi.c | 2 +- |
| drivers/media/dvb/siano/smscoreapi.h | 4 +- |
| drivers/media/radio/radio-mr800.c | 2 +- |
| drivers/media/video/cx88/cx88-blackbird.c | 4 +- |
| drivers/media/video/cx88/cx88-dvb.c | 4 +- |
| drivers/media/video/cx88/cx88-mpeg.c | 4 +- |
| drivers/media/video/cx88/cx88-video.c | 4 +- |
| drivers/media/video/gspca/m5602/m5602_core.c | 2 +- |
| drivers/message/fusion/mptbase.c | 4 +- |
| drivers/mmc/host/mxcmmc.c | 2 +- |
| drivers/mtd/devices/m25p80.c | 4 +- |
| drivers/mtd/devices/slram.c | 2 +- |
| drivers/mtd/ftl.c | 2 +- |
| drivers/mtd/maps/ixp2000.c | 2 +- |
| drivers/mtd/nand/cafe_nand.c | 4 +- |
| drivers/mtd/nand/cmx270_nand.c | 4 +- |
| drivers/mtd/ubi/eba.c | 2 +- |
| drivers/mtd/ubi/ubi.h | 2 +- |
| drivers/net/arcnet/arc-rawmode.c | 1 - |
| drivers/net/arcnet/capmode.c | 1 - |
| drivers/net/bnx2x_reg.h | 2 +- |
| drivers/net/bonding/bond_3ad.c | 2 +- |
| drivers/net/e1000/e1000_hw.c | 2 +- |
| drivers/net/gianfar_ethtool.c | 2 +- |
| drivers/net/ibm_newemac/core.c | 8 +- |
| drivers/net/igb/igb_main.c | 2 +- |
| drivers/net/ll_temac_main.c | 2 +- |
| drivers/net/macb.c | 2 +- |
| drivers/net/ni52.c | 4 +- |
| drivers/net/qlge/qlge_main.c | 4 +- |
| drivers/net/rionet.c | 2 +- |
| drivers/net/skfp/pcmplc.c | 2 +- |
| drivers/net/skfp/pmf.c | 8 +- |
| drivers/net/skge.c | 2 +- |
| drivers/net/sky2.c | 2 +- |
| drivers/net/vxge/vxge-config.h | 2 +- |
| drivers/net/vxge/vxge-main.c | 2 +- |
| drivers/net/wireless/ath/ath5k/reg.h | 2 +- |
| drivers/net/wireless/atmel.c | 2 +- |
| drivers/net/wireless/zd1211rw/zd_chip.c | 2 +- |
| drivers/pcmcia/pcmcia_resource.c | 2 +- |
| drivers/rtc/rtc-omap.c | 2 +- |
| drivers/s390/block/dasd_eckd.c | 2 +- |
| drivers/s390/net/netiucv.c | 2 +- |
| drivers/s390/scsi/zfcp_scsi.c | 2 +- |
| drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- |
| drivers/scsi/lpfc/lpfc_ct.c | 2 +- |
| drivers/scsi/megaraid/megaraid_sas.c | 2 +- |
| drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +- |
| drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- |
| drivers/scsi/qla4xxx/ql4_os.c | 4 +- |
| drivers/spi/omap_uwire.c | 2 +- |
| drivers/spi/spi_s3c24xx.c | 2 +- |
| drivers/staging/rt2860/rtmp.h | 2 +- |
| drivers/usb/class/cdc-wdm.c | 2 - |
| drivers/usb/host/ehci-pci.c | 2 +- |
| drivers/usb/host/ehci.h | 2 +- |
| drivers/usb/host/ohci-q.c | 2 +- |
| drivers/usb/host/xhci.h | 2 +- |
| drivers/usb/serial/cypress_m8.h | 2 +- |
| drivers/usb/serial/io_edgeport.c | 2 +- |
| drivers/usb/serial/kl5kusb105.c | 2 +- |
| drivers/usb/serial/spcp8x5.c | 2 +- |
| drivers/usb/wusbcore/wa-hc.h | 2 +- |
| drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 +- |
| drivers/video/cfbcopyarea.c | 2 +- |
| drivers/video/imxfb.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 +- |
| drivers/video/s3c2410fb.c | 2 +- |
| drivers/xen/balloon.c | 2 +- |
| fs/autofs/dirhash.c | 2 +- |
| fs/btrfs/tree-log.c | 2 +- |
| fs/cifs/cifs_dfs_ref.c | 2 +- |
| fs/ext4/inode.c | 2 +- |
| fs/gfs2/rgrp.c | 2 +- |
| fs/nfs/callback_xdr.c | 2 +- |
| fs/ntfs/layout.h | 2 +- |
| fs/ocfs2/quota_global.c | 2 +- |
| fs/xfs/xfs_fs.h | 2 +- |
| include/acpi/actypes.h | 2 +- |
| include/acpi/platform/acgcc.h | 2 +- |
| include/linux/capability.h | 2 +- |
| include/linux/mISDNif.h | 2 +- |
| include/linux/namei.h | 2 +- |
| include/linux/usb.h | 2 +- |
| include/linux/workqueue.h | 2 +- |
| include/rdma/ib_cm.h | 2 +- |
| include/scsi/fc/fc_fc2.h | 3 +- |
| kernel/panic.c | 2 +- |
| kernel/trace/Kconfig | 2 +- |
| kernel/trace/trace_hw_branches.c | 2 +- |
| kernel/tracepoint.c | 2 +- |
| lib/zlib_deflate/deflate.c | 4 +- |
| mm/Kconfig.debug | 12 +- |
| net/rxrpc/ar-call.c | 2 +- |
| net/sched/sch_hfsc.c | 2 +- |
| net/wireless/wext-compat.c | 2 +- |
| scripts/basic/fixdep.c | 4 +- |
| scripts/mod/sumversion.c | 2 - |
| sound/oss/swarm_cs4297a.c | 3 - |
| sound/oss/sys_timer.c | 3 - |
| sound/soc/codecs/wm9081.c | 2 +- |
| sound/soc/pxa/pxa-ssp.c | 2 +- |
| sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- |
| 174 files changed, 305 insertions(+), 272 deletions(-) |
| Merging audit/for-next |
| $ git merge audit/for-next |
| Already up-to-date. |
| Merging omap/for-next |
| $ git merge omap/for-next |
| Auto-merging arch/arm/mach-omap2/board-4430sdp.c |
| Auto-merging arch/arm/mach-omap2/serial.c |
| Auto-merging arch/arm/plat-omap/dma.c |
| Auto-merging arch/arm/plat-omap/gpio.c |
| Merge made by recursive. |
| Documentation/arm/OMAP/omap_pm | 129 ++ |
| arch/arm/configs/n8x0_defconfig | 1104 ++++++++++++++++++ |
| arch/arm/configs/omap3_beagle_defconfig | 37 +- |
| arch/arm/configs/omap_3430sdp_defconfig | 20 +- |
| arch/arm/configs/omap_zoom2_defconfig | 484 +++++++-- |
| arch/arm/configs/rx51_defconfig | 1 + |
| arch/arm/mach-omap1/board-ams-delta.c | 43 +- |
| arch/arm/mach-omap1/board-fsample.c | 5 - |
| arch/arm/mach-omap1/board-generic.c | 5 - |
| arch/arm/mach-omap1/board-h2.c | 5 - |
| arch/arm/mach-omap1/board-h3.c | 5 - |
| arch/arm/mach-omap1/board-innovator.c | 5 - |
| arch/arm/mach-omap1/board-osk.c | 5 - |
| arch/arm/mach-omap1/board-palmte.c | 5 - |
| arch/arm/mach-omap1/board-palmtt.c | 5 - |
| arch/arm/mach-omap1/board-palmz71.c | 5 - |
| arch/arm/mach-omap1/board-perseus2.c | 5 - |
| arch/arm/mach-omap1/board-sx1.c | 5 - |
| arch/arm/mach-omap1/board-voiceblue.c | 5 - |
| arch/arm/mach-omap1/devices.c | 2 +- |
| arch/arm/mach-omap1/io.c | 6 +- |
| arch/arm/mach-omap1/pm.h | 4 +- |
| arch/arm/mach-omap1/serial.c | 17 +- |
| arch/arm/mach-omap1/sram.S | 12 +- |
| arch/arm/mach-omap1/time.c | 4 +- |
| arch/arm/mach-omap2/Kconfig | 9 + |
| arch/arm/mach-omap2/Makefile | 10 +- |
| arch/arm/mach-omap2/board-2430sdp.c | 18 +- |
| arch/arm/mach-omap2/board-3430sdp.c | 23 +- |
| arch/arm/mach-omap2/board-4430sdp.c | 5 +- |
| arch/arm/mach-omap2/board-apollon.c | 25 +- |
| arch/arm/mach-omap2/board-generic.c | 15 +- |
| arch/arm/mach-omap2/board-h4.c | 25 +- |
| arch/arm/mach-omap2/board-ldp.c | 25 +- |
| arch/arm/mach-omap2/board-n8x0.c | 150 +++ |
| arch/arm/mach-omap2/board-omap3beagle.c | 36 +- |
| arch/arm/mach-omap2/board-omap3evm.c | 17 +- |
| arch/arm/mach-omap2/board-omap3pandora.c | 25 +- |
| arch/arm/mach-omap2/board-overo.c | 24 +- |
| arch/arm/mach-omap2/board-rx51.c | 9 +- |
| arch/arm/mach-omap2/board-zoom-debugboard.c | 4 +- |
| arch/arm/mach-omap2/board-zoom2.c | 218 ++++- |
| arch/arm/mach-omap2/clock.c | 2 + |
| arch/arm/mach-omap2/clock34xx.c | 17 +- |
| arch/arm/mach-omap2/clock34xx.h | 21 +- |
| arch/arm/mach-omap2/clockdomain.c | 10 +- |
| arch/arm/mach-omap2/cm.c | 70 ++ |
| arch/arm/mach-omap2/cm.h | 10 +- |
| arch/arm/mach-omap2/cm4xxx.c | 68 ++ |
| arch/arm/mach-omap2/devices.c | 41 + |
| arch/arm/mach-omap2/io.c | 23 +- |
| arch/arm/mach-omap2/iommu2.c | 19 +- |
| arch/arm/mach-omap2/mux.c | 50 + |
| arch/arm/mach-omap2/omap-smp.c | 2 +- |
| arch/arm/mach-omap2/omap_hwmod.c | 1554 +++++++++++++++++++++++++ |
| arch/arm/mach-omap2/omap_hwmod_2420.h | 141 +++ |
| arch/arm/mach-omap2/omap_hwmod_2430.h | 143 +++ |
| arch/arm/mach-omap2/omap_hwmod_34xx.h | 168 +++ |
| arch/arm/mach-omap2/pm-debug.c | 431 +++++++- |
| arch/arm/mach-omap2/pm.h | 11 + |
| arch/arm/mach-omap2/pm24xx.c | 4 +- |
| arch/arm/mach-omap2/pm34xx.c | 38 +- |
| arch/arm/mach-omap2/powerdomain.c | 114 ++- |
| arch/arm/mach-omap2/prm.h | 6 +- |
| arch/arm/mach-omap2/sdrc.h | 6 +- |
| arch/arm/mach-omap2/serial.c | 67 +- |
| arch/arm/mach-omap2/sram242x.S | 4 +- |
| arch/arm/mach-omap2/sram243x.S | 4 +- |
| arch/arm/mach-omap2/timer-gp.c | 2 +- |
| arch/arm/mach-omap2/usb-musb.c | 12 - |
| arch/arm/plat-omap/Kconfig | 17 + |
| arch/arm/plat-omap/Makefile | 6 + |
| arch/arm/plat-omap/clock.c | 2 +- |
| arch/arm/plat-omap/common.c | 88 -- |
| arch/arm/plat-omap/dma.c | 8 +- |
| arch/arm/plat-omap/dmtimer.c | 5 +- |
| arch/arm/plat-omap/gpio.c | 115 ++- |
| arch/arm/plat-omap/include/mach/board.h | 2 - |
| arch/arm/plat-omap/include/mach/clockdomain.h | 3 +- |
| arch/arm/plat-omap/include/mach/control.h | 12 +- |
| arch/arm/plat-omap/include/mach/entry-macro.S | 8 +- |
| arch/arm/plat-omap/include/mach/gpio.h | 2 +- |
| arch/arm/plat-omap/include/mach/io.h | 97 +- |
| arch/arm/plat-omap/include/mach/iommu.h | 6 +- |
| arch/arm/plat-omap/include/mach/mtd-xip.h | 2 +- |
| arch/arm/plat-omap/include/mach/mux.h | 28 + |
| arch/arm/plat-omap/include/mach/omap-pm.h | 301 +++++ |
| arch/arm/plat-omap/include/mach/omap44xx.h | 8 +- |
| arch/arm/plat-omap/include/mach/omap_device.h | 141 +++ |
| arch/arm/plat-omap/include/mach/omap_hwmod.h | 447 +++++++ |
| arch/arm/plat-omap/include/mach/powerdomain.h | 15 +- |
| arch/arm/plat-omap/include/mach/sdrc.h | 15 +- |
| arch/arm/plat-omap/include/mach/serial.h | 3 + |
| arch/arm/plat-omap/io.c | 62 +- |
| arch/arm/plat-omap/iommu-debug.c | 415 +++++++ |
| arch/arm/plat-omap/iommu.c | 23 +- |
| arch/arm/plat-omap/iovmm.c | 2 +- |
| arch/arm/plat-omap/omap-pm-noop.c | 296 +++++ |
| arch/arm/plat-omap/omap_device.c | 687 +++++++++++ |
| arch/arm/plat-omap/sram.c | 18 +- |
| drivers/input/keyboard/omap-keypad.c | 22 +- |
| drivers/mtd/nand/ams-delta.c | 8 +- |
| drivers/video/omap/dispc.c | 6 +- |
| 103 files changed, 7756 insertions(+), 713 deletions(-) |
| create mode 100644 Documentation/arm/OMAP/omap_pm |
| create mode 100644 arch/arm/configs/n8x0_defconfig |
| create mode 100644 arch/arm/mach-omap2/board-n8x0.c |
| create mode 100644 arch/arm/mach-omap2/cm.c |
| create mode 100644 arch/arm/mach-omap2/cm4xxx.c |
| create mode 100644 arch/arm/mach-omap2/omap_hwmod.c |
| create mode 100644 arch/arm/mach-omap2/omap_hwmod_2420.h |
| create mode 100644 arch/arm/mach-omap2/omap_hwmod_2430.h |
| create mode 100644 arch/arm/mach-omap2/omap_hwmod_34xx.h |
| create mode 100644 arch/arm/plat-omap/include/mach/omap-pm.h |
| create mode 100644 arch/arm/plat-omap/include/mach/omap_device.h |
| create mode 100644 arch/arm/plat-omap/include/mach/omap_hwmod.h |
| create mode 100644 arch/arm/plat-omap/iommu-debug.c |
| create mode 100644 arch/arm/plat-omap/omap-pm-noop.c |
| create mode 100644 arch/arm/plat-omap/omap_device.c |
| Merging quilt/aoe |
| $ git merge quilt/aoe |
| Merge made by recursive. |
| drivers/block/aoe/aoecmd.c | 8 ++++++-- |
| 1 files changed, 6 insertions(+), 2 deletions(-) |
| Merging suspend/linux-next |
| $ git merge suspend/linux-next |
| Merge made by recursive. |
| drivers/base/power/main.c | 171 +++++++++--------- |
| drivers/block/floppy.c | 9 +- |
| drivers/platform/x86/hp-wmi.c | 15 +- |
| include/linux/pm.h | 14 ++ |
| kernel/irq/pm.c | 8 +- |
| kernel/power/hibernate.c | 21 ++- |
| kernel/power/power.h | 2 +- |
| kernel/power/snapshot.c | 412 +++++++++++++++++++++++++++++++---------- |
| 8 files changed, 448 insertions(+), 204 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 | 1003 ++++++++++++++++++++++++++ |
| drivers/bluetooth/btmrvl_sdio.h | 108 +++ |
| drivers/bluetooth/btusb.c | 198 +++++- |
| drivers/bluetooth/hci_bcsp.c | 3 +- |
| include/net/bluetooth/bluetooth.h | 5 +- |
| include/net/bluetooth/hci_core.h | 10 +- |
| include/net/bluetooth/l2cap.h | 134 ++++- |
| include/net/bluetooth/rfcomm.h | 2 + |
| net/bluetooth/Kconfig | 1 + |
| net/bluetooth/hci_conn.c | 17 +- |
| net/bluetooth/hci_core.c | 2 +- |
| net/bluetooth/hci_event.c | 2 + |
| net/bluetooth/hidp/core.c | 66 ++- |
| net/bluetooth/hidp/hidp.h | 2 + |
| net/bluetooth/l2cap.c | 1357 +++++++++++++++++++++++++++++++++--- |
| net/bluetooth/rfcomm/core.c | 69 ++- |
| net/bluetooth/sco.c | 49 +- |
| 24 files changed, 4186 insertions(+), 189 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 fsnotify/for-next |
| $ git merge fsnotify/for-next |
| Auto-merging Documentation/feature-removal-schedule.txt |
| Auto-merging fs/exec.c |
| Auto-merging fs/open.c |
| Auto-merging init/Kconfig |
| Auto-merging kernel/Makefile |
| Merge made by recursive. |
| Documentation/feature-removal-schedule.txt | 7 + |
| fs/compat.c | 5 +- |
| fs/exec.c | 4 +- |
| fs/nfsd/vfs.c | 4 +- |
| fs/notify/dnotify/dnotify.c | 5 +- |
| fs/notify/fsnotify.c | 16 ++- |
| fs/notify/group.c | 2 +- |
| fs/notify/inode_mark.c | 18 ++- |
| fs/notify/inotify/inotify_fsnotify.c | 92 ++++++++- |
| fs/notify/inotify/inotify_user.c | 231 ++++++++++++++-------- |
| fs/notify/notification.c | 176 ++++++++++------- |
| fs/open.c | 2 +- |
| fs/read_write.c | 8 +- |
| include/linux/fsnotify.h | 44 +++-- |
| include/linux/fsnotify_backend.h | 28 ++- |
| init/Kconfig | 10 +- |
| kernel/Makefile | 5 +- |
| kernel/audit.c | 1 - |
| kernel/audit.h | 26 ++- |
| kernel/audit_tree.c | 224 ++++++++++++--------- |
| kernel/audit_watch.c | 296 ++++++++++++++++------------ |
| kernel/auditfilter.c | 39 ++--- |
| kernel/auditsc.c | 15 +- |
| 23 files changed, 773 insertions(+), 485 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 |
| Auto-merging drivers/misc/Kconfig |
| Auto-merging drivers/misc/Makefile |
| 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 drbd/drbd |
| $ git merge drbd/drbd |
| Auto-merging MAINTAINERS |
| Auto-merging drivers/block/Kconfig |
| Auto-merging drivers/block/Makefile |
| Auto-merging lib/Makefile |
| Merge made by recursive. |
| .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ |
| Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ |
| Documentation/blockdev/drbd/README.txt | 16 + |
| Documentation/blockdev/drbd/conn-states-8.dot | 18 + |
| Documentation/blockdev/drbd/disk-states-8.dot | 16 + |
| .../drbd/drbd-connection-state-overview.dot | 85 + |
| Documentation/blockdev/drbd/node-states-8.dot | 14 + |
| MAINTAINERS | 13 + |
| drivers/block/Kconfig | 2 + |
| drivers/block/Makefile | 1 + |
| drivers/block/drbd/Kconfig | 82 + |
| drivers/block/drbd/Makefile | 8 + |
| drivers/block/drbd/drbd_actlog.c | 1487 +++++++ |
| drivers/block/drbd/drbd_bitmap.c | 1329 ++++++ |
| drivers/block/drbd/drbd_int.h | 2249 ++++++++++ |
| drivers/block/drbd/drbd_main.c | 3758 ++++++++++++++++ |
| drivers/block/drbd/drbd_nl.c | 2355 ++++++++++ |
| drivers/block/drbd/drbd_proc.c | 266 ++ |
| drivers/block/drbd/drbd_receiver.c | 4474 ++++++++++++++++++++ |
| drivers/block/drbd/drbd_req.c | 1132 +++++ |
| drivers/block/drbd/drbd_req.h | 327 ++ |
| drivers/block/drbd/drbd_strings.c | 113 + |
| drivers/block/drbd/drbd_tracing.c | 753 ++++ |
| drivers/block/drbd/drbd_tracing.h | 87 + |
| drivers/block/drbd/drbd_vli.h | 351 ++ |
| drivers/block/drbd/drbd_worker.c | 1524 +++++++ |
| drivers/block/drbd/drbd_wrappers.h | 91 + |
| include/linux/drbd.h | 349 ++ |
| include/linux/drbd_limits.h | 137 + |
| include/linux/drbd_nl.h | 137 + |
| include/linux/drbd_tag_magic.h | 83 + |
| include/linux/lru_cache.h | 294 ++ |
| lib/Kconfig | 3 + |
| lib/Makefile | 2 + |
| lib/lru_cache.c | 560 +++ |
| 35 files changed, 23163 insertions(+), 0 deletions(-) |
| create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg |
| create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg |
| create mode 100644 Documentation/blockdev/drbd/README.txt |
| create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot |
| create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot |
| create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot |
| create mode 100644 Documentation/blockdev/drbd/node-states-8.dot |
| create mode 100644 drivers/block/drbd/Kconfig |
| create mode 100644 drivers/block/drbd/Makefile |
| create mode 100644 drivers/block/drbd/drbd_actlog.c |
| create mode 100644 drivers/block/drbd/drbd_bitmap.c |
| create mode 100644 drivers/block/drbd/drbd_int.h |
| create mode 100644 drivers/block/drbd/drbd_main.c |
| create mode 100644 drivers/block/drbd/drbd_nl.c |
| create mode 100644 drivers/block/drbd/drbd_proc.c |
| create mode 100644 drivers/block/drbd/drbd_receiver.c |
| create mode 100644 drivers/block/drbd/drbd_req.c |
| create mode 100644 drivers/block/drbd/drbd_req.h |
| create mode 100644 drivers/block/drbd/drbd_strings.c |
| create mode 100644 drivers/block/drbd/drbd_tracing.c |
| create mode 100644 drivers/block/drbd/drbd_tracing.h |
| create mode 100644 drivers/block/drbd/drbd_vli.h |
| create mode 100644 drivers/block/drbd/drbd_worker.c |
| create mode 100644 drivers/block/drbd/drbd_wrappers.h |
| create mode 100644 include/linux/drbd.h |
| create mode 100644 include/linux/drbd_limits.h |
| create mode 100644 include/linux/drbd_nl.h |
| create mode 100644 include/linux/drbd_tag_magic.h |
| create mode 100644 include/linux/lru_cache.h |
| create mode 100644 lib/lru_cache.c |
| Merging kmemleak/kmemleak |
| $ git merge kmemleak/kmemleak |
| Auto-merging arch/x86/kernel/process.c |
| Auto-merging kernel/fork.c |
| Merge made by recursive. |
| Documentation/kmemleak.txt | 12 +- |
| arch/x86/include/asm/thread_info.h | 7 +- |
| arch/x86/kernel/process.c | 2 + |
| include/linux/kmemleak.h | 18 ++-- |
| kernel/fork.c | 7 +- |
| mm/bootmem.c | 6 +- |
| mm/kmemleak.c | 197 +++++++++++++++++++++++++++--------- |
| 7 files changed, 181 insertions(+), 68 deletions(-) |
| Merging tip/auto-latest |
| $ git merge tip/auto-latest |
| Resolved 'arch/x86/include/asm/socket.h' using previous resolution. |
| Resolved 'include/linux/rcupdate.h' using previous resolution. |
| Resolved 'kernel/fork.c' using previous resolution. |
| Auto-merging Documentation/feature-removal-schedule.txt |
| Auto-merging Documentation/kernel-parameters.txt |
| Auto-merging arch/arm/plat-omap/common.c |
| Auto-merging arch/m68knommu/kernel/time.c |
| Auto-merging arch/powerpc/kernel/time.c |
| Auto-merging arch/s390/kernel/time.c |
| Auto-merging arch/sh/kernel/time.c |
| Auto-merging arch/sparc/Kconfig |
| Auto-merging arch/sparc/include/asm/pci_32.h |
| Auto-merging arch/sparc/include/asm/pci_64.h |
| Auto-merging arch/sparc/kernel/Makefile |
| Removing arch/sparc/kernel/dma.h |
| Auto-merging arch/x86/ia32/ia32entry.S |
| Auto-merging arch/x86/include/asm/socket.h |
| CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h |
| Auto-merging arch/x86/include/asm/thread_info.h |
| Auto-merging arch/x86/kernel/acpi/boot.c |
| Auto-merging arch/x86/kernel/apic/io_apic.c |
| Auto-merging arch/x86/kernel/cpu/amd.c |
| Auto-merging arch/x86/kernel/kgdb.c |
| Auto-merging arch/x86/kernel/pci-dma.c |
| Auto-merging arch/x86/kernel/pci-swiotlb.c |
| Auto-merging arch/x86/kernel/process.c |
| Auto-merging arch/x86/kernel/smpboot.c |
| Auto-merging arch/x86/kvm/x86.c |
| Auto-merging arch/x86/mm/highmem_32.c |
| Auto-merging fs/locks.c |
| Auto-merging include/linux/interrupt.h |
| 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 include/linux/syscalls.h |
| Auto-merging init/Kconfig |
| Auto-merging kernel/Makefile |
| Auto-merging kernel/fork.c |
| CONFLICT (content): Merge conflict in kernel/fork.c |
| Auto-merging kernel/kmod.c |
| Removing kernel/rcuclassic.c |
| Auto-merging kernel/sysctl.c |
| Auto-merging kernel/trace/Kconfig |
| Auto-merging kernel/trace/trace.c |
| Auto-merging kernel/tracepoint.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master b41cc21] 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/trace/events.txt | 9 + |
| Documentation/trace/ring-buffer-design.txt | 955 +++++++++ |
| arch/Kconfig | 16 + |
| arch/arm/plat-omap/common.c | 7 +- |
| arch/ia64/include/asm/cputime.h | 1 + |
| arch/ia64/include/asm/dma-mapping.h | 19 +- |
| arch/m68knommu/kernel/time.c | 5 +- |
| arch/mips/dec/time.c | 5 +- |
| arch/mips/lasat/ds1603.c | 5 +- |
| arch/mips/lasat/sysctl.c | 8 +- |
| arch/mips/lemote/lm2e/setup.c | 5 +- |
| arch/mips/mti-malta/malta-time.c | 5 +- |
| arch/mips/pmc-sierra/yosemite/setup.c | 5 +- |
| arch/mips/sibyte/swarm/setup.c | 15 +- |
| arch/mips/sni/time.c | 5 +- |
| arch/powerpc/include/asm/cputime.h | 13 + |
| arch/powerpc/include/asm/dma-mapping.h | 23 + |
| arch/powerpc/kernel/dma-swiotlb.c | 48 +- |
| arch/powerpc/kernel/time.c | 23 +- |
| arch/s390/include/asm/cputime.h | 1 + |
| arch/s390/kernel/ptrace.c | 7 +- |
| arch/s390/kernel/time.c | 38 +- |
| arch/sh/kernel/time.c | 6 +- |
| arch/sparc/Kconfig | 2 + |
| arch/sparc/include/asm/dma-mapping.h | 145 +-- |
| arch/sparc/include/asm/irq_64.h | 4 +- |
| arch/sparc/include/asm/pci.h | 3 + |
| arch/sparc/include/asm/pci_32.h | 105 - |
| arch/sparc/include/asm/pci_64.h | 88 - |
| arch/sparc/kernel/Makefile | 2 +- |
| arch/sparc/kernel/dma.c | 175 +-- |
| arch/sparc/kernel/dma.h | 14 - |
| arch/sparc/kernel/iommu.c | 20 +- |
| arch/sparc/kernel/ioport.c | 190 +- |
| arch/sparc/kernel/pci.c | 2 +- |
| arch/sparc/kernel/pci_sun4v.c | 30 +- |
| arch/sparc/kernel/process_64.c | 4 +- |
| arch/x86/Kconfig | 6 + |
| arch/x86/Makefile | 4 +- |
| 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/ia32/ia32entry.S | 2 +- |
| arch/x86/ia32/sys_ia32.c | 14 - |
| arch/x86/include/asm/a.out-core.h | 8 +- |
| arch/x86/include/asm/apic.h | 7 + |
| arch/x86/include/asm/current.h | 2 +- |
| arch/x86/include/asm/debugreg.h | 29 + |
| arch/x86/include/asm/desc.h | 13 + |
| arch/x86/include/asm/desc_defs.h | 6 + |
| arch/x86/include/asm/dma-mapping.h | 18 + |
| arch/x86/include/asm/ftrace.h | 4 +- |
| arch/x86/include/asm/hpet.h | 2 +- |
| arch/x86/include/asm/hw_breakpoint.h | 55 + |
| 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/lguest.h | 5 +- |
| 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/nmi.h | 4 +- |
| 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/percpu.h | 26 +- |
| arch/x86/include/asm/perf_counter.h | 10 + |
| arch/x86/include/asm/pgtable.h | 16 +- |
| arch/x86/include/asm/processor.h | 8 +- |
| arch/x86/include/asm/scatterlist.h | 27 +- |
| arch/x86/include/asm/shmbuf.h | 52 +- |
| arch/x86/include/asm/socket.h | 64 +- |
| arch/x86/include/asm/sockios.h | 14 +- |
| arch/x86/include/asm/stackprotector.h | 6 +- |
| arch/x86/include/asm/system.h | 27 - |
| arch/x86/include/asm/termbits.h | 199 +-- |
| arch/x86/include/asm/termios.h | 115 +-- |
| arch/x86/include/asm/thread_info.h | 2 +- |
| arch/x86/include/asm/traps.h | 4 +- |
| arch/x86/include/asm/types.h | 12 +- |
| arch/x86/include/asm/ucontext.h | 8 +- |
| arch/x86/include/asm/vgtod.h | 1 + |
| arch/x86/kernel/Makefile | 2 +- |
| arch/x86/kernel/acpi/boot.c | 3 +- |
| arch/x86/kernel/apic/apic.c | 102 +- |
| arch/x86/kernel/apic/io_apic.c | 195 +-- |
| arch/x86/kernel/apic/ipi.c | 2 +- |
| arch/x86/kernel/apic/nmi.c | 20 +- |
| arch/x86/kernel/apic/probe_64.c | 6 +- |
| arch/x86/kernel/apm_32.c | 31 +- |
| arch/x86/kernel/cpu/amd.c | 37 +- |
| arch/x86/kernel/cpu/bugs.c | 10 +- |
| arch/x86/kernel/cpu/bugs_64.c | 2 +- |
| arch/x86/kernel/cpu/common.c | 68 +- |
| arch/x86/kernel/cpu/cyrix.c | 19 +- |
| arch/x86/kernel/cpu/hypervisor.c | 5 +- |
| arch/x86/kernel/cpu/intel.c | 11 +- |
| arch/x86/kernel/cpu/intel_cacheinfo.c | 116 +- |
| arch/x86/kernel/cpu/mtrr/amd.c | 97 +- |
| arch/x86/kernel/cpu/mtrr/centaur.c | 168 +-- |
| arch/x86/kernel/cpu/mtrr/cleanup.c | 390 ++-- |
| 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/perf_counter.c | 325 +++- |
| arch/x86/kernel/cpu/perfctr-watchdog.c | 45 +- |
| arch/x86/kernel/cpu/proc.c | 4 +- |
| arch/x86/kernel/cpu/vmware.c | 18 +- |
| arch/x86/kernel/doublefault_32.c | 4 +- |
| arch/x86/kernel/ds.c | 6 +- |
| arch/x86/kernel/dumpstack.c | 1 - |
| arch/x86/kernel/ftrace.c | 45 +- |
| arch/x86/kernel/hpet.c | 57 +- |
| arch/x86/kernel/hw_breakpoint.c | 391 ++++ |
| arch/x86/kernel/i8253.c | 19 - |
| arch/x86/kernel/irq_32.c | 5 +- |
| arch/x86/kernel/kgdb.c | 6 + |
| arch/x86/kernel/kprobes.c | 9 +- |
| arch/x86/kernel/machine_kexec_32.c | 2 + |
| arch/x86/kernel/machine_kexec_64.c | 2 + |
| arch/x86/kernel/pci-dma.c | 2 +- |
| arch/x86/kernel/pci-gart_64.c | 5 +- |
| arch/x86/kernel/pci-nommu.c | 29 +- |
| arch/x86/kernel/pci-swiotlb.c | 25 - |
| arch/x86/kernel/process.c | 22 +- |
| arch/x86/kernel/process_32.c | 58 +- |
| arch/x86/kernel/process_64.c | 65 +- |
| arch/x86/kernel/ptrace.c | 238 ++- |
| arch/x86/kernel/rtc.c | 5 +- |
| arch/x86/kernel/signal.c | 9 - |
| arch/x86/kernel/smpboot.c | 3 + |
| arch/x86/kernel/step.c | 9 +- |
| arch/x86/kernel/sys_x86_64.c | 8 +- |
| arch/x86/kernel/traps.c | 127 +- |
| arch/x86/kernel/tsc.c | 6 + |
| arch/x86/kernel/vsyscall_64.c | 1 + |
| arch/x86/kvm/x86.c | 7 +- |
| arch/x86/mm/fault.c | 51 +- |
| arch/x86/mm/highmem_32.c | 2 +- |
| arch/x86/mm/kmmio.c | 8 +- |
| arch/x86/oprofile/nmi_int.c | 404 +++-- |
| arch/x86/oprofile/op_counter.h | 2 +- |
| arch/x86/oprofile/op_model_amd.c | 372 ++-- |
| arch/x86/oprofile/op_model_p4.c | 72 +- |
| arch/x86/oprofile/op_model_ppro.c | 101 +- |
| arch/x86/oprofile/op_x86_model.h | 59 +- |
| arch/x86/power/cpu.c | 24 +- |
| arch/x86/vdso/vclock_gettime.c | 39 +- |
| arch/xtensa/kernel/time.c | 5 +- |
| drivers/char/sysrq.c | 19 +- |
| drivers/oprofile/cpu_buffer.c | 16 +- |
| drivers/oprofile/oprof.c | 71 +- |
| drivers/oprofile/oprof.h | 3 + |
| drivers/oprofile/oprofile_files.c | 46 + |
| drivers/oprofile/oprofile_stats.c | 5 + |
| drivers/oprofile/oprofile_stats.h | 1 + |
| drivers/pnp/pnpbios/bioscalls.c | 25 +- |
| fs/dcache.c | 1 + |
| fs/locks.c | 2 +- |
| include/asm-generic/cputime.h | 1 + |
| include/asm-generic/dma-mapping-common.h | 6 - |
| include/asm-generic/hw_breakpoint.h | 139 ++ |
| include/asm-generic/vmlinux.lds.h | 16 +- |
| include/linux/clocksource.h | 121 +-- |
| include/linux/compiler.h | 85 +- |
| include/linux/cpu.h | 17 +- |
| include/linux/dma-mapping.h | 5 - |
| include/linux/ftrace_event.h | 27 +- |
| include/linux/hardirq.h | 6 + |
| include/linux/hrtimer.h | 2 - |
| include/linux/interrupt.h | 4 + |
| include/linux/irq.h | 17 +- |
| include/linux/kernel.h | 97 +- |
| include/linux/lockdep.h | 18 +- |
| include/linux/module.h | 14 +- |
| include/linux/nmi.h | 19 +- |
| include/linux/oprofile.h | 5 +- |
| include/linux/percpu-defs.h | 8 +- |
| include/linux/perf_counter.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/ring_buffer.h | 1 - |
| include/linux/sched.h | 63 +- |
| include/linux/swiotlb.h | 11 - |
| include/linux/syscalls.h | 133 ++- |
| include/linux/time.h | 8 +- |
| include/linux/tracepoint.h | 31 +- |
| include/trace/events/module.h | 126 ++ |
| include/trace/ftrace.h | 36 +- |
| include/trace/syscall.h | 65 +- |
| init/Kconfig | 12 +- |
| kernel/Makefile | 2 +- |
| kernel/fork.c | 9 +- |
| kernel/futex.c | 47 +- |
| kernel/hrtimer.c | 57 - |
| kernel/hw_breakpoint.c | 378 ++++ |
| kernel/irq/chip.c | 83 +- |
| kernel/irq/internals.h | 13 + |
| kernel/irq/manage.c | 104 +- |
| kernel/irq/resend.c | 3 +- |
| kernel/irq/spurious.c | 1 - |
| kernel/itimer.c | 164 +- |
| kernel/kmod.c | 4 + |
| kernel/kprobes.c | 30 +- |
| kernel/lockdep.c | 788 +++++--- |
| kernel/lockdep_internals.h | 2 + |
| kernel/lockdep_proc.c | 120 +- |
| kernel/module.c | 11 + |
| kernel/posix-cpu-timers.c | 150 +- |
| kernel/posix-timers.c | 35 + |
| kernel/printk.c | 175 ++- |
| kernel/rcuclassic.c | 807 -------- |
| kernel/rcupdate.c | 44 +- |
| kernel/rcupreempt.c | 35 +- |
| kernel/rcupreempt_trace.c | 5 +- |
| kernel/rcutorture.c | 202 ++- |
| kernel/rcutree.c | 77 +- |
| kernel/sched.c | 925 ++++++--- |
| kernel/sched_cpupri.c | 30 +- |
| kernel/sched_fair.c | 30 +- |
| kernel/sched_rt.c | 56 +- |
| kernel/sysctl.c | 10 + |
| kernel/time/clocksource.c | 491 +++--- |
| kernel/time/jiffies.c | 6 +- |
| kernel/time/ntp.c | 7 +- |
| kernel/time/timekeeping.c | 535 ++++-- |
| kernel/timer.c | 24 +- |
| kernel/trace/Kconfig | 34 + |
| kernel/trace/Makefile | 1 + |
| kernel/trace/ftrace.c | 107 +- |
| kernel/trace/kmemtrace.c | 145 +- |
| kernel/trace/ring_buffer.c | 940 ++++++++-- |
| kernel/trace/trace.c | 222 +-- |
| kernel/trace/trace.h | 61 +- |
| kernel/trace/trace_branch.c | 73 +- |
| kernel/trace/trace_events.c | 133 ++- |
| kernel/trace/trace_events_filter.c | 169 +- |
| kernel/trace/trace_export.c | 19 +- |
| kernel/trace/trace_functions.c | 4 +- |
| kernel/trace/trace_functions_graph.c | 164 ++- |
| kernel/trace/trace_ksym.c | 550 ++++++ |
| kernel/trace/trace_sched_switch.c | 57 + |
| kernel/trace/trace_selftest.c | 54 + |
| kernel/trace/trace_stack.c | 43 +- |
| kernel/trace/trace_stat.c | 17 +- |
| kernel/trace/trace_stat.h | 2 + |
| kernel/trace/trace_syscalls.c | 458 ++++- |
| kernel/trace/trace_workqueue.c | 32 +- |
| kernel/tracepoint.c | 41 + |
| kernel/workqueue.c | 7 +- |
| lib/swiotlb.c | 124 +- |
| samples/Kconfig | 6 + |
| samples/Makefile | 3 +- |
| samples/hw_breakpoint/Makefile | 1 + |
| samples/hw_breakpoint/data_breakpoint.c | 83 + |
| scripts/recordmcount.pl | 1 - |
| tools/perf/Documentation/perf-report.txt | 3 + |
| tools/perf/Makefile | 16 +- |
| tools/perf/builtin-annotate.c | 459 +---- |
| tools/perf/builtin-help.c | 1 + |
| tools/perf/builtin-record.c | 33 +- |
| tools/perf/builtin-report.c | 699 ++------ |
| tools/perf/builtin-stat.c | 3 +- |
| tools/perf/builtin-top.c | 49 +- |
| tools/perf/builtin-trace.c | 282 +++ |
| tools/perf/builtin.h | 1 + |
| tools/perf/perf.c | 1 + |
| tools/perf/util/abspath.c | 3 +- |
| tools/perf/util/cache.h | 1 - |
| tools/perf/util/callchain.c | 2 + |
| tools/perf/util/callchain.h | 1 + |
| tools/perf/util/color.c | 16 +- |
| tools/perf/util/color.h | 3 +- |
| tools/perf/util/config.c | 22 +- |
| tools/perf/util/debug.c | 95 + |
| tools/perf/util/debug.h | 8 + |
| tools/perf/util/event.h | 96 + |
| tools/perf/util/exec_cmd.c | 1 - |
| tools/perf/util/header.c | 35 + |
| tools/perf/util/header.h | 4 + |
| tools/perf/util/map.c | 97 + |
| tools/perf/util/module.c | 4 +- |
| tools/perf/util/parse-events.c | 34 +- |
| tools/perf/util/parse-events.h | 4 +- |
| tools/perf/util/parse-options.c | 22 + |
| tools/perf/util/path.c | 25 +- |
| tools/perf/util/run-command.c | 6 +- |
| tools/perf/util/symbol.c | 199 ++- |
| tools/perf/util/symbol.h | 14 +- |
| tools/perf/util/thread.c | 162 ++ |
| tools/perf/util/thread.h | 19 + |
| tools/perf/util/trace-event-info.c | 491 +++++ |
| tools/perf/util/trace-event-parse.c | 2928 ++++++++++++++++++++++++++++ |
| tools/perf/util/trace-event-read.c | 508 +++++ |
| tools/perf/util/trace-event.h | 238 +++ |
| tools/perf/util/util.h | 6 +- |
| tools/perf/util/values.c | 230 +++ |
| tools/perf/util/values.h | 27 + |
| 313 files changed, 17855 insertions(+), 9244 deletions(-) |
| create mode 100644 Documentation/trace/ring-buffer-design.txt |
| delete mode 100644 arch/sparc/kernel/dma.h |
| create mode 100644 arch/x86/include/asm/hw_breakpoint.h |
| create mode 100644 arch/x86/include/asm/paravirt_types.h |
| create mode 100644 arch/x86/kernel/hw_breakpoint.c |
| create mode 100644 include/asm-generic/hw_breakpoint.h |
| delete mode 100644 include/linux/rcuclassic.h |
| create mode 100644 include/trace/events/module.h |
| create mode 100644 kernel/hw_breakpoint.c |
| delete mode 100644 kernel/rcuclassic.c |
| create mode 100644 kernel/trace/trace_ksym.c |
| create mode 100644 samples/hw_breakpoint/Makefile |
| create mode 100644 samples/hw_breakpoint/data_breakpoint.c |
| create mode 100644 tools/perf/builtin-trace.c |
| create mode 100644 tools/perf/util/debug.c |
| create mode 100644 tools/perf/util/debug.h |
| create mode 100644 tools/perf/util/event.h |
| create mode 100644 tools/perf/util/map.c |
| create mode 100644 tools/perf/util/thread.c |
| create mode 100644 tools/perf/util/thread.h |
| create mode 100644 tools/perf/util/trace-event-info.c |
| create mode 100644 tools/perf/util/trace-event-parse.c |
| create mode 100644 tools/perf/util/trace-event-read.c |
| create mode 100644 tools/perf/util/trace-event.h |
| create mode 100644 tools/perf/util/values.c |
| create mode 100644 tools/perf/util/values.h |
| Merging oprofile/for-next |
| $ git merge oprofile/for-next |
| Resolved 'kernel/trace/ring_buffer.c' using previous resolution. |
| Auto-merging kernel/trace/ring_buffer.c |
| CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 608821d] Merge commit 'oprofile/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| kernel/trace/ring_buffer.c | 11 ++++------- |
| 1 files changed, 4 insertions(+), 7 deletions(-) |
| Merging edac-amd/for-next |
| $ git merge edac-amd/for-next |
| Resolved 'arch/x86/kernel/smpboot.c' using previous resolution. |
| Resolved 'include/linux/topology.h' using previous resolution. |
| Auto-merging arch/x86/include/asm/processor.h |
| Auto-merging arch/x86/include/asm/smp.h |
| Auto-merging arch/x86/kernel/cpu/amd.c |
| Auto-merging arch/x86/kernel/cpu/common.c |
| Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c |
| Auto-merging arch/x86/kernel/cpu/mcheck/mce.c |
| Auto-merging arch/x86/kernel/cpu/proc.c |
| Auto-merging arch/x86/kernel/smpboot.c |
| CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c |
| Removing drivers/edac/amd64_edac_err_types.c |
| Auto-merging include/linux/topology.h |
| CONFLICT (content): Merge conflict in include/linux/topology.h |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 6a524ed] Merge commit 'edac-amd/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| arch/x86/include/asm/cpufeature.h | 1 + |
| arch/x86/include/asm/msr.h | 4 +- |
| arch/x86/include/asm/processor.h | 2 + |
| arch/x86/include/asm/smp.h | 6 + |
| arch/x86/include/asm/topology.h | 2 + |
| arch/x86/kernel/cpu/amd.c | 69 ++++- |
| arch/x86/kernel/cpu/common.c | 2 + |
| arch/x86/kernel/cpu/intel_cacheinfo.c | 30 ++- |
| arch/x86/kernel/cpu/mcheck/mce.c | 12 +- |
| arch/x86/kernel/cpu/mcheck/mce_amd.c | 6 +- |
| arch/x86/kernel/cpu/proc.c | 1 + |
| arch/x86/kernel/smpboot.c | 12 + |
| arch/x86/lib/msr.c | 46 ++-- |
| drivers/base/topology.c | 10 + |
| drivers/edac/Makefile | 6 +- |
| drivers/edac/amd64_edac.c | 555 +++++++++++++-------------------- |
| drivers/edac/amd64_edac.h | 71 +---- |
| drivers/edac/amd64_edac_dbg.c | 2 +- |
| drivers/edac/amd64_edac_err_types.c | 161 ---------- |
| drivers/edac/edac_mce_amd.c | 422 +++++++++++++++++++++++++ |
| drivers/edac/edac_mce_amd.h | 69 ++++ |
| include/linux/topology.h | 6 + |
| 22 files changed, 886 insertions(+), 609 deletions(-) |
| delete mode 100644 drivers/edac/amd64_edac_err_types.c |
| create mode 100644 drivers/edac/edac_mce_amd.c |
| create mode 100644 drivers/edac/edac_mce_amd.h |
| Merging percpu/for-next |
| $ git merge percpu/for-next |
| Resolved 'arch/sh/kernel/vmlinux.lds.S' using previous resolution. |
| Auto-merging Documentation/kernel-parameters.txt |
| Auto-merging Makefile |
| Auto-merging arch/ia64/kernel/smp.c |
| Auto-merging arch/powerpc/Kconfig |
| Auto-merging arch/powerpc/kernel/setup_64.c |
| Auto-merging arch/powerpc/kernel/vmlinux.lds.S |
| Auto-merging arch/powerpc/mm/stab.c |
| Auto-merging arch/s390/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/sparc/Kconfig |
| Auto-merging arch/x86/Kconfig |
| Auto-merging arch/x86/include/asm/percpu.h |
| Auto-merging arch/x86/kernel/cpu/mcheck/mce.c |
| Auto-merging arch/x86/kernel/cpu/mcheck/mce_amd.c |
| Auto-merging arch/x86/kernel/cpu/perf_counter.c |
| Auto-merging arch/x86/kernel/vmlinux.lds.S |
| Auto-merging block/cfq-iosched.c |
| Auto-merging drivers/cpufreq/cpufreq_ondemand.c |
| Auto-merging include/asm-generic/vmlinux.lds.h |
| Auto-merging include/linux/percpu-defs.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/quicklist.c |
| Auto-merging mm/slub.c |
| Auto-merging net/rds/ib_stats.c |
| Auto-merging net/rds/iw_stats.c |
| Auto-merging net/rds/page.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 8092489] Merge commit 'percpu/for-next' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/kernel-parameters.txt | 11 +- |
| 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/setup_64.c | 61 +- |
| 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 | 2 +- |
| arch/sparc/kernel/smp_64.c | 132 +--- |
| 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 | 5 +- |
| 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 | 364 +------- |
| arch/x86/kernel/vmlinux.lds.S | 11 +- |
| arch/x86/mm/pageattr.c | 21 +- |
| 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 | 88 ++- |
| include/linux/vmalloc.h | 6 + |
| 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 | 1421 ++++++++++++++++++++++++-------- |
| mm/quicklist.c | 2 +- |
| mm/slub.c | 4 +- |
| mm/vmalloc.c | 338 +++++++- |
| 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 + |
| 79 files changed, 1911 insertions(+), 1222 deletions(-) |
| create mode 100644 scripts/module-common.lds |
| Merging sfi/sfi-test |
| $ git merge sfi/sfi-test |
| Resolved 'arch/x86/include/asm/io_apic.h' using previous resolution. |
| Resolved 'arch/x86/kernel/acpi/boot.c' using previous resolution. |
| Resolved 'arch/x86/kernel/apic/io_apic.c' using previous resolution. |
| Resolved 'drivers/acpi/internal.h' using previous resolution. |
| Resolved 'drivers/acpi/tables.c' using previous resolution. |
| Resolved 'include/linux/acpi.h' using previous resolution. |
| Auto-merging MAINTAINERS |
| Auto-merging arch/x86/Kconfig |
| Auto-merging arch/x86/include/asm/io_apic.h |
| CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h |
| Auto-merging arch/x86/kernel/Makefile |
| Auto-merging arch/x86/kernel/acpi/boot.c |
| CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c |
| Auto-merging arch/x86/kernel/apic/io_apic.c |
| CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c |
| Auto-merging arch/x86/kernel/setup.c |
| Auto-merging arch/x86/pci/mmconfig-shared.c |
| Auto-merging drivers/acpi/container.c |
| Auto-merging drivers/acpi/dock.c |
| Auto-merging drivers/acpi/ec.c |
| Auto-merging drivers/acpi/glue.c |
| Auto-merging drivers/acpi/internal.h |
| CONFLICT (content): Merge conflict in drivers/acpi/internal.h |
| Auto-merging drivers/acpi/pci_root.c |
| Auto-merging drivers/acpi/processor_core.c |
| Auto-merging drivers/acpi/processor_idle.c |
| Auto-merging drivers/acpi/processor_perflib.c |
| Auto-merging drivers/acpi/processor_thermal.c |
| Auto-merging drivers/acpi/processor_throttling.c |
| Auto-merging drivers/acpi/tables.c |
| CONFLICT (content): Merge conflict in drivers/acpi/tables.c |
| Auto-merging drivers/pci/dmar.c |
| Auto-merging include/acpi/acpi_bus.h |
| Auto-merging include/linux/acpi.h |
| CONFLICT (content): Merge conflict in include/linux/acpi.h |
| Auto-merging init/main.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 44452d7] Merge commit 'sfi/sfi-test' |
| $ git diff -M --stat --summary HEAD^.. |
| MAINTAINERS | 12 ++ |
| arch/x86/Kconfig | 4 +- |
| arch/x86/include/asm/io_apic.h | 12 +- |
| arch/x86/kernel/Makefile | 1 + |
| arch/x86/kernel/acpi/boot.c | 80 +-------- |
| arch/x86/kernel/apic/io_apic.c | 79 ++++++++- |
| arch/x86/kernel/setup.c | 3 + |
| arch/x86/kernel/sfi.c | 133 +++++++++++++ |
| arch/x86/pci/mmconfig-shared.c | 8 +- |
| arch/x86/pci/mmconfig_32.c | 2 +- |
| drivers/Makefile | 1 + |
| drivers/acpi/internal.h | 2 +- |
| drivers/acpi/tables.c | 2 +- |
| drivers/sfi/Kconfig | 17 ++ |
| drivers/sfi/Makefile | 3 + |
| drivers/sfi/sfi_acpi.c | 175 +++++++++++++++++ |
| drivers/sfi/sfi_core.c | 412 ++++++++++++++++++++++++++++++++++++++++ |
| drivers/sfi/sfi_core.h | 70 +++++++ |
| include/linux/acpi.h | 2 +- |
| include/linux/sfi.h | 206 ++++++++++++++++++++ |
| include/linux/sfi_acpi.h | 93 +++++++++ |
| init/main.c | 2 + |
| 22 files changed, 1231 insertions(+), 88 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 hwpoison/hwpoison |
| $ git merge hwpoison/hwpoison |
| Auto-merging Documentation/filesystems/vfs.txt |
| Auto-merging arch/x86/mm/fault.c |
| Auto-merging fs/ext3/inode.c |
| Auto-merging fs/ext4/inode.c |
| Auto-merging fs/nfs/file.c |
| Auto-merging fs/ocfs2/aops.c |
| Auto-merging include/linux/fs.h |
| Auto-merging include/linux/sched.h |
| Auto-merging kernel/sysctl.c |
| Auto-merging mm/Makefile |
| Merge made by recursive. |
| Documentation/filesystems/vfs.txt | 7 + |
| Documentation/sysctl/vm.txt | 41 ++- |
| arch/x86/mm/fault.c | 19 +- |
| fs/btrfs/inode.c | 1 + |
| fs/ext2/inode.c | 2 + |
| fs/ext3/inode.c | 3 + |
| fs/ext4/inode.c | 4 + |
| fs/gfs2/aops.c | 3 + |
| fs/nfs/file.c | 1 + |
| fs/ntfs/aops.c | 2 + |
| fs/ocfs2/aops.c | 1 + |
| fs/proc/meminfo.c | 9 +- |
| fs/xfs/linux-2.6/xfs_aops.c | 1 + |
| include/asm-generic/mman-common.h | 1 + |
| include/asm-generic/siginfo.h | 8 +- |
| include/linux/fs.h | 1 + |
| include/linux/mm.h | 15 +- |
| include/linux/page-flags.h | 17 +- |
| include/linux/prctl.h | 2 + |
| include/linux/rmap.h | 21 +- |
| include/linux/sched.h | 2 + |
| include/linux/swap.h | 34 ++- |
| include/linux/swapops.h | 38 ++ |
| kernel/sys.c | 22 + |
| kernel/sysctl.c | 25 ++ |
| mm/Kconfig | 13 + |
| mm/Makefile | 2 + |
| mm/filemap.c | 4 + |
| mm/hwpoison-inject.c | 40 ++ |
| mm/madvise.c | 34 ++ |
| mm/memory-failure.c | 828 +++++++++++++++++++++++++++++++++++++ |
| mm/memory.c | 24 +- |
| mm/migrate.c | 2 +- |
| mm/page_alloc.c | 20 +- |
| mm/rmap.c | 60 ++- |
| mm/shmem.c | 1 + |
| mm/swapfile.c | 4 +- |
| mm/truncate.c | 72 +++- |
| mm/vmscan.c | 2 +- |
| 39 files changed, 1320 insertions(+), 66 deletions(-) |
| create mode 100644 mm/hwpoison-inject.c |
| create mode 100644 mm/memory-failure.c |
| Merging quilt/driver-core |
| $ git merge quilt/driver-core |
| Resolved 'drivers/base/class.c' using previous resolution. |
| Resolved 'init/main.c' using previous resolution. |
| Auto-merging MAINTAINERS |
| Auto-merging block/genhd.c |
| Auto-merging drivers/base/class.c |
| CONFLICT (content): Merge conflict in drivers/base/class.c |
| Auto-merging drivers/base/dd.c |
| Auto-merging drivers/base/platform.c |
| Auto-merging drivers/block/cciss.c |
| Auto-merging drivers/infiniband/hw/ehca/ehca_main.c |
| Auto-merging drivers/misc/enclosure.c |
| Auto-merging drivers/s390/cio/css.c |
| Auto-merging drivers/s390/cio/device.c |
| Auto-merging drivers/s390/net/netiucv.c |
| Auto-merging include/linux/device.h |
| Auto-merging include/linux/netdevice.h |
| Auto-merging init/main.c |
| CONFLICT (content): Merge conflict in init/main.c |
| Auto-merging kernel/Makefile |
| Auto-merging mm/shmem.c |
| Auto-merging net/core/net-sysfs.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 1153c82] Merge branch 'quilt/driver-core' |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/DocBook/uio-howto.tmpl | 163 ++++++++++++ |
| MAINTAINERS | 7 + |
| block/genhd.c | 2 +- |
| drivers/base/Kconfig | 25 ++ |
| drivers/base/Makefile | 2 + |
| drivers/base/base.h | 13 +- |
| drivers/base/bus.c | 23 +- |
| drivers/base/core.c | 29 ++- |
| drivers/base/dd.c | 31 +++- |
| drivers/base/devtmpfs.c | 367 ++++++++++++++++++++++++++++ |
| {kernel => drivers/base}/dma-coherent.c | 0 |
| drivers/base/driver.c | 4 +- |
| drivers/base/init.c | 1 + |
| drivers/base/platform.c | 8 +- |
| 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/misc/hpilo.c | 290 +++++++++++++++------- |
| drivers/misc/hpilo.h | 8 +- |
| 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 | 15 +- |
| drivers/uio/Makefile | 1 + |
| drivers/uio/uio_pci_generic.c | 207 ++++++++++++++++ |
| 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 | 37 ++-- |
| include/linux/netdevice.h | 2 +- |
| include/linux/pci_regs.h | 1 + |
| include/linux/shmem_fs.h | 3 + |
| include/linux/transport_class.h | 2 +- |
| init/do_mounts.c | 2 +- |
| init/main.c | 2 + |
| kernel/Makefile | 1 - |
| mm/shmem.c | 9 +- |
| net/bluetooth/hci_sysfs.c | 4 +- |
| net/core/net-sysfs.c | 2 +- |
| 53 files changed, 1174 insertions(+), 221 deletions(-) |
| create mode 100644 drivers/base/devtmpfs.c |
| rename {kernel => drivers/base}/dma-coherent.c (100%) |
| create mode 100644 drivers/uio/uio_pci_generic.c |
| Merging quilt/tty |
| $ git merge quilt/tty |
| Resolved 'arch/x86/include/asm/termios.h' using previous resolution. |
| Auto-merging arch/arm/mach-omap1/board-ams-delta.c |
| Auto-merging arch/x86/include/asm/termios.h |
| CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h |
| Auto-merging drivers/char/tty_ldisc.c |
| Auto-merging drivers/net/slip.c |
| Auto-merging drivers/serial/amba-pl011.c |
| Auto-merging drivers/serial/imx.c |
| Auto-merging drivers/serial/pxa.c |
| Auto-merging drivers/serial/sh-sci.c |
| Auto-merging drivers/usb/serial/io_edgeport.c |
| Auto-merging drivers/usb/serial/kl5kusb105.c |
| Auto-merging drivers/usb/serial/spcp8x5.c |
| Auto-merging include/linux/tty.h |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| [master 851ec3e] Merge branch 'quilt/tty' |
| $ git diff -M --stat --summary HEAD^.. |
| arch/mn10300/kernel/asm-offsets.c | 6 +- |
| drivers/char/cyclades.c | 2311 ++++++++----------------------- |
| drivers/char/esp.c | 7 +- |
| drivers/char/isicom.c | 57 +- |
| drivers/char/mxser.c | 53 +- |
| drivers/char/n_tty.c | 146 +- |
| drivers/char/riscom8.c | 162 +-- |
| drivers/char/tty_io.c | 22 +- |
| drivers/char/tty_ioctl.c | 4 +- |
| drivers/char/tty_ldisc.c | 82 +- |
| drivers/char/tty_port.c | 31 +- |
| drivers/char/vt.c | 14 +- |
| drivers/char/vt_ioctl.c | 482 ++++++- |
| 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 | 6 +- |
| drivers/serial/clps711x.c | 4 +- |
| drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- |
| drivers/serial/dz.c | 6 +- |
| drivers/serial/icom.c | 20 +- |
| 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 | 6 +- |
| drivers/serial/mux.c | 4 +- |
| drivers/serial/netx-serial.c | 6 +- |
| drivers/serial/nwpserial.c | 4 +- |
| drivers/serial/pmac_zilog.c | 20 +- |
| 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 | 876 ++++++------ |
| 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/class/cdc-acm.c | 5 +- |
| drivers/usb/serial/ark3116.c | 51 +- |
| drivers/usb/serial/belkin_sa.c | 4 +- |
| drivers/usb/serial/ch341.c | 5 +- |
| drivers/usb/serial/console.c | 4 +- |
| drivers/usb/serial/cp210x.c | 12 +- |
| drivers/usb/serial/cyberjack.c | 4 +- |
| drivers/usb/serial/cypress_m8.c | 18 +- |
| drivers/usb/serial/digi_acceleport.c | 6 +- |
| drivers/usb/serial/empeg.c | 18 +- |
| drivers/usb/serial/ftdi_sio.c | 6 +- |
| drivers/usb/serial/garmin_gps.c | 3 +- |
| drivers/usb/serial/generic.c | 3 +- |
| drivers/usb/serial/io_edgeport.c | 6 +- |
| drivers/usb/serial/io_ti.c | 3 +- |
| drivers/usb/serial/ipaq.c | 9 +- |
| drivers/usb/serial/ipw.c | 3 +- |
| drivers/usb/serial/ir-usb.c | 6 +- |
| drivers/usb/serial/iuu_phoenix.c | 34 +- |
| drivers/usb/serial/keyspan.c | 3 +- |
| drivers/usb/serial/keyspan.h | 3 +- |
| drivers/usb/serial/keyspan_pda.c | 2 +- |
| drivers/usb/serial/kl5kusb105.c | 10 +- |
| drivers/usb/serial/kobil_sct.c | 28 +- |
| drivers/usb/serial/mct_u232.c | 6 +- |
| drivers/usb/serial/mos7720.c | 123 ++- |
| drivers/usb/serial/mos7840.c | 118 +-- |
| drivers/usb/serial/navman.c | 3 +- |
| drivers/usb/serial/omninet.c | 6 +- |
| drivers/usb/serial/opticon.c | 3 +- |
| drivers/usb/serial/option.c | 6 +- |
| drivers/usb/serial/oti6858.c | 27 +- |
| drivers/usb/serial/pl2303.c | 5 +- |
| drivers/usb/serial/sierra.c | 3 +- |
| drivers/usb/serial/spcp8x5.c | 26 +- |
| drivers/usb/serial/symbolserial.c | 3 +- |
| drivers/usb/serial/ti_usb_3410_5052.c | 6 +- |
| drivers/usb/serial/usb-serial.c | 71 +- |
| drivers/usb/serial/usb_debug.c | 5 +- |
| drivers/usb/serial/visor.c | 6 +- |
| drivers/usb/serial/whiteheat.c | 11 +- |
| include/linux/cyclades.h | 11 +- |
| include/linux/hayesesp.h | 1 - |
| include/linux/kfifo.h | 4 +- |
| include/linux/serial.h | 2 + |
| include/linux/serial_8250.h | 1 + |
| include/linux/serial_core.h | 93 +- |
| include/linux/tty.h | 19 +- |
| include/linux/usb/serial.h | 10 +- |
| include/linux/vt.h | 32 +- |
| include/linux/vt_kern.h | 16 +- |
| kernel/kfifo.c | 2 +- |
| kernel/power/console.c | 63 +- |
| 116 files changed, 2422 insertions(+), 3388 deletions(-) |
| Merging quilt/usb |
| $ git merge quilt/usb |
| Auto-merging Documentation/kernel-parameters.txt |
| Auto-merging MAINTAINERS |
| Auto-merging drivers/usb/gadget/Kconfig |
| Auto-merging drivers/usb/gadget/u_ether.c |
| Auto-merging drivers/usb/host/Kconfig |
| Auto-merging drivers/usb/host/ehci-pci.c |
| Auto-merging drivers/usb/host/ehci.h |
| Auto-merging drivers/usb/host/ohci-pxa27x.c |
| Removing drivers/usb/mon/mon_dma.c |
| Auto-merging drivers/usb/musb/musb_core.c |
| Auto-merging include/linux/usb.h |
| Merge made by recursive. |
| Documentation/kernel-parameters.txt | 2 +- |
| Documentation/usb/usbmon.txt | 8 +- |
| Documentation/x86/earlyprintk.txt | 39 +- |
| MAINTAINERS | 4 +- |
| arch/x86/kernel/early_printk.c | 780 +--------- |
| drivers/net/usb/cdc_eem.c | 17 +- |
| drivers/usb/Kconfig | 3 + |
| drivers/usb/Makefile | 2 + |
| drivers/usb/class/usbtmc.c | 71 +- |
| drivers/usb/core/devio.c | 169 ++- |
| drivers/usb/core/driver.c | 41 +- |
| drivers/usb/core/generic.c | 4 +- |
| drivers/usb/core/hcd.c | 113 +- |
| drivers/usb/core/hub.c | 112 ++- |
| drivers/usb/core/message.c | 32 +- |
| drivers/usb/core/usb.c | 4 +- |
| drivers/usb/core/usb.h | 7 + |
| drivers/usb/early/Makefile | 5 + |
| drivers/usb/early/ehci-dbgp.c | 996 ++++++++++++ |
| drivers/usb/gadget/Kconfig | 30 +- |
| drivers/usb/gadget/amd5536udc.c | 56 +- |
| drivers/usb/gadget/at91_udc.c | 1 - |
| drivers/usb/gadget/audio.c | 24 +- |
| drivers/usb/gadget/composite.c | 2 +- |
| drivers/usb/gadget/dummy_hcd.c | 5 - |
| drivers/usb/gadget/ether.c | 31 +- |
| drivers/usb/gadget/f_audio.c | 97 +- |
| drivers/usb/gadget/f_eem.c | 562 +++++++ |
| drivers/usb/gadget/f_rndis.c | 15 +- |
| drivers/usb/gadget/fsl_qe_udc.c | 4 + |
| drivers/usb/gadget/gmidi.c | 8 +- |
| drivers/usb/gadget/pxa25x_udc.c | 49 +- |
| drivers/usb/gadget/pxa25x_udc.h | 1 + |
| drivers/usb/gadget/rndis.c | 13 +- |
| drivers/usb/gadget/rndis.h | 3 +- |
| drivers/usb/gadget/s3c-hsotg.c | 6 +- |
| drivers/usb/gadget/s3c2410_udc.c | 3 +- |
| drivers/usb/gadget/u_audio.c | 10 +- |
| drivers/usb/gadget/u_ether.c | 85 +- |
| drivers/usb/gadget/u_ether.h | 12 +- |
| drivers/usb/gadget/u_serial.c | 1 - |
| drivers/usb/host/Kconfig | 18 + |
| drivers/usb/host/Makefile | 1 + |
| drivers/usb/host/ehci-atmel.c | 230 +++ |
| drivers/usb/host/ehci-au1xxx.c | 29 +- |
| drivers/usb/host/ehci-dbg.c | 46 +- |
| drivers/usb/host/ehci-hcd.c | 89 +- |
| drivers/usb/host/ehci-hub.c | 84 +- |
| drivers/usb/host/ehci-mem.c | 26 +- |
| drivers/usb/host/ehci-pci.c | 42 +- |
| drivers/usb/host/ehci-q.c | 95 +- |
| drivers/usb/host/ehci-sched.c | 100 +- |
| drivers/usb/host/ehci-w90x900.c | 181 +++ |
| drivers/usb/host/ehci.h | 14 +- |
| drivers/usb/host/isp1362-hcd.c | 2909 +++++++++++++++++++++++++++++++++++ |
| drivers/usb/host/isp1362.h | 1079 +++++++++++++ |
| drivers/usb/host/isp1760-hcd.c | 4 + |
| drivers/usb/host/isp1760-hcd.h | 2 + |
| drivers/usb/host/isp1760-if.c | 21 +- |
| drivers/usb/host/ohci-at91.c | 2 +- |
| drivers/usb/host/ohci-au1xxx.c | 27 +- |
| drivers/usb/host/ohci-ep93xx.c | 1 - |
| drivers/usb/host/ohci-hcd.c | 1 - |
| drivers/usb/host/ohci-pxa27x.c | 4 + |
| drivers/usb/host/oxu210hp-hcd.c | 1 - |
| drivers/usb/host/uhci-q.c | 1 - |
| 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/image/microtek.c | 37 - |
| drivers/usb/misc/idmouse.c | 21 + |
| 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/misc/usbsevseg.c | 69 +- |
| 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/musb_core.c | 8 +- |
| drivers/usb/otg/isp1301_omap.c | 23 +- |
| drivers/usb/serial/ark3116.c | 24 +- |
| drivers/usb/serial/ch341.c | 52 + |
| drivers/usb/serial/generic.c | 147 ++- |
| drivers/usb/serial/iuu_phoenix.c | 115 ++- |
| drivers/usb/serial/moto_modem.c | 2 +- |
| drivers/usb/serial/option.c | 134 ++- |
| drivers/usb/serial/pl2303.c | 70 +- |
| drivers/usb/serial/usb-serial.c | 24 +- |
| drivers/usb/storage/datafab.c | 4 +- |
| drivers/usb/storage/initializers.c | 2 +- |
| drivers/usb/storage/jumpshot.c | 2 +- |
| drivers/usb/storage/unusual_devs.h | 22 +- |
| include/linux/usb.h | 25 +- |
| include/linux/usb/audio.h | 287 ++-- |
| include/linux/usb/ch9.h | 8 + |
| include/linux/usb/ehci_def.h | 35 + |
| include/linux/usb/isp1362.h | 46 + |
| include/linux/usb/isp1760.h | 18 + |
| include/linux/usb/serial.h | 2 + |
| include/linux/usbdevice_fs.h | 2 + |
| 107 files changed, 8022 insertions(+), 1837 deletions(-) |
| create mode 100644 drivers/usb/early/Makefile |
| create mode 100644 drivers/usb/early/ehci-dbgp.c |
| create mode 100644 drivers/usb/gadget/f_eem.c |
| create mode 100644 drivers/usb/host/ehci-atmel.c |
| create mode 100644 drivers/usb/host/ehci-w90x900.c |
| create mode 100644 drivers/usb/host/isp1362-hcd.c |
| create mode 100644 drivers/usb/host/isp1362.h |
| delete mode 100644 drivers/usb/mon/mon_dma.c |
| create mode 100644 include/linux/usb/isp1362.h |
| create mode 100644 include/linux/usb/isp1760.h |
| 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/comedi/comedi_fops.c |
| Removing drivers/staging/echo/bit_operations.h |
| Removing drivers/staging/echo/mmx.h |
| Removing drivers/staging/epl/Benchmark.h |
| Removing drivers/staging/epl/Debug.h |
| Removing drivers/staging/epl/Edrv8139.c |
| Removing drivers/staging/epl/EdrvFec.h |
| Removing drivers/staging/epl/EdrvSim.h |
| Removing drivers/staging/epl/Epl.h |
| Removing drivers/staging/epl/EplAmi.h |
| Removing drivers/staging/epl/EplApiGeneric.c |
| Removing drivers/staging/epl/EplApiLinux.h |
| Removing drivers/staging/epl/EplApiLinuxKernel.c |
| Removing drivers/staging/epl/EplApiProcessImage.c |
| Removing drivers/staging/epl/EplCfg.h |
| Removing drivers/staging/epl/EplDef.h |
| Removing drivers/staging/epl/EplDll.h |
| Removing drivers/staging/epl/EplDllCal.h |
| Removing drivers/staging/epl/EplDllk.c |
| Removing drivers/staging/epl/EplDllkCal.c |
| Removing drivers/staging/epl/EplDlluCal.c |
| Removing drivers/staging/epl/EplErrDef.h |
| Removing drivers/staging/epl/EplErrorHandlerk.c |
| Removing drivers/staging/epl/EplEvent.h |
| Removing drivers/staging/epl/EplEventk.c |
| Removing drivers/staging/epl/EplEventu.c |
| Removing drivers/staging/epl/EplFrame.h |
| Removing drivers/staging/epl/EplIdentu.c |
| Removing drivers/staging/epl/EplInc.h |
| Removing drivers/staging/epl/EplInstDef.h |
| Removing drivers/staging/epl/EplLed.h |
| Removing drivers/staging/epl/EplNmt.h |
| Removing drivers/staging/epl/EplNmtCnu.c |
| Removing drivers/staging/epl/EplNmtMnu.c |
| Removing drivers/staging/epl/EplNmtk.c |
| Removing drivers/staging/epl/EplNmtkCal.c |
| Removing drivers/staging/epl/EplNmtu.c |
| Removing drivers/staging/epl/EplNmtuCal.c |
| Removing drivers/staging/epl/EplObd.c |
| Removing drivers/staging/epl/EplObd.h |
| Removing drivers/staging/epl/EplObdMacro.h |
| Removing drivers/staging/epl/EplObdkCal.c |
| Removing drivers/staging/epl/EplObdu.c |
| Removing drivers/staging/epl/EplObduCal.c |
| Removing drivers/staging/epl/EplPdo.h |
| Removing drivers/staging/epl/EplPdok.c |
| Removing drivers/staging/epl/EplPdokCal.c |
| Removing drivers/staging/epl/EplPdou.c |
| Removing drivers/staging/epl/EplSdo.h |
| Removing drivers/staging/epl/EplSdoAc.h |
| Removing drivers/staging/epl/EplSdoAsndu.c |
| Removing drivers/staging/epl/EplSdoAsySequ.c |
| Removing drivers/staging/epl/EplSdoComu.c |
| Removing drivers/staging/epl/EplSdoUdpu.c |
| Removing drivers/staging/epl/EplStatusu.c |
| Removing drivers/staging/epl/EplTarget.h |
| Removing drivers/staging/epl/EplTimer.h |
| Removing drivers/staging/epl/EplTimeruLinuxKernel.c |
| Removing drivers/staging/epl/EplVersion.h |
| Removing drivers/staging/epl/Kconfig |
| Removing drivers/staging/epl/Makefile |
| Removing drivers/staging/epl/SharedBuff.c |
| Removing drivers/staging/epl/SharedBuff.h |
| Removing drivers/staging/epl/ShbIpc-LinuxKernel.c |
| Removing drivers/staging/epl/ShbIpc.h |
| Removing drivers/staging/epl/ShbLinuxKernel.h |
| Removing drivers/staging/epl/SocketLinuxKernel.c |
| Removing drivers/staging/epl/SocketLinuxKernel.h |
| Removing drivers/staging/epl/TimerHighReskX86.c |
| CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree. |
| Removing drivers/staging/epl/amix86.c |
| Removing drivers/staging/epl/demo_main.c |
| Removing drivers/staging/epl/edrv.h |
| Removing drivers/staging/epl/global.h |
| Removing drivers/staging/epl/kernel/EplDllk.h |
| Removing drivers/staging/epl/kernel/EplDllkCal.h |
| Removing drivers/staging/epl/kernel/EplErrorHandlerk.h |
| Removing drivers/staging/epl/kernel/EplEventk.h |
| Removing drivers/staging/epl/kernel/EplNmtk.h |
| Removing drivers/staging/epl/kernel/EplObdk.h |
| Removing drivers/staging/epl/kernel/EplPdok.h |
| Removing drivers/staging/epl/kernel/EplPdokCal.h |
| Removing drivers/staging/epl/kernel/EplTimerHighResk.h |
| Removing drivers/staging/epl/kernel/EplTimerk.h |
| Removing drivers/staging/epl/kernel/VirtualEthernet.h |
| Removing drivers/staging/epl/proc_fs.c |
| Removing drivers/staging/epl/proc_fs.h |
| Removing drivers/staging/epl/user/EplCfgMau.h |
| Removing drivers/staging/epl/user/EplDllu.h |
| Removing drivers/staging/epl/user/EplDlluCal.h |
| Removing drivers/staging/epl/user/EplEventu.h |
| Removing drivers/staging/epl/user/EplIdentu.h |
| Removing drivers/staging/epl/user/EplLedu.h |
| Removing drivers/staging/epl/user/EplNmtCnu.h |
| Removing drivers/staging/epl/user/EplNmtMnu.h |
| Removing drivers/staging/epl/user/EplNmtu.h |
| Removing drivers/staging/epl/user/EplNmtuCal.h |
| Removing drivers/staging/epl/user/EplObdu.h |
| Removing drivers/staging/epl/user/EplObduCal.h |
| Removing drivers/staging/epl/user/EplPdou.h |
| Removing drivers/staging/epl/user/EplSdoAsndu.h |
| Removing drivers/staging/epl/user/EplSdoAsySequ.h |
| Removing drivers/staging/epl/user/EplSdoComu.h |
| Removing drivers/staging/epl/user/EplSdoUdpu.h |
| Removing drivers/staging/epl/user/EplStatusu.h |
| Removing drivers/staging/epl/user/EplTimeru.h |
| Auto-merging drivers/staging/otus/usbdrv.c |
| Auto-merging drivers/staging/otus/wrap_pkt.c |
| Removing drivers/staging/pata_rdc/Kconfig |
| Removing drivers/staging/pata_rdc/Makefile |
| Removing drivers/staging/pata_rdc/pata_rdc.c |
| Removing drivers/staging/pata_rdc/pata_rdc.h |
| Auto-merging drivers/staging/rt2860/rt_main_dev.c |
| Auto-merging drivers/staging/rt2860/rtmp.h |
| Removing drivers/staging/rt2870/common/firmware.h |
| Removing drivers/staging/rt2870/link_list.h |
| Removing drivers/staging/rt3070/2870_main_dev.c |
| Removing drivers/staging/rt3070/Kconfig |
| Removing drivers/staging/rt3070/Makefile |
| Removing drivers/staging/rt3070/action.h |
| Removing drivers/staging/rt3070/aironet.h |
| Removing drivers/staging/rt3070/ap.h |
| Removing drivers/staging/rt3070/chlist.h |
| Removing drivers/staging/rt3070/common/2870_rtmp_init.c |
| Removing drivers/staging/rt3070/common/action.c |
| Removing drivers/staging/rt3070/common/ba_action.c |
| Removing drivers/staging/rt3070/common/cmm_data.c |
| Removing drivers/staging/rt3070/common/cmm_data_2870.c |
| Removing drivers/staging/rt3070/common/cmm_info.c |
| Removing drivers/staging/rt3070/common/cmm_sanity.c |
| Removing drivers/staging/rt3070/common/cmm_sync.c |
| Removing drivers/staging/rt3070/common/cmm_wpa.c |
| Removing drivers/staging/rt3070/common/dfs.c |
| Removing drivers/staging/rt3070/common/eeprom.c |
| Removing drivers/staging/rt3070/common/md5.c |
| Removing drivers/staging/rt3070/common/mlme.c |
| Removing drivers/staging/rt3070/common/rtmp_init.c |
| Removing drivers/staging/rt3070/common/rtmp_tkip.c |
| Removing drivers/staging/rt3070/common/rtmp_wep.c |
| Removing drivers/staging/rt3070/common/rtusb_bulk.c |
| Removing drivers/staging/rt3070/common/rtusb_data.c |
| Removing drivers/staging/rt3070/common/rtusb_io.c |
| Removing drivers/staging/rt3070/common/spectrum.c |
| Removing drivers/staging/rt3070/dfs.h |
| Removing drivers/staging/rt3070/link_list.h |
| Removing drivers/staging/rt3070/md5.h |
| Removing drivers/staging/rt3070/mlme.h |
| Removing drivers/staging/rt3070/oid.h |
| Removing drivers/staging/rt3070/rt2870.h |
| Removing drivers/staging/rt3070/rt28xx.h |
| Removing drivers/staging/rt3070/rt_config.h |
| Removing drivers/staging/rt3070/rt_linux.c |
| Removing drivers/staging/rt3070/rt_linux.h |
| Removing drivers/staging/rt3070/rt_main_dev.c |
| Removing drivers/staging/rt3070/rt_profile.c |
| Removing drivers/staging/rt3070/rtmp.h |
| Removing drivers/staging/rt3070/rtmp_ckipmic.h |
| Removing drivers/staging/rt3070/rtmp_def.h |
| Removing drivers/staging/rt3070/rtmp_type.h |
| Removing drivers/staging/rt3070/spectrum.h |
| Removing drivers/staging/rt3070/spectrum_def.h |
| Removing drivers/staging/rt3070/sta/aironet.c |
| Removing drivers/staging/rt3070/sta/assoc.c |
| Removing drivers/staging/rt3070/sta/auth.c |
| Removing drivers/staging/rt3070/sta/auth_rsp.c |
| Removing drivers/staging/rt3070/sta/connect.c |
| Removing drivers/staging/rt3070/sta/rtmp_data.c |
| Removing drivers/staging/rt3070/sta/sanity.c |
| Removing drivers/staging/rt3070/sta/sync.c |
| Removing drivers/staging/rt3070/sta/wpa.c |
| Removing drivers/staging/rt3070/sta_ioctl.c |
| Removing drivers/staging/rt3070/wpa.h |
| 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 |
| Auto-merging drivers/staging/rtl8187se/r8180_core.c |
| Removing drivers/staging/rtl8187se/r8180_gct.c |
| 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_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/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/scatterwalk.c |
| Removing drivers/staging/rtl8192su/ieee80211/scatterwalk.h |
| Removing drivers/staging/rtl8192su/r8190_rtl8256.c |
| Removing drivers/staging/rtl8192su/r8192S_FwImgDTM.h |
| Removing drivers/staging/rtl8192su/r819xU_firmware.c |
| Removing drivers/staging/rtl8192su/r819xU_firmware.h |
| Removing drivers/staging/rtl8192su/r819xU_firmware_img.c |
| Removing drivers/staging/rtl8192su/r819xU_firmware_img.h |
| Auto-merging drivers/staging/slicoss/slicoss.c |
| Removing drivers/staging/vt6655/Makefile.arm |
| Removing drivers/staging/vt6655/Makefile.x86 |
| Removing drivers/staging/vt6655/tpci.h |
| Auto-merging drivers/staging/winbond/wb35rx.c |
| Auto-merging drivers/staging/wlan-ng/p80211netdev.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git rm -f drivers/staging/epl/VirtualEthernetLinux.c |
| drivers/staging/epl/VirtualEthernetLinux.c: needs merge |
| rm 'drivers/staging/epl/VirtualEthernetLinux.c' |
| $ git commit -v -a |
| [master 2481c06] Merge branch 'quilt/staging' |
| $ git diff -M --stat --summary HEAD^.. |
| drivers/staging/Kconfig | 26 +- |
| drivers/staging/Makefile | 14 +- |
| drivers/staging/agnx/pci.c | 2 +- |
| drivers/staging/altpciechdma/altpciechdma.c | 2 +- |
| drivers/staging/android/binder.c | 713 +- |
| drivers/staging/android/lowmemorykiller.c | 41 +- |
| drivers/staging/android/lowmemorykiller.txt | 16 - |
| drivers/staging/at76_usb/at76_usb.c | 131 +- |
| drivers/staging/b3dfg/b3dfg.c | 41 +- |
| 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 +- |
| .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- |
| 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 | 497 +- |
| drivers/staging/comedi/drivers/c6xdigio.c | 42 +- |
| drivers/staging/comedi/drivers/cb_das16_cs.c | 168 +- |
| 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 | 25 +- |
| 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 | 109 +- |
| drivers/staging/comedi/drivers/ni_65xx.c | 402 +- |
| drivers/staging/comedi/drivers/ni_660x.c | 293 +- |
| drivers/staging/comedi/drivers/ni_670x.c | 101 +- |
| 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 | 128 +- |
| 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 | 343 +- |
| drivers/staging/comedi/drivers/ni_pcimio.c | 2065 +++--- |
| 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 | 19 +- |
| 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 | 104 +- |
| 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 | 1019 ++-- |
| 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/cowloop/Kconfig | 16 + |
| drivers/staging/cowloop/Makefile | 1 + |
| drivers/staging/cowloop/TODO | 11 + |
| drivers/staging/cowloop/cowloop.c | 2842 ++++++++ |
| drivers/staging/cowloop/cowloop.h | 66 + |
| drivers/staging/cpc-usb/TODO | 1 + |
| drivers/staging/cpc-usb/cpc-usb_drv.c | 1 - |
| drivers/staging/cpc-usb/cpc.h | 519 +- |
| drivers/staging/cpc-usb/cpc_int.h | 8 +- |
| drivers/staging/cpc-usb/cpcusb.h | 2 +- |
| drivers/staging/dream/Kconfig | 12 + |
| drivers/staging/dream/Makefile | 4 + |
| drivers/staging/dream/camera/Kconfig | 46 + |
| drivers/staging/dream/camera/Makefile | 7 + |
| drivers/staging/dream/camera/msm_camera.c | 2181 ++++++ |
| drivers/staging/dream/camera/msm_io7x.c | 291 + |
| drivers/staging/dream/camera/msm_io8x.c | 320 + |
| drivers/staging/dream/camera/msm_v4l2.c | 793 ++ |
| drivers/staging/dream/camera/msm_vfe7x.c | 701 ++ |
| drivers/staging/dream/camera/msm_vfe7x.h | 255 + |
| drivers/staging/dream/camera/msm_vfe8x.c | 756 ++ |
| drivers/staging/dream/camera/msm_vfe8x.h | 895 +++ |
| drivers/staging/dream/camera/msm_vfe8x_proc.c | 3995 +++++++++++ |
| drivers/staging/dream/camera/msm_vfe8x_proc.h | 1549 ++++ |
| drivers/staging/dream/camera/mt9d112.c | 761 ++ |
| drivers/staging/dream/camera/mt9d112.h | 36 + |
| drivers/staging/dream/camera/mt9d112_reg.c | 307 + |
| drivers/staging/dream/camera/mt9p012.h | 51 + |
| drivers/staging/dream/camera/mt9p012_fox.c | 1305 ++++ |
| drivers/staging/dream/camera/mt9p012_reg.c | 573 ++ |
| drivers/staging/dream/camera/mt9t013.c | 1496 ++++ |
| drivers/staging/dream/camera/mt9t013.h | 48 + |
| drivers/staging/dream/camera/mt9t013_reg.c | 266 + |
| drivers/staging/dream/camera/s5k3e2fx.c | 1310 ++++ |
| drivers/staging/dream/camera/s5k3e2fx.h | 9 + |
| drivers/staging/dream/gpio_axis.c | 180 + |
| drivers/staging/dream/gpio_event.c | 224 + |
| drivers/staging/dream/gpio_input.c | 343 + |
| drivers/staging/dream/gpio_matrix.c | 406 ++ |
| drivers/staging/dream/gpio_output.c | 84 + |
| drivers/staging/dream/qdsp5/Makefile | 17 + |
| drivers/staging/dream/qdsp5/adsp.c | 1163 +++ |
| drivers/staging/dream/qdsp5/adsp.h | 369 + |
| drivers/staging/dream/qdsp5/adsp_6210.c | 283 + |
| drivers/staging/dream/qdsp5/adsp_6220.c | 284 + |
| drivers/staging/dream/qdsp5/adsp_6225.c | 328 + |
| drivers/staging/dream/qdsp5/adsp_driver.c | 641 ++ |
| drivers/staging/dream/qdsp5/adsp_info.c | 121 + |
| .../staging/dream/qdsp5/adsp_jpeg_patch_event.c | 31 + |
| drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c | 182 + |
| drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c | 65 + |
| drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c | 54 + |
| drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c | 239 + |
| .../staging/dream/qdsp5/adsp_video_verify_cmd.c | 163 + |
| .../staging/dream/qdsp5/adsp_videoenc_verify_cmd.c | 235 + |
| drivers/staging/dream/qdsp5/audio_aac.c | 1052 +++ |
| drivers/staging/dream/qdsp5/audio_amrnb.c | 873 +++ |
| drivers/staging/dream/qdsp5/audio_evrc.c | 845 +++ |
| drivers/staging/dream/qdsp5/audio_in.c | 967 +++ |
| drivers/staging/dream/qdsp5/audio_mp3.c | 971 +++ |
| drivers/staging/dream/qdsp5/audio_out.c | 851 +++ |
| drivers/staging/dream/qdsp5/audio_qcelp.c | 856 +++ |
| drivers/staging/dream/qdsp5/audmgr.c | 313 + |
| drivers/staging/dream/qdsp5/audmgr.h | 215 + |
| drivers/staging/dream/qdsp5/audmgr_new.h | 213 + |
| drivers/staging/dream/qdsp5/audpp.c | 429 ++ |
| drivers/staging/dream/qdsp5/evlog.h | 133 + |
| drivers/staging/dream/qdsp5/snd.c | 279 + |
| drivers/staging/dream/smd/Kconfig | 26 + |
| drivers/staging/dream/smd/Makefile | 6 + |
| .../staging/dream/smd/rpc_server_dog_keepalive.c | 68 + |
| drivers/staging/dream/smd/rpc_server_time_remote.c | 77 + |
| drivers/staging/dream/smd/smd.c | 1330 ++++ |
| drivers/staging/dream/smd/smd_private.h | 171 + |
| drivers/staging/dream/smd/smd_qmi.c | 860 +++ |
| drivers/staging/dream/smd/smd_rpcrouter.c | 1274 ++++ |
| drivers/staging/dream/smd/smd_rpcrouter.h | 195 + |
| drivers/staging/dream/smd/smd_rpcrouter_device.c | 376 + |
| drivers/staging/dream/smd/smd_rpcrouter_servers.c | 229 + |
| drivers/staging/dream/smd/smd_tty.c | 213 + |
| drivers/staging/dream/synaptics_i2c_rmi.c | 658 ++ |
| drivers/staging/dream/synaptics_i2c_rmi.h | 53 + |
| drivers/staging/dst/export.c | 2 +- |
| drivers/staging/echo/TODO | 5 +- |
| drivers/staging/echo/bit_operations.h | 226 - |
| drivers/staging/echo/echo.c | 190 +- |
| drivers/staging/echo/echo.h | 15 +- |
| drivers/staging/echo/fir.h | 109 +- |
| drivers/staging/echo/mmx.h | 281 - |
| drivers/staging/echo/oslec.h | 70 +- |
| drivers/staging/epl/Benchmark.h | 425 -- |
| drivers/staging/epl/Debug.h | 694 -- |
| drivers/staging/epl/Edrv8139.c | 1246 ---- |
| drivers/staging/epl/EdrvFec.h | 114 - |
| drivers/staging/epl/EdrvSim.h | 89 - |
| drivers/staging/epl/Epl.h | 272 - |
| drivers/staging/epl/EplAmi.h | 323 - |
| drivers/staging/epl/EplApiGeneric.c | 2054 ------ |
| drivers/staging/epl/EplApiLinux.h | 141 - |
| drivers/staging/epl/EplApiLinuxKernel.c | 1173 --- |
| drivers/staging/epl/EplApiProcessImage.c | 328 - |
| drivers/staging/epl/EplCfg.h | 196 - |
| drivers/staging/epl/EplDef.h | 355 - |
| drivers/staging/epl/EplDll.h | 205 - |
| drivers/staging/epl/EplDllCal.h | 123 - |
| drivers/staging/epl/EplDllk.c | 4052 ----------- |
| drivers/staging/epl/EplDllkCal.c | 1260 ---- |
| drivers/staging/epl/EplDlluCal.c | 529 -- |
| drivers/staging/epl/EplErrDef.h | 294 - |
| drivers/staging/epl/EplErrorHandlerk.c | 810 --- |
| drivers/staging/epl/EplEvent.h | 279 - |
| drivers/staging/epl/EplEventk.c | 853 --- |
| drivers/staging/epl/EplEventu.c | 813 --- |
| drivers/staging/epl/EplFrame.h | 344 - |
| drivers/staging/epl/EplIdentu.c | 486 -- |
| drivers/staging/epl/EplInc.h | 370 - |
| drivers/staging/epl/EplInstDef.h | 363 - |
| drivers/staging/epl/EplLed.h | 92 - |
| drivers/staging/epl/EplNmt.h | 230 - |
| drivers/staging/epl/EplNmtCnu.c | 701 -- |
| drivers/staging/epl/EplNmtMnu.c | 2828 -------- |
| drivers/staging/epl/EplNmtk.c | 1840 ----- |
| drivers/staging/epl/EplNmtkCal.c | 147 - |
| drivers/staging/epl/EplNmtu.c | 706 -- |
| drivers/staging/epl/EplNmtuCal.c | 158 - |
| drivers/staging/epl/EplObd.c | 3192 --------- |
| drivers/staging/epl/EplObd.h | 456 -- |
| drivers/staging/epl/EplObdMacro.h | 354 - |
| drivers/staging/epl/EplObdkCal.c | 146 - |
| drivers/staging/epl/EplObdu.c | 506 -- |
| drivers/staging/epl/EplObduCal.c | 543 -- |
| drivers/staging/epl/EplPdo.h | 117 - |
| drivers/staging/epl/EplPdok.c | 669 -- |
| drivers/staging/epl/EplPdokCal.c | 266 - |
| drivers/staging/epl/EplPdou.c | 565 -- |
| drivers/staging/epl/EplSdo.h | 241 - |
| drivers/staging/epl/EplSdoAc.h | 111 - |
| drivers/staging/epl/EplSdoAsndu.c | 483 -- |
| drivers/staging/epl/EplSdoAsySequ.c | 2522 ------- |
| drivers/staging/epl/EplSdoComu.c | 3345 --------- |
| drivers/staging/epl/EplSdoUdpu.c | 650 -- |
| drivers/staging/epl/EplStatusu.c | 377 - |
| drivers/staging/epl/EplTarget.h | 140 - |
| drivers/staging/epl/EplTimer.h | 116 - |
| drivers/staging/epl/EplTimeruLinuxKernel.c | 446 -- |
| drivers/staging/epl/EplVersion.h | 98 - |
| drivers/staging/epl/Kconfig | 6 - |
| drivers/staging/epl/Makefile | 41 - |
| drivers/staging/epl/SharedBuff.c | 1762 ----- |
| drivers/staging/epl/SharedBuff.h | 187 - |
| drivers/staging/epl/ShbIpc-LinuxKernel.c | 944 --- |
| drivers/staging/epl/ShbIpc.h | 99 - |
| drivers/staging/epl/ShbLinuxKernel.h | 68 - |
| drivers/staging/epl/SocketLinuxKernel.c | 197 - |
| drivers/staging/epl/SocketLinuxKernel.h | 105 - |
| drivers/staging/epl/TimerHighReskX86.c | 510 -- |
| drivers/staging/epl/VirtualEthernetLinux.c | 348 - |
| drivers/staging/epl/amix86.c | 861 --- |
| drivers/staging/epl/demo_main.c | 947 --- |
| drivers/staging/epl/edrv.h | 167 - |
| drivers/staging/epl/global.h | 144 - |
| drivers/staging/epl/kernel/EplDllk.h | 153 - |
| drivers/staging/epl/kernel/EplDllkCal.h | 129 - |
| drivers/staging/epl/kernel/EplErrorHandlerk.h | 88 - |
| drivers/staging/epl/kernel/EplEventk.h | 96 - |
| drivers/staging/epl/kernel/EplNmtk.h | 90 - |
| drivers/staging/epl/kernel/EplObdk.h | 156 - |
| drivers/staging/epl/kernel/EplPdok.h | 98 - |
| drivers/staging/epl/kernel/EplPdokCal.h | 86 - |
| drivers/staging/epl/kernel/EplTimerHighResk.h | 96 - |
| drivers/staging/epl/kernel/EplTimerk.h | 108 - |
| drivers/staging/epl/kernel/VirtualEthernet.h | 84 - |
| drivers/staging/epl/proc_fs.c | 410 -- |
| drivers/staging/epl/proc_fs.h | 89 - |
| drivers/staging/epl/user/EplCfgMau.h | 276 - |
| drivers/staging/epl/user/EplDllu.h | 96 - |
| drivers/staging/epl/user/EplDlluCal.h | 106 - |
| drivers/staging/epl/user/EplEventu.h | 96 - |
| drivers/staging/epl/user/EplIdentu.h | 94 - |
| drivers/staging/epl/user/EplLedu.h | 95 - |
| drivers/staging/epl/user/EplNmtCnu.h | 92 - |
| drivers/staging/epl/user/EplNmtMnu.h | 117 - |
| drivers/staging/epl/user/EplNmtu.h | 139 - |
| drivers/staging/epl/user/EplNmtuCal.h | 80 - |
| drivers/staging/epl/user/EplObdu.h | 169 - |
| drivers/staging/epl/user/EplObduCal.h | 126 - |
| drivers/staging/epl/user/EplPdou.h | 96 - |
| drivers/staging/epl/user/EplSdoAsndu.h | 96 - |
| drivers/staging/epl/user/EplSdoAsySequ.h | 100 - |
| drivers/staging/epl/user/EplSdoComu.h | 114 - |
| drivers/staging/epl/user/EplSdoUdpu.h | 97 - |
| drivers/staging/epl/user/EplStatusu.h | 90 - |
| drivers/staging/epl/user/EplTimeru.h | 95 - |
| drivers/staging/et131x/et1310_address_map.h | 2138 +++--- |
| drivers/staging/et131x/et1310_eeprom.c | 56 +- |
| drivers/staging/et131x/et1310_eeprom.h | 6 +- |
| drivers/staging/et131x/et1310_jagcore.c | 40 +- |
| drivers/staging/et131x/et1310_jagcore.h | 17 +- |
| drivers/staging/et131x/et1310_mac.c | 312 +- |
| drivers/staging/et131x/et1310_mac.h | 8 +- |
| drivers/staging/et131x/et1310_phy.c | 538 +- |
| drivers/staging/et131x/et1310_phy.h | 904 ++-- |
| drivers/staging/et131x/et1310_pm.c | 65 +- |
| drivers/staging/et131x/et1310_pm.h | 18 +- |
| drivers/staging/et131x/et1310_rx.c | 299 +- |
| drivers/staging/et131x/et1310_rx.h | 194 +- |
| drivers/staging/et131x/et1310_tx.c | 550 +- |
| drivers/staging/et131x/et1310_tx.h | 102 +- |
| drivers/staging/et131x/et131x_adapter.h | 72 +- |
| drivers/staging/et131x/et131x_config.c | 124 +- |
| drivers/staging/et131x/et131x_debug.c | 32 +- |
| drivers/staging/et131x/et131x_debug.h | 24 +- |
| drivers/staging/et131x/et131x_defs.h | 12 +- |
| drivers/staging/et131x/et131x_initpci.c | 156 +- |
| drivers/staging/et131x/et131x_initpci.h | 6 +- |
| drivers/staging/et131x/et131x_isr.c | 83 +- |
| drivers/staging/et131x/et131x_isr.h | 6 +- |
| drivers/staging/et131x/et131x_netdev.c | 171 +- |
| drivers/staging/et131x/et131x_netdev.h | 6 +- |
| drivers/staging/et131x/et131x_version.h | 6 +- |
| drivers/staging/hv/BlkVsc.c | 115 + |
| drivers/staging/hv/Channel.c | 1148 +++ |
| drivers/staging/hv/Channel.h | 112 + |
| drivers/staging/hv/ChannelInterface.c | 218 + |
| drivers/staging/hv/ChannelInterface.h | 34 + |
| drivers/staging/hv/ChannelMgmt.c | 788 ++ |
| drivers/staging/hv/ChannelMgmt.h | 136 + |
| drivers/staging/hv/Connection.c | 433 ++ |
| drivers/staging/hv/Hv.c | 646 ++ |
| drivers/staging/hv/Hv.h | 144 + |
| drivers/staging/hv/Kconfig | 32 + |
| drivers/staging/hv/Makefile | 11 + |
| drivers/staging/hv/NetVsc.c | 1516 ++++ |
| drivers/staging/hv/NetVsc.h | 88 + |
| drivers/staging/hv/RingBuffer.c | 606 ++ |
| drivers/staging/hv/RingBuffer.h | 101 + |
| drivers/staging/hv/RndisFilter.c | 1144 +++ |
| drivers/staging/hv/RndisFilter.h | 55 + |
| drivers/staging/hv/StorVsc.c | 983 +++ |
| drivers/staging/hv/TODO | 14 + |
| drivers/staging/hv/VersionInfo.h | 31 + |
| drivers/staging/hv/Vmbus.c | 519 ++ |
| drivers/staging/hv/VmbusPrivate.h | 134 + |
| drivers/staging/hv/blkvsc_drv.c | 1523 ++++ |
| drivers/staging/hv/hv_api.h | 905 +++ |
| drivers/staging/hv/include/ChannelMessages.h | 217 + |
| drivers/staging/hv/include/List.h | 263 + |
| drivers/staging/hv/include/NetVscApi.h | 153 + |
| drivers/staging/hv/include/StorVscApi.h | 139 + |
| drivers/staging/hv/include/VmbusApi.h | 231 + |
| drivers/staging/hv/include/VmbusChannelInterface.h | 89 + |
| drivers/staging/hv/include/VmbusPacketFormat.h | 320 + |
| drivers/staging/hv/include/logging.h | 119 + |
| drivers/staging/hv/include/nvspprotocol.h | 306 + |
| drivers/staging/hv/include/vstorage.h | 204 + |
| drivers/staging/hv/netvsc_drv.c | 706 ++ |
| drivers/staging/hv/osd.c | 156 + |
| drivers/staging/hv/osd.h | 69 + |
| drivers/staging/hv/rndis.h | 652 ++ |
| drivers/staging/hv/storvsc_drv.c | 1202 ++++ |
| drivers/staging/hv/vmbus.h | 81 + |
| drivers/staging/hv/vmbus_drv.c | 1130 +++ |
| drivers/staging/iio/Documentation/device.txt | 49 + |
| drivers/staging/iio/Documentation/iio_utils.h | 159 + |
| .../iio/Documentation/lis3l02dqbuffersimple.c | 171 + |
| drivers/staging/iio/Documentation/overview.txt | 62 + |
| drivers/staging/iio/Documentation/ring.txt | 61 + |
| drivers/staging/iio/Documentation/trigger.txt | 38 + |
| drivers/staging/iio/Documentation/userspace.txt | 60 + |
| drivers/staging/iio/Kconfig | 47 + |
| drivers/staging/iio/Makefile | 16 + |
| drivers/staging/iio/TODO | 69 + |
| drivers/staging/iio/accel/Kconfig | 27 + |
| drivers/staging/iio/accel/Makefile | 11 + |
| drivers/staging/iio/accel/accel.h | 167 + |
| drivers/staging/iio/accel/kxsd9.c | 395 + |
| drivers/staging/iio/accel/lis3l02dq.h | 232 + |
| drivers/staging/iio/accel/lis3l02dq_core.c | 926 +++ |
| drivers/staging/iio/accel/lis3l02dq_ring.c | 599 ++ |
| drivers/staging/iio/accel/sca3000.h | 298 + |
| drivers/staging/iio/accel/sca3000_core.c | 1509 ++++ |
| drivers/staging/iio/accel/sca3000_ring.c | 331 + |
| drivers/staging/iio/adc/Kconfig | 13 + |
| drivers/staging/iio/adc/Makefile | 8 + |
| drivers/staging/iio/adc/adc.h | 13 + |
| drivers/staging/iio/adc/max1363.h | 269 + |
| drivers/staging/iio/adc/max1363_core.c | 623 ++ |
| drivers/staging/iio/adc/max1363_ring.c | 241 + |
| drivers/staging/iio/chrdev.h | 118 + |
| drivers/staging/iio/iio.h | 411 ++ |
| drivers/staging/iio/industrialio-core.c | 851 +++ |
| drivers/staging/iio/industrialio-ring.c | 568 ++ |
| drivers/staging/iio/industrialio-trigger.c | 399 ++ |
| drivers/staging/iio/light/Kconfig | 13 + |
| drivers/staging/iio/light/Makefile | 5 + |
| drivers/staging/iio/light/light.h | 12 + |
| drivers/staging/iio/light/tsl2561.c | 276 + |
| drivers/staging/iio/ring_generic.h | 283 + |
| drivers/staging/iio/ring_hw.h | 22 + |
| drivers/staging/iio/ring_sw.c | 433 ++ |
| drivers/staging/iio/ring_sw.h | 189 + |
| drivers/staging/iio/sysfs.h | 293 + |
| drivers/staging/iio/trigger.h | 151 + |
| drivers/staging/iio/trigger/Kconfig | 21 + |
| drivers/staging/iio/trigger/Makefile | 5 + |
| drivers/staging/iio/trigger/iio-trig-gpio.c | 202 + |
| .../staging/iio/trigger/iio-trig-periodic-rtc.c | 228 + |
| drivers/staging/iio/trigger_consumer.h | 45 + |
| drivers/staging/line6/driver.c | 2 +- |
| drivers/staging/meilhaus/me0600_device.h | 2 +- |
| drivers/staging/meilhaus/me0900_device.h | 2 +- |
| drivers/staging/meilhaus/me1400_device.h | 2 +- |
| drivers/staging/meilhaus/me1600_device.h | 2 +- |
| drivers/staging/meilhaus/me4600_ai.c | 16 +- |
| drivers/staging/meilhaus/me4600_device.h | 2 +- |
| drivers/staging/meilhaus/me6000_device.h | 2 +- |
| drivers/staging/meilhaus/me8100_device.h | 2 +- |
| drivers/staging/meilhaus/me8200_device.h | 2 +- |
| drivers/staging/meilhaus/metempl_device.h | 2 +- |
| drivers/staging/otus/80211core/cagg.c | 6 +- |
| drivers/staging/otus/80211core/cmm.c | 4 +- |
| drivers/staging/otus/80211core/performance.c | 6 +- |
| drivers/staging/otus/hal/hpmain.c | 2 +- |
| drivers/staging/otus/ioctl.c | 25 +- |
| drivers/staging/otus/usbdrv.c | 14 - |
| drivers/staging/otus/usbdrv.h | 4 - |
| 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/panel/panel.c | 50 +- |
| drivers/staging/pata_rdc/Kconfig | 6 - |
| drivers/staging/pata_rdc/Makefile | 2 - |
| drivers/staging/pata_rdc/pata_rdc.c | 955 --- |
| drivers/staging/pata_rdc/pata_rdc.h | 144 - |
| drivers/staging/pohmelfs/config.c | 3 +- |
| drivers/staging/pohmelfs/dir.c | 2 +- |
| drivers/staging/pohmelfs/inode.c | 2 +- |
| drivers/staging/pohmelfs/net.c | 2 +- |
| drivers/staging/quatech_usb2/Kconfig | 15 + |
| drivers/staging/quatech_usb2/Makefile | 1 + |
| drivers/staging/quatech_usb2/TODO | 8 + |
| drivers/staging/quatech_usb2/quatech_usb2.c | 2025 ++++++ |
| drivers/staging/rar/Kconfig | 17 + |
| drivers/staging/rar/Makefile | 2 + |
| drivers/staging/rar/rar_driver.c | 444 ++ |
| drivers/staging/rar/rar_driver.h | 99 + |
| drivers/staging/rspiusb/rspiusb.c | 16 +- |
| drivers/staging/rt2860/ap.h | 453 -- |
| drivers/staging/rt2860/chlist.h | 5 - |
| drivers/staging/rt2860/common/action.c | 11 +- |
| drivers/staging/rt2860/common/ba_action.c | 15 - |
| drivers/staging/rt2860/common/cmm_data.c | 296 +- |
| drivers/staging/rt2860/common/cmm_info.c | 25 +- |
| drivers/staging/rt2860/common/cmm_sanity.c | 184 - |
| drivers/staging/rt2860/common/cmm_wpa.c | 806 +--- |
| drivers/staging/rt2860/common/eeprom.c | 55 +- |
| drivers/staging/rt2860/common/mlme.c | 590 +-- |
| drivers/staging/rt2860/common/rtmp_init.c | 333 +- |
| drivers/staging/rt2860/common/spectrum.c | 5 - |
| drivers/staging/rt2860/dfs.h | 12 - |
| drivers/staging/rt2860/oid.h | 170 +- |
| drivers/staging/rt2860/rt28xx.h | 22 +- |
| drivers/staging/rt2860/rt_config.h | 4 - |
| drivers/staging/rt2860/rt_linux.c | 15 +- |
| drivers/staging/rt2860/rt_linux.h | 118 +- |
| drivers/staging/rt2860/rt_main_dev.c | 57 +- |
| drivers/staging/rt2860/rt_profile.c | 44 +- |
| drivers/staging/rt2860/rtmp.h | 719 +-- |
| drivers/staging/rt2860/rtmp_ckipmic.h | 35 - |
| drivers/staging/rt2860/rtmp_def.h | 14 - |
| drivers/staging/rt2860/sta/assoc.c | 26 - |
| drivers/staging/rt2860/sta/connect.c | 15 +- |
| drivers/staging/rt2860/sta/rtmp_data.c | 15 +- |
| drivers/staging/rt2860/sta/sync.c | 2 - |
| drivers/staging/rt2860/sta/wpa.c | 9 - |
| drivers/staging/rt2860/sta_ioctl.c | 3174 +-------- |
| drivers/staging/rt2860/wpa.h | 3 - |
| drivers/staging/rt2870/2870_main_dev.c | 196 +- |
| drivers/staging/rt2870/Kconfig | 5 +- |
| drivers/staging/rt2870/Makefile | 2 +- |
| drivers/staging/rt2870/common/2870_rtmp_init.c | 63 +- |
| drivers/staging/rt2870/common/cmm_data_2870.c | 30 - |
| drivers/staging/rt2870/common/firmware.h | 558 -- |
| drivers/staging/rt2870/common/rtusb_bulk.c | 3 +- |
| drivers/staging/rt2870/common/rtusb_io.c | 81 +- |
| drivers/staging/rt2870/link_list.h | 1 - |
| drivers/staging/rt2870/rt2870.h | 215 +- |
| drivers/staging/rt3070/2870_main_dev.c | 1 - |
| drivers/staging/rt3070/Kconfig | 6 - |
| drivers/staging/rt3070/Makefile | 43 - |
| drivers/staging/rt3070/action.h | 1 - |
| drivers/staging/rt3070/aironet.h | 1 - |
| drivers/staging/rt3070/ap.h | 1 - |
| drivers/staging/rt3070/chlist.h | 1 - |
| drivers/staging/rt3070/common/2870_rtmp_init.c | 1 - |
| drivers/staging/rt3070/common/action.c | 1 - |
| drivers/staging/rt3070/common/ba_action.c | 1 - |
| drivers/staging/rt3070/common/cmm_data.c | 1 - |
| drivers/staging/rt3070/common/cmm_data_2870.c | 1 - |
| drivers/staging/rt3070/common/cmm_info.c | 1 - |
| drivers/staging/rt3070/common/cmm_sanity.c | 1 - |
| drivers/staging/rt3070/common/cmm_sync.c | 1 - |
| drivers/staging/rt3070/common/cmm_wpa.c | 1 - |
| drivers/staging/rt3070/common/dfs.c | 1 - |
| drivers/staging/rt3070/common/eeprom.c | 1 - |
| drivers/staging/rt3070/common/md5.c | 1 - |
| drivers/staging/rt3070/common/mlme.c | 1 - |
| drivers/staging/rt3070/common/rtmp_init.c | 1 - |
| drivers/staging/rt3070/common/rtmp_tkip.c | 1 - |
| drivers/staging/rt3070/common/rtmp_wep.c | 1 - |
| drivers/staging/rt3070/common/rtusb_bulk.c | 1 - |
| drivers/staging/rt3070/common/rtusb_data.c | 1 - |
| drivers/staging/rt3070/common/rtusb_io.c | 1 - |
| drivers/staging/rt3070/common/spectrum.c | 1 - |
| drivers/staging/rt3070/dfs.h | 1 - |
| drivers/staging/rt3070/link_list.h | 1 - |
| drivers/staging/rt3070/md5.h | 1 - |
| drivers/staging/rt3070/mlme.h | 1 - |
| drivers/staging/rt3070/oid.h | 1 - |
| drivers/staging/rt3070/rt2870.h | 1 - |
| drivers/staging/rt3070/rt28xx.h | 1 - |
| drivers/staging/rt3070/rt_config.h | 1 - |
| drivers/staging/rt3070/rt_linux.c | 1 - |
| drivers/staging/rt3070/rt_linux.h | 1 - |
| drivers/staging/rt3070/rt_main_dev.c | 1 - |
| drivers/staging/rt3070/rt_profile.c | 1 - |
| drivers/staging/rt3070/rtmp.h | 1 - |
| drivers/staging/rt3070/rtmp_ckipmic.h | 1 - |
| drivers/staging/rt3070/rtmp_def.h | 1 - |
| drivers/staging/rt3070/rtmp_type.h | 1 - |
| drivers/staging/rt3070/spectrum.h | 1 - |
| drivers/staging/rt3070/spectrum_def.h | 1 - |
| drivers/staging/rt3070/sta/aironet.c | 1 - |
| drivers/staging/rt3070/sta/assoc.c | 1 - |
| drivers/staging/rt3070/sta/auth.c | 1 - |
| drivers/staging/rt3070/sta/auth_rsp.c | 1 - |
| drivers/staging/rt3070/sta/connect.c | 2 - |
| drivers/staging/rt3070/sta/rtmp_data.c | 1 - |
| drivers/staging/rt3070/sta/sanity.c | 1 - |
| drivers/staging/rt3070/sta/sync.c | 1 - |
| drivers/staging/rt3070/sta/wpa.c | 1 - |
| drivers/staging/rt3070/sta_ioctl.c | 1 - |
| drivers/staging/rt3070/wpa.h | 1 - |
| 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 +- |
| .../{rt2870/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/{rt2870/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/{rt2870/md4.h => rt3090/crypt_hmac.h} | 65 +- |
| .../staging/{rt2870/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/{rt2860 => rt3090}/link_list.h | 1 - |
| 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/{rt2870/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 | 7557 ++++++++++++++++++++ |
| .../staging/{rt2860/md4.h => rt3090/vr_ikans.h} | 53 +- |
| drivers/staging/rt3090/wpa.h | 447 ++ |
| drivers/staging/rtl8187se/Makefile | 16 - |
| drivers/staging/rtl8187se/TODO | 15 + |
| 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 | 665 +-- |
| .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 17 - |
| .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 88 +- |
| .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 324 +- |
| .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 125 +- |
| .../staging/rtl8187se/ieee80211/ieee80211_module.c | 88 - |
| drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 512 +-- |
| .../rtl8187se/ieee80211/ieee80211_softmac.c | 1033 +--- |
| .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 30 - |
| drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 270 +- |
| drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 129 +- |
| drivers/staging/rtl8187se/ieee80211/internal.h | 115 - |
| drivers/staging/rtl8187se/ieee80211/rtl_crypto.h | 399 -- |
| drivers/staging/rtl8187se/r8180.h | 24 +- |
| drivers/staging/rtl8187se/r8180_93cx6.h | 2 - |
| drivers/staging/rtl8187se/r8180_core.c | 2954 +------- |
| 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_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_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 | 63 +- |
| drivers/staging/rtl8187se/r8180_wx.h | 2 +- |
| drivers/staging/rtl8187se/r8185b_init.c | 665 +-- |
| drivers/staging/rtl8192e/Kconfig | 6 + |
| drivers/staging/rtl8192e/Makefile | 34 + |
| drivers/staging/{rtl8192su => rtl8192e}/dot11d.h | 0 |
| .../staging/{rtl8192su => rtl8192e}/ieee80211.h | 228 +- |
| drivers/staging/rtl8192e/ieee80211/dot11d.c | 239 + |
| .../{rtl8192su => rtl8192e/ieee80211}/dot11d.h | 0 |
| .../{rtl8192su => rtl8192e/ieee80211}/ieee80211.h | 115 +- |
| .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 273 + |
| .../ieee80211}/ieee80211_crypt.h | 7 + |
| .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 534 ++ |
| .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 1031 +++ |
| .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 393 + |
| .../staging/rtl8192e/ieee80211/ieee80211_module.c | 432 ++ |
| drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2802 ++++++++ |
| .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3548 +++++++++ |
| .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 682 ++ |
| drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 933 +++ |
| drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 1032 +++ |
| drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h | 69 + |
| .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 779 ++ |
| drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 481 ++ |
| .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 1719 +++++ |
| drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 748 ++ |
| drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 56 + |
| .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 659 ++ |
| .../{rtl8192su => rtl8192e}/ieee80211/rtl_crypto.h | 0 |
| .../{rtl8187se => rtl8192e}/ieee80211_crypt.h | 0 |
| drivers/staging/rtl8192e/r8180_93cx6.c | 146 + |
| drivers/staging/rtl8192e/r8180_93cx6.h | 40 + |
| drivers/staging/rtl8192e/r8190_rtl8256.c | 1161 +++ |
| .../{rtl8192su => rtl8192e}/r8190_rtl8256.h | 9 +- |
| drivers/staging/rtl8192e/r8192E.h | 1516 ++++ |
| drivers/staging/rtl8192e/r8192E_core.c | 6464 +++++++++++++++++ |
| drivers/staging/rtl8192e/r8192E_dm.c | 3880 ++++++++++ |
| drivers/staging/rtl8192e/r8192E_dm.h | 312 + |
| .../r8192U_hw.h => rtl8192e/r8192E_hw.h} | 437 +- |
| drivers/staging/rtl8192e/r8192E_wx.c | 1344 ++++ |
| .../r8180_gct.h => rtl8192e/r8192E_wx.h} | 23 +- |
| drivers/staging/rtl8192e/r8192_pm.c | 172 + |
| .../{rtl8187se/r8180_pm.h => rtl8192e/r8192_pm.h} | 18 +- |
| drivers/staging/rtl8192e/r819xE_cmdpkt.c | 804 +++ |
| drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 + |
| drivers/staging/rtl8192e/r819xE_firmware.c | 352 + |
| .../r819xU_phy.c => rtl8192e/r819xE_phy.c} | 2404 +++++-- |
| .../r819xU_phy.h => rtl8192e/r819xE_phy.h} | 61 +- |
| .../r819xU_phyreg.h => rtl8192e/r819xE_phyreg.h} | 7 + |
| drivers/staging/rtl8192su/Makefile | 39 +- |
| drivers/staging/rtl8192su/TODO | 18 + |
| 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 | 25 +- |
| drivers/staging/rtl8192su/ieee80211/dot11d.h | 4 - |
| drivers/staging/rtl8192su/ieee80211/ieee80211.h | 1350 +--- |
| .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 31 +- |
| .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 7 - |
| .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 66 +- |
| .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 292 +- |
| .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 126 +- |
| .../staging/rtl8192su/ieee80211/ieee80211_module.c | 77 +- |
| .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 436 ++ |
| drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 253 +- |
| .../rtl8192su/ieee80211/ieee80211_softmac.c | 360 +- |
| .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 86 - |
| drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 26 +- |
| drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 272 +- |
| 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 | 49 +- |
| drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 9 - |
| .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 279 +- |
| drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 168 +- |
| .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 34 +- |
| drivers/staging/rtl8192su/ieee80211/scatterwalk.c | 126 - |
| drivers/staging/rtl8192su/ieee80211/scatterwalk.h | 51 - |
| 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_FwImgDTM.h | 3797 ---------- |
| drivers/staging/rtl8192su/r8192S_firmware.c | 483 -- |
| drivers/staging/rtl8192su/r8192S_firmware.h | 5 - |
| drivers/staging/rtl8192su/r8192S_hw.h | 184 - |
| drivers/staging/rtl8192su/r8192S_phy.c | 947 +--- |
| 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 | 4898 +------------- |
| drivers/staging/rtl8192su/r8192U_dm.c | 550 +-- |
| drivers/staging/rtl8192su/r8192U_dm.h | 55 - |
| drivers/staging/rtl8192su/r8192U_pm.c | 11 +- |
| drivers/staging/rtl8192su/r8192U_pm.h | 2 - |
| drivers/staging/rtl8192su/r8192U_wx.c | 132 +- |
| 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_firmware_img.c | 3447 --------- |
| drivers/staging/rtl8192su/r819xU_firmware_img.h | 35 - |
| drivers/staging/sep/Kconfig | 10 + |
| drivers/staging/sep/Makefile | 2 + |
| drivers/staging/sep/TODO | 8 + |
| drivers/staging/sep/sep_dev.h | 110 + |
| drivers/staging/sep/sep_driver.c | 2707 +++++++ |
| drivers/staging/sep/sep_driver_api.h | 425 ++ |
| drivers/staging/sep/sep_driver_config.h | 225 + |
| drivers/staging/sep/sep_driver_hw_defs.h | 232 + |
| drivers/staging/serqt_usb2/serqt_usb2.c | 2 +- |
| drivers/staging/slicoss/slicoss.c | 2 +- |
| drivers/staging/sxg/sxg.c | 2 +- |
| drivers/staging/udlfb/udlfb.h | 2 +- |
| drivers/staging/usbip/Kconfig | 2 +- |
| drivers/staging/usbip/stub_dev.c | 16 +- |
| drivers/staging/usbip/stub_main.c | 8 +- |
| drivers/staging/usbip/stub_rx.c | 49 +- |
| drivers/staging/usbip/stub_tx.c | 26 +- |
| drivers/staging/usbip/usbip_common.c | 226 +- |
| drivers/staging/usbip/usbip_common.h | 96 +- |
| drivers/staging/usbip/usbip_event.c | 37 +- |
| drivers/staging/usbip/vhci_hcd.c | 156 +- |
| drivers/staging/usbip/vhci_rx.c | 41 +- |
| drivers/staging/usbip/vhci_sysfs.c | 22 +- |
| drivers/staging/usbip/vhci_tx.c | 22 +- |
| drivers/staging/vme/Kconfig | 17 + |
| drivers/staging/vme/Makefile | 7 + |
| drivers/staging/vme/TODO | 388 + |
| drivers/staging/vme/bridges/Kconfig | 14 + |
| drivers/staging/vme/bridges/Makefile | 2 + |
| drivers/staging/vme/bridges/vme_ca91cx42.c | 1811 +++++ |
| drivers/staging/vme/bridges/vme_ca91cx42.h | 403 ++ |
| drivers/staging/vme/bridges/vme_tsi148.c | 2925 ++++++++ |
| drivers/staging/vme/bridges/vme_tsi148.h | 1387 ++++ |
| drivers/staging/vme/devices/Kconfig | 8 + |
| drivers/staging/vme/devices/Makefile | 5 + |
| drivers/staging/vme/devices/vme_user.c | 826 +++ |
| drivers/staging/vme/devices/vme_user.h | 52 + |
| drivers/staging/vme/vme.c | 1497 ++++ |
| drivers/staging/vme/vme.h | 161 + |
| drivers/staging/vme/vme_bridge.h | 261 + |
| drivers/staging/vt6655/80211hdr.h | 10 +- |
| drivers/staging/vt6655/80211mgr.c | 38 +- |
| drivers/staging/vt6655/80211mgr.h | 13 +- |
| drivers/staging/vt6655/IEEE11h.c | 47 +- |
| drivers/staging/vt6655/IEEE11h.h | 16 - |
| 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/TODO | 21 + |
| drivers/staging/vt6655/aes_ccmp.c | 30 +- |
| drivers/staging/vt6655/aes_ccmp.h | 2 - |
| drivers/staging/vt6655/baseband.c | 61 +- |
| drivers/staging/vt6655/baseband.h | 35 +- |
| drivers/staging/vt6655/bssdb.c | 158 +- |
| drivers/staging/vt6655/bssdb.h | 23 +- |
| drivers/staging/vt6655/card.c | 80 +- |
| drivers/staging/vt6655/card.h | 17 - |
| drivers/staging/vt6655/country.h | 17 +- |
| drivers/staging/vt6655/datarate.c | 26 +- |
| drivers/staging/vt6655/desc.h | 103 +- |
| drivers/staging/vt6655/device.h | 171 +- |
| drivers/staging/vt6655/device_cfg.h | 46 +- |
| drivers/staging/vt6655/device_main.c | 643 +-- |
| drivers/staging/vt6655/dpc.c | 304 +- |
| drivers/staging/vt6655/dpc.h | 24 +- |
| drivers/staging/vt6655/hostap.c | 135 +- |
| drivers/staging/vt6655/hostap.h | 24 - |
| drivers/staging/vt6655/iocmd.h | 23 +- |
| drivers/staging/vt6655/ioctl.c | 101 +- |
| drivers/staging/vt6655/ioctl.h | 17 - |
| drivers/staging/vt6655/iowpa.h | 4 +- |
| drivers/staging/vt6655/iwctl.c | 314 +- |
| drivers/staging/vt6655/iwctl.h | 105 +- |
| drivers/staging/vt6655/kcompat.h | 49 +- |
| drivers/staging/vt6655/key.c | 153 +- |
| drivers/staging/vt6655/key.h | 24 +- |
| drivers/staging/vt6655/mac.c | 145 +- |
| drivers/staging/vt6655/mac.h | 19 +- |
| drivers/staging/vt6655/mib.c | 153 +- |
| drivers/staging/vt6655/mib.h | 35 +- |
| drivers/staging/vt6655/michael.c | 7 - |
| drivers/staging/vt6655/michael.h | 4 - |
| drivers/staging/vt6655/power.c | 45 +- |
| drivers/staging/vt6655/power.h | 3 +- |
| drivers/staging/vt6655/rc4.c | 7 +- |
| drivers/staging/vt6655/rc4.h | 6 +- |
| drivers/staging/vt6655/rf.c | 16 +- |
| drivers/staging/vt6655/rf.h | 16 +- |
| drivers/staging/vt6655/rxtx.c | 556 +- |
| drivers/staging/vt6655/rxtx.h | 10 +- |
| drivers/staging/vt6655/srom.c | 31 +- |
| drivers/staging/vt6655/srom.h | 24 +- |
| drivers/staging/vt6655/tcrc.c | 9 - |
| drivers/staging/vt6655/tcrc.h | 18 - |
| drivers/staging/vt6655/tether.c | 16 +- |
| drivers/staging/vt6655/tether.h | 26 +- |
| drivers/staging/vt6655/tkip.c | 12 - |
| drivers/staging/vt6655/tkip.h | 16 - |
| drivers/staging/vt6655/tmacro.h | 90 - |
| drivers/staging/vt6655/tpci.h | 117 - |
| drivers/staging/vt6655/ttype.h | 261 +- |
| drivers/staging/vt6655/upc.h | 5 - |
| drivers/staging/vt6655/vntwifi.c | 33 +- |
| drivers/staging/vt6655/vntwifi.h | 19 +- |
| drivers/staging/vt6655/wcmd.c | 137 +- |
| drivers/staging/vt6655/wcmd.h | 22 +- |
| drivers/staging/vt6655/wctl.c | 17 +- |
| drivers/staging/vt6655/wctl.h | 19 - |
| drivers/staging/vt6655/wmgr.c | 360 +- |
| drivers/staging/vt6655/wmgr.h | 33 +- |
| drivers/staging/vt6655/wpa.c | 71 +- |
| drivers/staging/vt6655/wpa.h | 14 - |
| drivers/staging/vt6655/wpa2.c | 55 +- |
| drivers/staging/vt6655/wpa2.h | 24 +- |
| drivers/staging/vt6655/wpactl.c | 102 +- |
| drivers/staging/vt6655/wpactl.h | 17 - |
| drivers/staging/vt6655/wroute.c | 28 +- |
| drivers/staging/vt6655/wroute.h | 18 - |
| drivers/staging/vt6656/80211hdr.h | 353 + |
| drivers/staging/vt6656/80211mgr.c | 1026 +++ |
| drivers/staging/vt6656/80211mgr.h | 861 +++ |
| drivers/staging/vt6656/Kconfig | 6 + |
| drivers/staging/vt6656/Makefile | 39 + |
| drivers/staging/vt6656/TODO | 20 + |
| drivers/staging/vt6656/aes_ccmp.c | 402 ++ |
| .../staging/{vt6655/tbit.h => vt6656/aes_ccmp.h} | 48 +- |
| drivers/staging/vt6656/baseband.c | 2105 ++++++ |
| drivers/staging/vt6656/baseband.h | 146 + |
| drivers/staging/vt6656/bssdb.c | 1721 +++++ |
| drivers/staging/vt6656/bssdb.h | 359 + |
| drivers/staging/vt6656/card.c | 1113 +++ |
| drivers/staging/vt6656/card.h | 95 + |
| drivers/staging/vt6656/channel.c | 525 ++ |
| .../staging/{vt6655/umem.h => vt6656/channel.h} | 58 +- |
| drivers/staging/vt6656/control.c | 109 + |
| .../staging/{vt6655/tbit.h => vt6656/control.h} | 69 +- |
| drivers/staging/vt6656/country.h | 163 + |
| drivers/staging/vt6656/datarate.c | 499 ++ |
| drivers/staging/vt6656/datarate.h | 110 + |
| drivers/staging/vt6656/desc.h | 443 ++ |
| drivers/staging/vt6656/device.h | 945 +++ |
| drivers/staging/vt6656/device_cfg.h | 107 + |
| drivers/staging/vt6656/dpc.c | 1616 +++++ |
| drivers/staging/{vt6655/umem.h => vt6656/dpc.h} | 65 +- |
| drivers/staging/vt6656/firmware.c | 876 +++ |
| .../staging/{vt6655/umem.h => vt6656/firmware.h} | 55 +- |
| drivers/staging/vt6656/hostap.c | 868 +++ |
| drivers/staging/{vt6655/umem.h => vt6656/hostap.h} | 63 +- |
| drivers/staging/vt6656/int.c | 193 + |
| drivers/staging/{vt6655/umem.h => vt6656/int.h} | 74 +- |
| drivers/staging/vt6656/iocmd.h | 475 ++ |
| drivers/staging/vt6656/ioctl.c | 701 ++ |
| drivers/staging/{vt6655/umem.h => vt6656/ioctl.h} | 52 +- |
| drivers/staging/vt6656/iowpa.h | 158 + |
| drivers/staging/vt6656/iwctl.c | 2190 ++++++ |
| drivers/staging/vt6656/iwctl.h | 229 + |
| drivers/staging/vt6656/kcompat.h | 39 + |
| drivers/staging/vt6656/key.c | 869 +++ |
| drivers/staging/vt6656/key.h | 177 + |
| drivers/staging/vt6656/mac.c | 482 ++ |
| drivers/staging/vt6656/mac.h | 442 ++ |
| drivers/staging/vt6656/main_usb.c | 2196 ++++++ |
| drivers/staging/vt6656/mib.c | 573 ++ |
| drivers/staging/vt6656/mib.h | 423 ++ |
| drivers/staging/vt6656/michael.c | 181 + |
| .../staging/{vt6655/tbit.h => vt6656/michael.h} | 60 +- |
| drivers/staging/vt6656/power.c | 424 ++ |
| drivers/staging/{vt6655/tbit.h => vt6656/power.h} | 90 +- |
| drivers/staging/vt6656/rc4.c | 87 + |
| drivers/staging/vt6656/rc4.h | 47 + |
| drivers/staging/vt6656/rf.c | 1151 +++ |
| drivers/staging/vt6656/rf.h | 100 + |
| drivers/staging/vt6656/rndis.h | 162 + |
| drivers/staging/vt6656/rxtx.c | 3239 +++++++++ |
| drivers/staging/vt6656/rxtx.h | 694 ++ |
| drivers/staging/vt6656/srom.h | 127 + |
| drivers/staging/vt6656/tcrc.c | 198 + |
| drivers/staging/{vt6655/tbit.h => vt6656/tcrc.h} | 45 +- |
| drivers/staging/vt6656/tether.c | 109 + |
| drivers/staging/vt6656/tether.h | 236 + |
| drivers/staging/vt6656/tkip.c | 272 + |
| drivers/staging/{vt6655/tbit.h => vt6656/tkip.h} | 50 +- |
| drivers/staging/vt6656/tmacro.h | 62 + |
| drivers/staging/vt6656/ttype.h | 162 + |
| drivers/staging/vt6656/upc.h | 166 + |
| drivers/staging/vt6656/usbpipe.c | 841 +++ |
| .../staging/{vt6655/tbit.h => vt6656/usbpipe.h} | 99 +- |
| drivers/staging/vt6656/vntconfiguration.dat | 6 + |
| drivers/staging/vt6656/wcmd.c | 1354 ++++ |
| drivers/staging/vt6656/wcmd.h | 150 + |
| drivers/staging/vt6656/wctl.c | 254 + |
| drivers/staging/vt6656/wctl.h | 108 + |
| drivers/staging/vt6656/wmgr.c | 4949 +++++++++++++ |
| drivers/staging/vt6656/wmgr.h | 502 ++ |
| drivers/staging/vt6656/wpa.c | 316 + |
| drivers/staging/{vt6655/tbit.h => vt6656/wpa.h} | 84 +- |
| drivers/staging/vt6656/wpa2.c | 363 + |
| drivers/staging/{vt6655/umem.h => vt6656/wpa2.h} | 69 +- |
| drivers/staging/vt6656/wpactl.c | 1008 +++ |
| drivers/staging/{vt6655/umem.h => vt6656/wpactl.h} | 55 +- |
| drivers/staging/winbond/core.h | 4 +- |
| drivers/staging/winbond/localpara.h | 1 - |
| drivers/staging/winbond/mds.c | 22 +- |
| drivers/staging/winbond/mds_f.h | 6 +- |
| drivers/staging/winbond/mds_s.h | 17 +- |
| drivers/staging/winbond/mlmetxrx.c | 2 +- |
| drivers/staging/winbond/mlmetxrx_f.h | 32 +- |
| drivers/staging/winbond/mto.c | 26 +- |
| drivers/staging/winbond/mto.h | 116 +- |
| drivers/staging/winbond/wb35rx.c | 4 +- |
| drivers/staging/winbond/wb35tx.c | 4 +- |
| drivers/staging/winbond/wbhal_f.h | 2 +- |
| drivers/staging/winbond/wbhal_s.h | 4 +- |
| drivers/staging/winbond/wbusb.c | 5 - |
| 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 | 509 +- |
| 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 +- |
| 1086 files changed, 288741 insertions(+), 120743 deletions(-) |
| delete mode 100644 drivers/staging/android/lowmemorykiller.txt |
| create mode 100644 drivers/staging/cowloop/Kconfig |
| create mode 100644 drivers/staging/cowloop/Makefile |
| create mode 100644 drivers/staging/cowloop/TODO |
| create mode 100644 drivers/staging/cowloop/cowloop.c |
| create mode 100644 drivers/staging/cowloop/cowloop.h |
| create mode 100644 drivers/staging/dream/Kconfig |
| create mode 100644 drivers/staging/dream/Makefile |
| create mode 100644 drivers/staging/dream/camera/Kconfig |
| create mode 100644 drivers/staging/dream/camera/Makefile |
| create mode 100644 drivers/staging/dream/camera/msm_camera.c |
| create mode 100644 drivers/staging/dream/camera/msm_io7x.c |
| create mode 100644 drivers/staging/dream/camera/msm_io8x.c |
| create mode 100644 drivers/staging/dream/camera/msm_v4l2.c |
| create mode 100644 drivers/staging/dream/camera/msm_vfe7x.c |
| create mode 100644 drivers/staging/dream/camera/msm_vfe7x.h |
| create mode 100644 drivers/staging/dream/camera/msm_vfe8x.c |
| create mode 100644 drivers/staging/dream/camera/msm_vfe8x.h |
| create mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.c |
| create mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.h |
| create mode 100644 drivers/staging/dream/camera/mt9d112.c |
| create mode 100644 drivers/staging/dream/camera/mt9d112.h |
| create mode 100644 drivers/staging/dream/camera/mt9d112_reg.c |
| create mode 100644 drivers/staging/dream/camera/mt9p012.h |
| create mode 100644 drivers/staging/dream/camera/mt9p012_fox.c |
| create mode 100644 drivers/staging/dream/camera/mt9p012_reg.c |
| create mode 100644 drivers/staging/dream/camera/mt9t013.c |
| create mode 100644 drivers/staging/dream/camera/mt9t013.h |
| create mode 100644 drivers/staging/dream/camera/mt9t013_reg.c |
| create mode 100644 drivers/staging/dream/camera/s5k3e2fx.c |
| create mode 100644 drivers/staging/dream/camera/s5k3e2fx.h |
| create mode 100644 drivers/staging/dream/gpio_axis.c |
| create mode 100644 drivers/staging/dream/gpio_event.c |
| create mode 100644 drivers/staging/dream/gpio_input.c |
| create mode 100644 drivers/staging/dream/gpio_matrix.c |
| create mode 100644 drivers/staging/dream/gpio_output.c |
| create mode 100644 drivers/staging/dream/qdsp5/Makefile |
| create mode 100644 drivers/staging/dream/qdsp5/adsp.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp.h |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_6210.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_6220.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_6225.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_driver.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_info.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c |
| create mode 100644 drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c |
| create mode 100644 drivers/staging/dream/qdsp5/audio_aac.c |
| create mode 100644 drivers/staging/dream/qdsp5/audio_amrnb.c |
| create mode 100644 drivers/staging/dream/qdsp5/audio_evrc.c |
| create mode 100644 drivers/staging/dream/qdsp5/audio_in.c |
| create mode 100644 drivers/staging/dream/qdsp5/audio_mp3.c |
| create mode 100644 drivers/staging/dream/qdsp5/audio_out.c |
| create mode 100644 drivers/staging/dream/qdsp5/audio_qcelp.c |
| create mode 100644 drivers/staging/dream/qdsp5/audmgr.c |
| create mode 100644 drivers/staging/dream/qdsp5/audmgr.h |
| create mode 100644 drivers/staging/dream/qdsp5/audmgr_new.h |
| create mode 100644 drivers/staging/dream/qdsp5/audpp.c |
| create mode 100644 drivers/staging/dream/qdsp5/evlog.h |
| create mode 100644 drivers/staging/dream/qdsp5/snd.c |
| create mode 100644 drivers/staging/dream/smd/Kconfig |
| create mode 100644 drivers/staging/dream/smd/Makefile |
| create mode 100644 drivers/staging/dream/smd/rpc_server_dog_keepalive.c |
| create mode 100644 drivers/staging/dream/smd/rpc_server_time_remote.c |
| create mode 100644 drivers/staging/dream/smd/smd.c |
| create mode 100644 drivers/staging/dream/smd/smd_private.h |
| create mode 100644 drivers/staging/dream/smd/smd_qmi.c |
| create mode 100644 drivers/staging/dream/smd/smd_rpcrouter.c |
| create mode 100644 drivers/staging/dream/smd/smd_rpcrouter.h |
| create mode 100644 drivers/staging/dream/smd/smd_rpcrouter_device.c |
| create mode 100644 drivers/staging/dream/smd/smd_rpcrouter_servers.c |
| create mode 100644 drivers/staging/dream/smd/smd_tty.c |
| create mode 100644 drivers/staging/dream/synaptics_i2c_rmi.c |
| create mode 100644 drivers/staging/dream/synaptics_i2c_rmi.h |
| delete mode 100644 drivers/staging/echo/bit_operations.h |
| delete mode 100644 drivers/staging/echo/mmx.h |
| delete mode 100644 drivers/staging/epl/Benchmark.h |
| delete mode 100644 drivers/staging/epl/Debug.h |
| delete mode 100644 drivers/staging/epl/Edrv8139.c |
| delete mode 100644 drivers/staging/epl/EdrvFec.h |
| delete mode 100644 drivers/staging/epl/EdrvSim.h |
| delete mode 100644 drivers/staging/epl/Epl.h |
| delete mode 100644 drivers/staging/epl/EplAmi.h |
| delete mode 100644 drivers/staging/epl/EplApiGeneric.c |
| delete mode 100644 drivers/staging/epl/EplApiLinux.h |
| delete mode 100644 drivers/staging/epl/EplApiLinuxKernel.c |
| delete mode 100644 drivers/staging/epl/EplApiProcessImage.c |
| delete mode 100644 drivers/staging/epl/EplCfg.h |
| delete mode 100644 drivers/staging/epl/EplDef.h |
| delete mode 100644 drivers/staging/epl/EplDll.h |
| delete mode 100644 drivers/staging/epl/EplDllCal.h |
| delete mode 100644 drivers/staging/epl/EplDllk.c |
| delete mode 100644 drivers/staging/epl/EplDllkCal.c |
| delete mode 100644 drivers/staging/epl/EplDlluCal.c |
| delete mode 100644 drivers/staging/epl/EplErrDef.h |
| delete mode 100644 drivers/staging/epl/EplErrorHandlerk.c |
| delete mode 100644 drivers/staging/epl/EplEvent.h |
| delete mode 100644 drivers/staging/epl/EplEventk.c |
| delete mode 100644 drivers/staging/epl/EplEventu.c |
| delete mode 100644 drivers/staging/epl/EplFrame.h |
| delete mode 100644 drivers/staging/epl/EplIdentu.c |
| delete mode 100644 drivers/staging/epl/EplInc.h |
| delete mode 100644 drivers/staging/epl/EplInstDef.h |
| delete mode 100644 drivers/staging/epl/EplLed.h |
| delete mode 100644 drivers/staging/epl/EplNmt.h |
| delete mode 100644 drivers/staging/epl/EplNmtCnu.c |
| delete mode 100644 drivers/staging/epl/EplNmtMnu.c |
| delete mode 100644 drivers/staging/epl/EplNmtk.c |
| delete mode 100644 drivers/staging/epl/EplNmtkCal.c |
| delete mode 100644 drivers/staging/epl/EplNmtu.c |
| delete mode 100644 drivers/staging/epl/EplNmtuCal.c |
| delete mode 100644 drivers/staging/epl/EplObd.c |
| delete mode 100644 drivers/staging/epl/EplObd.h |
| delete mode 100644 drivers/staging/epl/EplObdMacro.h |
| delete mode 100644 drivers/staging/epl/EplObdkCal.c |
| delete mode 100644 drivers/staging/epl/EplObdu.c |
| delete mode 100644 drivers/staging/epl/EplObduCal.c |
| delete mode 100644 drivers/staging/epl/EplPdo.h |
| delete mode 100644 drivers/staging/epl/EplPdok.c |
| delete mode 100644 drivers/staging/epl/EplPdokCal.c |
| delete mode 100644 drivers/staging/epl/EplPdou.c |
| delete mode 100644 drivers/staging/epl/EplSdo.h |
| delete mode 100644 drivers/staging/epl/EplSdoAc.h |
| delete mode 100644 drivers/staging/epl/EplSdoAsndu.c |
| delete mode 100644 drivers/staging/epl/EplSdoAsySequ.c |
| delete mode 100644 drivers/staging/epl/EplSdoComu.c |
| delete mode 100644 drivers/staging/epl/EplSdoUdpu.c |
| delete mode 100644 drivers/staging/epl/EplStatusu.c |
| delete mode 100644 drivers/staging/epl/EplTarget.h |
| delete mode 100644 drivers/staging/epl/EplTimer.h |
| delete mode 100644 drivers/staging/epl/EplTimeruLinuxKernel.c |
| delete mode 100644 drivers/staging/epl/EplVersion.h |
| delete mode 100644 drivers/staging/epl/Kconfig |
| delete mode 100644 drivers/staging/epl/Makefile |
| delete mode 100644 drivers/staging/epl/SharedBuff.c |
| delete mode 100644 drivers/staging/epl/SharedBuff.h |
| delete mode 100644 drivers/staging/epl/ShbIpc-LinuxKernel.c |
| delete mode 100644 drivers/staging/epl/ShbIpc.h |
| delete mode 100644 drivers/staging/epl/ShbLinuxKernel.h |
| delete mode 100644 drivers/staging/epl/SocketLinuxKernel.c |
| delete mode 100644 drivers/staging/epl/SocketLinuxKernel.h |
| delete mode 100644 drivers/staging/epl/TimerHighReskX86.c |
| delete mode 100644 drivers/staging/epl/VirtualEthernetLinux.c |
| delete mode 100644 drivers/staging/epl/amix86.c |
| delete mode 100644 drivers/staging/epl/demo_main.c |
| delete mode 100644 drivers/staging/epl/edrv.h |
| delete mode 100644 drivers/staging/epl/global.h |
| delete mode 100644 drivers/staging/epl/kernel/EplDllk.h |
| delete mode 100644 drivers/staging/epl/kernel/EplDllkCal.h |
| delete mode 100644 drivers/staging/epl/kernel/EplErrorHandlerk.h |
| delete mode 100644 drivers/staging/epl/kernel/EplEventk.h |
| delete mode 100644 drivers/staging/epl/kernel/EplNmtk.h |
| delete mode 100644 drivers/staging/epl/kernel/EplObdk.h |
| delete mode 100644 drivers/staging/epl/kernel/EplPdok.h |
| delete mode 100644 drivers/staging/epl/kernel/EplPdokCal.h |
| delete mode 100644 drivers/staging/epl/kernel/EplTimerHighResk.h |
| delete mode 100644 drivers/staging/epl/kernel/EplTimerk.h |
| delete mode 100644 drivers/staging/epl/kernel/VirtualEthernet.h |
| delete mode 100644 drivers/staging/epl/proc_fs.c |
| delete mode 100644 drivers/staging/epl/proc_fs.h |
| delete mode 100644 drivers/staging/epl/user/EplCfgMau.h |
| delete mode 100644 drivers/staging/epl/user/EplDllu.h |
| delete mode 100644 drivers/staging/epl/user/EplDlluCal.h |
| delete mode 100644 drivers/staging/epl/user/EplEventu.h |
| delete mode 100644 drivers/staging/epl/user/EplIdentu.h |
| delete mode 100644 drivers/staging/epl/user/EplLedu.h |
| delete mode 100644 drivers/staging/epl/user/EplNmtCnu.h |
| delete mode 100644 drivers/staging/epl/user/EplNmtMnu.h |
| delete mode 100644 drivers/staging/epl/user/EplNmtu.h |
| delete mode 100644 drivers/staging/epl/user/EplNmtuCal.h |
| delete mode 100644 drivers/staging/epl/user/EplObdu.h |
| delete mode 100644 drivers/staging/epl/user/EplObduCal.h |
| delete mode 100644 drivers/staging/epl/user/EplPdou.h |
| delete mode 100644 drivers/staging/epl/user/EplSdoAsndu.h |
| delete mode 100644 drivers/staging/epl/user/EplSdoAsySequ.h |
| delete mode 100644 drivers/staging/epl/user/EplSdoComu.h |
| delete mode 100644 drivers/staging/epl/user/EplSdoUdpu.h |
| delete mode 100644 drivers/staging/epl/user/EplStatusu.h |
| delete mode 100644 drivers/staging/epl/user/EplTimeru.h |
| create mode 100644 drivers/staging/hv/BlkVsc.c |
| create mode 100644 drivers/staging/hv/Channel.c |
| create mode 100644 drivers/staging/hv/Channel.h |
| create mode 100644 drivers/staging/hv/ChannelInterface.c |
| create mode 100644 drivers/staging/hv/ChannelInterface.h |
| create mode 100644 drivers/staging/hv/ChannelMgmt.c |
| create mode 100644 drivers/staging/hv/ChannelMgmt.h |
| create mode 100644 drivers/staging/hv/Connection.c |
| create mode 100644 drivers/staging/hv/Hv.c |
| create mode 100644 drivers/staging/hv/Hv.h |
| create mode 100644 drivers/staging/hv/Kconfig |
| create mode 100644 drivers/staging/hv/Makefile |
| create mode 100644 drivers/staging/hv/NetVsc.c |
| create mode 100644 drivers/staging/hv/NetVsc.h |
| create mode 100644 drivers/staging/hv/RingBuffer.c |
| create mode 100644 drivers/staging/hv/RingBuffer.h |
| create mode 100644 drivers/staging/hv/RndisFilter.c |
| create mode 100644 drivers/staging/hv/RndisFilter.h |
| create mode 100644 drivers/staging/hv/StorVsc.c |
| create mode 100644 drivers/staging/hv/TODO |
| create mode 100644 drivers/staging/hv/VersionInfo.h |
| create mode 100644 drivers/staging/hv/Vmbus.c |
| create mode 100644 drivers/staging/hv/VmbusPrivate.h |
| create mode 100644 drivers/staging/hv/blkvsc_drv.c |
| create mode 100644 drivers/staging/hv/hv_api.h |
| create mode 100644 drivers/staging/hv/include/ChannelMessages.h |
| create mode 100644 drivers/staging/hv/include/List.h |
| create mode 100644 drivers/staging/hv/include/NetVscApi.h |
| create mode 100644 drivers/staging/hv/include/StorVscApi.h |
| create mode 100644 drivers/staging/hv/include/VmbusApi.h |
| create mode 100644 drivers/staging/hv/include/VmbusChannelInterface.h |
| create mode 100644 drivers/staging/hv/include/VmbusPacketFormat.h |
| create mode 100644 drivers/staging/hv/include/logging.h |
| create mode 100644 drivers/staging/hv/include/nvspprotocol.h |
| create mode 100644 drivers/staging/hv/include/vstorage.h |
| create mode 100644 drivers/staging/hv/netvsc_drv.c |
| create mode 100644 drivers/staging/hv/osd.c |
| create mode 100644 drivers/staging/hv/osd.h |
| create mode 100644 drivers/staging/hv/rndis.h |
| create mode 100644 drivers/staging/hv/storvsc_drv.c |
| create mode 100644 drivers/staging/hv/vmbus.h |
| create mode 100644 drivers/staging/hv/vmbus_drv.c |
| create mode 100644 drivers/staging/iio/Documentation/device.txt |
| create mode 100644 drivers/staging/iio/Documentation/iio_utils.h |
| create mode 100644 drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c |
| create mode 100644 drivers/staging/iio/Documentation/overview.txt |
| create mode 100644 drivers/staging/iio/Documentation/ring.txt |
| create mode 100644 drivers/staging/iio/Documentation/trigger.txt |
| create mode 100644 drivers/staging/iio/Documentation/userspace.txt |
| create mode 100644 drivers/staging/iio/Kconfig |
| create mode 100644 drivers/staging/iio/Makefile |
| create mode 100644 drivers/staging/iio/TODO |
| create mode 100644 drivers/staging/iio/accel/Kconfig |
| create mode 100644 drivers/staging/iio/accel/Makefile |
| create mode 100644 drivers/staging/iio/accel/accel.h |
| create mode 100644 drivers/staging/iio/accel/kxsd9.c |
| create mode 100644 drivers/staging/iio/accel/lis3l02dq.h |
| create mode 100644 drivers/staging/iio/accel/lis3l02dq_core.c |
| create mode 100644 drivers/staging/iio/accel/lis3l02dq_ring.c |
| create mode 100644 drivers/staging/iio/accel/sca3000.h |
| create mode 100644 drivers/staging/iio/accel/sca3000_core.c |
| create mode 100644 drivers/staging/iio/accel/sca3000_ring.c |
| create mode 100644 drivers/staging/iio/adc/Kconfig |
| create mode 100644 drivers/staging/iio/adc/Makefile |
| create mode 100644 drivers/staging/iio/adc/adc.h |
| create mode 100644 drivers/staging/iio/adc/max1363.h |
| create mode 100644 drivers/staging/iio/adc/max1363_core.c |
| create mode 100644 drivers/staging/iio/adc/max1363_ring.c |
| create mode 100644 drivers/staging/iio/chrdev.h |
| create mode 100644 drivers/staging/iio/iio.h |
| create mode 100644 drivers/staging/iio/industrialio-core.c |
| create mode 100644 drivers/staging/iio/industrialio-ring.c |
| create mode 100644 drivers/staging/iio/industrialio-trigger.c |
| create mode 100644 drivers/staging/iio/light/Kconfig |
| create mode 100644 drivers/staging/iio/light/Makefile |
| create mode 100644 drivers/staging/iio/light/light.h |
| create mode 100644 drivers/staging/iio/light/tsl2561.c |
| create mode 100644 drivers/staging/iio/ring_generic.h |
| create mode 100644 drivers/staging/iio/ring_hw.h |
| create mode 100644 drivers/staging/iio/ring_sw.c |
| create mode 100644 drivers/staging/iio/ring_sw.h |
| create mode 100644 drivers/staging/iio/sysfs.h |
| create mode 100644 drivers/staging/iio/trigger.h |
| create mode 100644 drivers/staging/iio/trigger/Kconfig |
| create mode 100644 drivers/staging/iio/trigger/Makefile |
| create mode 100644 drivers/staging/iio/trigger/iio-trig-gpio.c |
| create mode 100644 drivers/staging/iio/trigger/iio-trig-periodic-rtc.c |
| create mode 100644 drivers/staging/iio/trigger_consumer.h |
| delete mode 100644 drivers/staging/pata_rdc/Kconfig |
| delete mode 100644 drivers/staging/pata_rdc/Makefile |
| delete mode 100644 drivers/staging/pata_rdc/pata_rdc.c |
| delete mode 100644 drivers/staging/pata_rdc/pata_rdc.h |
| create mode 100644 drivers/staging/quatech_usb2/Kconfig |
| create mode 100644 drivers/staging/quatech_usb2/Makefile |
| create mode 100644 drivers/staging/quatech_usb2/TODO |
| create mode 100644 drivers/staging/quatech_usb2/quatech_usb2.c |
| create mode 100644 drivers/staging/rar/Kconfig |
| create mode 100644 drivers/staging/rar/Makefile |
| create mode 100644 drivers/staging/rar/rar_driver.c |
| create mode 100644 drivers/staging/rar/rar_driver.h |
| delete mode 100644 drivers/staging/rt2870/common/firmware.h |
| delete mode 100644 drivers/staging/rt2870/link_list.h |
| delete mode 100644 drivers/staging/rt3070/2870_main_dev.c |
| delete mode 100644 drivers/staging/rt3070/Kconfig |
| delete mode 100644 drivers/staging/rt3070/Makefile |
| delete mode 100644 drivers/staging/rt3070/action.h |
| delete mode 100644 drivers/staging/rt3070/aironet.h |
| delete mode 100644 drivers/staging/rt3070/ap.h |
| delete mode 100644 drivers/staging/rt3070/chlist.h |
| delete mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c |
| delete mode 100644 drivers/staging/rt3070/common/action.c |
| delete mode 100644 drivers/staging/rt3070/common/ba_action.c |
| delete mode 100644 drivers/staging/rt3070/common/cmm_data.c |
| delete mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c |
| delete mode 100644 drivers/staging/rt3070/common/cmm_info.c |
| delete mode 100644 drivers/staging/rt3070/common/cmm_sanity.c |
| delete mode 100644 drivers/staging/rt3070/common/cmm_sync.c |
| delete mode 100644 drivers/staging/rt3070/common/cmm_wpa.c |
| delete mode 100644 drivers/staging/rt3070/common/dfs.c |
| delete mode 100644 drivers/staging/rt3070/common/eeprom.c |
| delete mode 100644 drivers/staging/rt3070/common/md5.c |
| delete mode 100644 drivers/staging/rt3070/common/mlme.c |
| delete mode 100644 drivers/staging/rt3070/common/rtmp_init.c |
| delete mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c |
| delete mode 100644 drivers/staging/rt3070/common/rtmp_wep.c |
| delete mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c |
| delete mode 100644 drivers/staging/rt3070/common/rtusb_data.c |
| delete mode 100644 drivers/staging/rt3070/common/rtusb_io.c |
| delete mode 100644 drivers/staging/rt3070/common/spectrum.c |
| delete mode 100644 drivers/staging/rt3070/dfs.h |
| delete mode 100644 drivers/staging/rt3070/link_list.h |
| delete mode 100644 drivers/staging/rt3070/md5.h |
| delete mode 100644 drivers/staging/rt3070/mlme.h |
| delete mode 100644 drivers/staging/rt3070/oid.h |
| delete mode 100644 drivers/staging/rt3070/rt2870.h |
| delete mode 100644 drivers/staging/rt3070/rt28xx.h |
| delete mode 100644 drivers/staging/rt3070/rt_config.h |
| delete mode 100644 drivers/staging/rt3070/rt_linux.c |
| delete mode 100644 drivers/staging/rt3070/rt_linux.h |
| delete mode 100644 drivers/staging/rt3070/rt_main_dev.c |
| delete mode 100644 drivers/staging/rt3070/rt_profile.c |
| delete mode 100644 drivers/staging/rt3070/rtmp.h |
| delete mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h |
| delete mode 100644 drivers/staging/rt3070/rtmp_def.h |
| delete mode 100644 drivers/staging/rt3070/rtmp_type.h |
| delete mode 100644 drivers/staging/rt3070/spectrum.h |
| delete mode 100644 drivers/staging/rt3070/spectrum_def.h |
| delete mode 100644 drivers/staging/rt3070/sta/aironet.c |
| delete mode 100644 drivers/staging/rt3070/sta/assoc.c |
| delete mode 100644 drivers/staging/rt3070/sta/auth.c |
| delete mode 100644 drivers/staging/rt3070/sta/auth_rsp.c |
| delete mode 100644 drivers/staging/rt3070/sta/connect.c |
| delete mode 100644 drivers/staging/rt3070/sta/rtmp_data.c |
| delete mode 100644 drivers/staging/rt3070/sta/sanity.c |
| delete mode 100644 drivers/staging/rt3070/sta/sync.c |
| delete mode 100644 drivers/staging/rt3070/sta/wpa.c |
| delete mode 100644 drivers/staging/rt3070/sta_ioctl.c |
| delete mode 100644 drivers/staging/rt3070/wpa.h |
| 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/{rt2870/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/{rt2870/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/{rt2870/md4.h => rt3090/crypt_hmac.h} (54%) |
| copy drivers/staging/{rt2870/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 |
| rename drivers/staging/{rt2860 => rt3090}/link_list.h (99%) |
| 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/{rt2870/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/r8180_gct.c |
| 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_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/rtl8192e/Kconfig |
| create mode 100644 drivers/staging/rtl8192e/Makefile |
| copy drivers/staging/{rtl8192su => rtl8192e}/dot11d.h (100%) |
| copy drivers/staging/{rtl8192su => rtl8192e}/ieee80211.h (92%) |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c |
| rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/dot11d.h (100%) |
| rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/ieee80211.h (95%) |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c |
| rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/ieee80211_crypt.h (92%) |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_wep.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h |
| create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c |
| rename drivers/staging/{rtl8192su => rtl8192e}/ieee80211/rtl_crypto.h (100%) |
| rename drivers/staging/{rtl8187se => rtl8192e}/ieee80211_crypt.h (100%) |
| create mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c |
| create mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h |
| create mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c |
| rename drivers/staging/{rtl8192su => rtl8192e}/r8190_rtl8256.h (65%) |
| create mode 100644 drivers/staging/rtl8192e/r8192E.h |
| create mode 100644 drivers/staging/rtl8192e/r8192E_core.c |
| create mode 100644 drivers/staging/rtl8192e/r8192E_dm.c |
| create mode 100644 drivers/staging/rtl8192e/r8192E_dm.h |
| rename drivers/staging/{rtl8192su/r8192U_hw.h => rtl8192e/r8192E_hw.h} (72%) |
| create mode 100644 drivers/staging/rtl8192e/r8192E_wx.c |
| rename drivers/staging/{rtl8187se/r8180_gct.h => rtl8192e/r8192E_wx.h} (52%) |
| create mode 100644 drivers/staging/rtl8192e/r8192_pm.c |
| rename drivers/staging/{rtl8187se/r8180_pm.h => rtl8192e/r8192_pm.h} (52%) |
| create mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c |
| create mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h |
| create mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c |
| rename drivers/staging/{rtl8192su/r819xU_phy.c => rtl8192e/r819xE_phy.c} (50%) |
| rename drivers/staging/{rtl8192su/r819xU_phy.h => rtl8192e/r819xE_phy.h} (61%) |
| rename drivers/staging/{rtl8192su/r819xU_phyreg.h => rtl8192e/r819xE_phyreg.h} (99%) |
| create mode 100644 drivers/staging/rtl8192su/TODO |
| 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 |
| create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h |
| 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/scatterwalk.c |
| delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h |
| delete mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c |
| delete mode 100644 drivers/staging/rtl8192su/r8192S_FwImgDTM.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_firmware_img.c |
| delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.h |
| create mode 100644 drivers/staging/sep/Kconfig |
| create mode 100644 drivers/staging/sep/Makefile |
| create mode 100644 drivers/staging/sep/TODO |
| create mode 100644 drivers/staging/sep/sep_dev.h |
| create mode 100644 drivers/staging/sep/sep_driver.c |
| create mode 100644 drivers/staging/sep/sep_driver_api.h |
| create mode 100644 drivers/staging/sep/sep_driver_config.h |
| create mode 100644 drivers/staging/sep/sep_driver_hw_defs.h |
| create mode 100644 drivers/staging/vme/Kconfig |
| create mode 100644 drivers/staging/vme/Makefile |
| create mode 100644 drivers/staging/vme/TODO |
| create mode 100644 drivers/staging/vme/bridges/Kconfig |
| create mode 100644 drivers/staging/vme/bridges/Makefile |
| create mode 100644 drivers/staging/vme/bridges/vme_ca91cx42.c |
| create mode 100644 drivers/staging/vme/bridges/vme_ca91cx42.h |
| create mode 100644 drivers/staging/vme/bridges/vme_tsi148.c |
| create mode 100644 drivers/staging/vme/bridges/vme_tsi148.h |
| create mode 100644 drivers/staging/vme/devices/Kconfig |
| create mode 100644 drivers/staging/vme/devices/Makefile |
| create mode 100644 drivers/staging/vme/devices/vme_user.c |
| create mode 100644 drivers/staging/vme/devices/vme_user.h |
| create mode 100644 drivers/staging/vme/vme.c |
| create mode 100644 drivers/staging/vme/vme.h |
| create mode 100644 drivers/staging/vme/vme_bridge.h |
| delete mode 100644 drivers/staging/vt6655/Makefile.arm |
| delete mode 100644 drivers/staging/vt6655/Makefile.x86 |
| create mode 100644 drivers/staging/vt6655/TODO |
| delete mode 100644 drivers/staging/vt6655/tpci.h |
| 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/TODO |
| create mode 100644 drivers/staging/vt6656/aes_ccmp.c |
| copy drivers/staging/{vt6655/tbit.h => vt6656/aes_ccmp.h} (58%) |
| 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 |
| copy drivers/staging/{vt6655/umem.h => vt6656/channel.h} (56%) |
| create mode 100644 drivers/staging/vt6656/control.c |
| copy drivers/staging/{vt6655/tbit.h => vt6656/control.h} (53%) |
| 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 |
| copy drivers/staging/{vt6655/umem.h => vt6656/dpc.h} (56%) |
| create mode 100644 drivers/staging/vt6656/firmware.c |
| copy drivers/staging/{vt6655/umem.h => vt6656/firmware.h} (56%) |
| create mode 100644 drivers/staging/vt6656/hostap.c |
| copy drivers/staging/{vt6655/umem.h => vt6656/hostap.h} (55%) |
| create mode 100644 drivers/staging/vt6656/int.c |
| copy drivers/staging/{vt6655/umem.h => vt6656/int.h} (56%) |
| create mode 100644 drivers/staging/vt6656/iocmd.h |
| create mode 100644 drivers/staging/vt6656/ioctl.c |
| copy drivers/staging/{vt6655/umem.h => vt6656/ioctl.h} (55%) |
| 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 |
| copy drivers/staging/{vt6655/tbit.h => vt6656/michael.h} (51%) |
| create mode 100644 drivers/staging/vt6656/power.c |
| copy drivers/staging/{vt6655/tbit.h => vt6656/power.h} (56%) |
| 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/tcrc.c |
| copy drivers/staging/{vt6655/tbit.h => vt6656/tcrc.h} (59%) |
| create mode 100644 drivers/staging/vt6656/tether.c |
| create mode 100644 drivers/staging/vt6656/tether.h |
| create mode 100644 drivers/staging/vt6656/tkip.c |
| copy drivers/staging/{vt6655/tbit.h => vt6656/tkip.h} (62%) |
| create mode 100644 drivers/staging/vt6656/tmacro.h |
| create mode 100644 drivers/staging/vt6656/ttype.h |
| create mode 100644 drivers/staging/vt6656/upc.h |
| create mode 100644 drivers/staging/vt6656/usbpipe.c |
| copy drivers/staging/{vt6655/tbit.h => vt6656/usbpipe.h} (52%) |
| 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 |
| rename drivers/staging/{vt6655/tbit.h => vt6656/wpa.h} (57%) |
| create mode 100644 drivers/staging/vt6656/wpa2.c |
| copy drivers/staging/{vt6655/umem.h => vt6656/wpa2.h} (56%) |
| create mode 100644 drivers/staging/vt6656/wpactl.c |
| rename drivers/staging/{vt6655/umem.h => vt6656/wpactl.h} (54%) |
| Merging scsi-post-merge/master |
| $ git merge scsi-post-merge/master |
| Already up-to-date. |
