$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at d7c1255 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 Merging origin/master $ git merge origin/master Updating d7c1255..ffc96d6 Fast-forward arch/sh/boards/mach-se/7206/irq.c | 2 +- arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 2 +- arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 3 +- drivers/acpi/acpica/evgpeinit.c | 3 + drivers/acpi/battery.c | 5 -- drivers/acpi/scan.c | 97 ++++++++++++++++++++------------ drivers/ata/pata_cs5536.c | 2 + drivers/sh/intc/core.c | 1 + drivers/video/fbmem.c | 2 +- drivers/video/imxfb.c | 9 +-- drivers/video/sh_mobile_hdmi.c | 16 ++++- drivers/video/sh_mobile_lcdcfb.c | 30 ++++------ mm/nommu.c | 28 +++++++++- 13 files changed, 124 insertions(+), 76 deletions(-) Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 17 +++++++- arch/arm/include/asm/highmem.h | 3 - arch/arm/include/asm/sizes.h | 6 +- arch/arm/kernel/entry-common.S | 6 +++ arch/arm/kernel/smp.c | 1 - arch/arm/mach-pxa/Kconfig | 1 + arch/arm/mm/cache-feroceon-l2.c | 37 ++++++++-------- arch/arm/mm/cache-xsc3l2.c | 57 +++++++++---------------- arch/arm/mm/dma-mapping.c | 7 ++- arch/arm/mm/flush.c | 7 ++- arch/arm/mm/highmem.c | 87 --------------------------------------- 11 files changed, 74 insertions(+), 155 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Already up-to-date. Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Merge made by recursive. drivers/pci/hotplug/pciehp_acpi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/rc-fixes $ git merge kbuild-current/rc-fixes Already up-to-date. Merging driver-core.current/driver-core-linus $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus $ git merge staging.current/staging-linus Merge made by recursive. drivers/staging/speakup/kobjects.c | 9 ++++++--- drivers/staging/speakup/main.c | 33 +++++++++++++++++++++------------ drivers/staging/usbip/vhci_hcd.c | 14 -------------- 3 files changed, 27 insertions(+), 29 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Merge made by recursive. arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging sh-current/sh-fixes-for-linus $ git merge sh-current/sh-fixes-for-linus Already up-to-date. Merging rmobile-current/rmobile-fixes-for-linus $ git merge rmobile-current/rmobile-fixes-for-linus Already up-to-date. Merging fbdev-current/fbdev-fixes-for-linus $ git merge fbdev-current/fbdev-fixes-for-linus Already up-to-date. Merging gcl-current/merge $ git merge gcl-current/merge Already up-to-date. Merging arm/devel $ git merge arm/devel Removing arch/arm/include/asm/smp_mpidr.h Auto-merging arch/arm/mach-s3c2412/Kconfig Removing arch/sh/kernel/clkdev.c Auto-merging arch/sh/kernel/cpu/sh4/clock-sh4-202.c Auto-merging scripts/recordmcount.h Merge made by recursive. Documentation/arm/00-INDEX | 2 + Documentation/arm/swp_emulation | 27 + arch/arm/Kconfig | 113 +- arch/arm/Kconfig.debug | 4 +- arch/arm/boot/compressed/Makefile | 4 + arch/arm/boot/compressed/head-shmobile.S | 53 + arch/arm/common/Kconfig | 4 - arch/arm/common/Makefile | 1 + arch/arm/common/gic.c | 69 +- arch/arm/{plat-versatile => common}/timer-sp.c | 8 +- arch/arm/include/asm/assembler.h | 35 +- arch/arm/include/asm/cache.h | 2 + arch/arm/include/asm/clkdev.h | 22 +- arch/arm/include/asm/domain.h | 31 +- arch/arm/include/asm/elf.h | 2 + arch/arm/include/asm/entry-macro-multi.S | 44 + arch/arm/include/asm/futex.h | 9 +- arch/arm/include/asm/hardirq.h | 18 + arch/arm/include/asm/hardware/entry-macro-gic.S | 75 + arch/arm/include/asm/hardware/gic.h | 7 +- .../plat => include/asm/hardware}/timer-sp.h | 0 arch/arm/include/asm/hw_breakpoint.h | 4 +- arch/arm/include/asm/io.h | 13 +- arch/arm/include/asm/kexec.h | 18 +- arch/arm/include/asm/localtimer.h | 12 - arch/arm/include/asm/mach/arch.h | 9 + arch/arm/include/asm/mach/irq.h | 8 +- arch/arm/include/asm/mach/time.h | 1 - arch/arm/include/asm/module.h | 15 +- arch/arm/include/asm/page.h | 6 +- arch/arm/include/asm/pgalloc.h | 52 +- arch/arm/include/asm/pgtable.h | 321 ++-- arch/arm/include/asm/sched_clock.h | 118 + arch/arm/include/asm/smp.h | 17 +- arch/arm/include/asm/smp_mpidr.h | 17 - arch/arm/include/asm/smp_twd.h | 1 - arch/arm/include/asm/system.h | 12 + arch/arm/include/asm/tlb.h | 1 + arch/arm/include/asm/traps.h | 25 +- arch/arm/include/asm/uaccess.h | 16 +- arch/arm/kernel/Makefile | 9 +- arch/arm/kernel/entry-armv.S | 56 +- arch/arm/kernel/entry-common.S | 202 ++- arch/arm/kernel/entry-header.S | 19 + arch/arm/kernel/fiq.c | 10 +- arch/arm/kernel/ftrace.c | 103 +- arch/arm/kernel/head.S | 50 +- arch/arm/kernel/hw_breakpoint.c | 543 +++-- arch/arm/kernel/irq.c | 34 +- arch/arm/kernel/iwmmxt.S | 55 +- arch/arm/kernel/machine_kexec.c | 30 + arch/arm/kernel/module.c | 109 +- arch/arm/kernel/perf_event.c | 2466 +------------------- arch/arm/kernel/perf_event_v6.c | 672 ++++++ arch/arm/kernel/perf_event_v7.c | 906 +++++++ arch/arm/kernel/perf_event_xscale.c | 807 +++++++ arch/arm/kernel/pj4-cp0.c | 94 + arch/arm/kernel/ptrace.c | 4 +- arch/arm/kernel/sched_clock.c | 69 + arch/arm/kernel/setup.c | 37 +- arch/arm/kernel/smp.c | 448 ++--- arch/arm/kernel/smp_tlb.c | 139 ++ arch/arm/kernel/smp_twd.c | 17 +- arch/arm/kernel/swp_emulate.c | 267 +++ arch/arm/kernel/time.c | 4 +- arch/arm/kernel/traps.c | 26 +- arch/arm/kernel/vmlinux.lds.S | 2 + arch/arm/lib/getuser.S | 13 +- arch/arm/lib/putuser.S | 29 +- arch/arm/lib/uaccess.S | 83 +- arch/arm/lib/uaccess_with_memcpy.c | 7 +- arch/arm/mach-at91/at91rm9200_time.c | 4 +- arch/arm/mach-at91/at91sam926x_time.c | 4 +- arch/arm/mach-bcmring/clock.c | 3 +- arch/arm/mach-bcmring/core.c | 16 +- arch/arm/mach-cns3xxx/Kconfig | 1 + arch/arm/mach-cns3xxx/core.c | 7 +- arch/arm/mach-cns3xxx/core.h | 1 - arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 66 +- arch/arm/mach-davinci/Kconfig | 19 +- arch/arm/mach-davinci/aemif.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 339 +++- arch/arm/mach-davinci/clock.c | 4 +- arch/arm/mach-davinci/clock.h | 2 +- arch/arm/mach-davinci/da850.c | 75 +- arch/arm/mach-davinci/devices-tnetv107x.c | 15 +- arch/arm/mach-davinci/include/mach/da8xx.h | 7 + arch/arm/mach-davinci/include/mach/io.h | 4 +- arch/arm/mach-davinci/psc.c | 13 +- arch/arm/mach-davinci/time.c | 31 +- arch/arm/mach-davinci/tnetv107x.c | 23 +- arch/arm/mach-dove/Kconfig | 6 + arch/arm/mach-dove/Makefile | 3 +- arch/arm/mach-dove/cm-a510.c | 95 + arch/arm/mach-dove/include/mach/dove.h | 9 +- arch/arm/mach-dove/include/mach/gpio.h | 6 +- arch/arm/mach-dove/mpp.c | 212 ++ arch/arm/mach-dove/mpp.h | 220 ++ arch/arm/mach-ep93xx/clock.c | 2 +- arch/arm/mach-imx/clock-imx1.c | 3 +- arch/arm/mach-imx/clock-imx21.c | 2 +- arch/arm/mach-imx/clock-imx27.c | 2 +- arch/arm/mach-integrator/Kconfig | 1 + arch/arm/mach-integrator/core.c | 3 +- arch/arm/mach-integrator/impd1.c | 3 +- arch/arm/mach-integrator/integrator_ap.c | 4 +- arch/arm/mach-integrator/integrator_cp.c | 5 +- arch/arm/mach-iop13xx/include/mach/io.h | 4 +- arch/arm/mach-iop32x/include/mach/io.h | 4 +- arch/arm/mach-iop33x/include/mach/io.h | 4 +- arch/arm/mach-ixp23xx/include/mach/io.h | 4 +- arch/arm/mach-ixp4xx/common.c | 35 +- arch/arm/mach-ixp4xx/include/mach/io.h | 4 +- arch/arm/mach-kirkwood/Kconfig | 12 +- arch/arm/mach-kirkwood/include/mach/io.h | 4 +- arch/arm/mach-kirkwood/ts219-setup.c | 16 +- arch/arm/mach-kirkwood/ts41x-setup.c | 9 + arch/arm/mach-ks8695/Kconfig | 1 + arch/arm/mach-lpc32xx/clock.c | 3 +- arch/arm/mach-lpc32xx/timer.c | 5 +- arch/arm/mach-mmp/Kconfig | 22 +- arch/arm/mach-mmp/Makefile | 1 + arch/arm/mach-mmp/brownstone.c | 204 ++ arch/arm/mach-mmp/clock.h | 2 +- arch/arm/mach-mmp/flint.c | 2 +- arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 338 ++-- arch/arm/mach-mmp/include/mach/mmp2.h | 22 + arch/arm/mach-mmp/include/mach/regs-apmu.h | 2 + arch/arm/mach-mmp/jasper.c | 35 + arch/arm/mach-mmp/mmp2.c | 35 + arch/arm/mach-mmp/pxa910.c | 2 + arch/arm/mach-mmp/time.c | 39 +- arch/arm/mach-msm/Kconfig | 2 + arch/arm/mach-msm/board-msm8x60.c | 7 +- arch/arm/mach-msm/include/mach/smp.h | 4 +- arch/arm/mach-msm/timer.c | 5 +- arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 2 +- arch/arm/mach-mx25/clock.c | 3 +- arch/arm/mach-mx3/clock-imx31.c | 2 +- arch/arm/mach-mx3/clock-imx35.c | 3 +- arch/arm/mach-mx5/clock-mx51.c | 2 +- arch/arm/mach-mxc91231/clock.c | 2 +- arch/arm/mach-netx/time.c | 5 +- arch/arm/mach-nomadik/clock.c | 2 +- arch/arm/mach-ns9xxx/time-ns9360.c | 6 +- arch/arm/mach-nuc93x/clock.h | 2 +- arch/arm/mach-omap1/clock.c | 2 +- arch/arm/mach-omap1/time.c | 6 +- arch/arm/mach-omap2/dpll3xxx.c | 2 +- arch/arm/mach-omap2/include/mach/entry-macro.S | 93 +- arch/arm/mach-omap2/include/mach/omap4-common.h | 1 - arch/arm/mach-omap2/omap-hotplug.c | 14 +- arch/arm/mach-omap2/omap-smp.c | 68 +- arch/arm/mach-omap2/omap4-common.c | 11 +- arch/arm/mach-omap2/timer-gp.c | 5 +- arch/arm/mach-orion5x/Kconfig | 7 + arch/arm/mach-orion5x/Makefile | 1 + arch/arm/mach-orion5x/include/mach/io.h | 4 +- arch/arm/mach-orion5x/ls-chl-setup.c | 327 +++ arch/arm/mach-pnx4008/clock.c | 3 +- arch/arm/mach-pxa/Kconfig | 25 +- arch/arm/mach-pxa/Makefile | 10 +- arch/arm/mach-pxa/balloon3.c | 59 +- arch/arm/mach-pxa/capc7117.c | 2 +- arch/arm/mach-pxa/clock-pxa2xx.c | 64 + arch/arm/mach-pxa/clock-pxa3xx.c | 218 ++ arch/arm/mach-pxa/clock.c | 29 +- arch/arm/mach-pxa/clock.h | 49 +- arch/arm/mach-pxa/cm-x2xx.c | 26 +- arch/arm/mach-pxa/cm-x300.c | 2 +- ...ibri-pxa270-evalboard.c => colibri-evalboard.c} | 96 +- arch/arm/mach-pxa/colibri-pxa270-income.c | 47 - arch/arm/mach-pxa/colibri-pxa270.c | 108 +- arch/arm/mach-pxa/colibri-pxa300.c | 73 +- arch/arm/mach-pxa/colibri-pxa320.c | 139 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 49 - arch/arm/mach-pxa/corgi.c | 6 +- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 10 +- arch/arm/mach-pxa/csb726.c | 9 +- arch/arm/mach-pxa/devices.c | 247 +- arch/arm/mach-pxa/em-x270.c | 4 +- arch/arm/mach-pxa/eseries.c | 12 +- arch/arm/mach-pxa/ezx.c | 12 +- arch/arm/mach-pxa/generic.c | 48 +- arch/arm/mach-pxa/generic.h | 11 +- arch/arm/mach-pxa/gumstix.c | 2 +- arch/arm/mach-pxa/h5000.c | 11 +- arch/arm/mach-pxa/himalaya.c | 2 +- arch/arm/mach-pxa/hx4700.c | 2 +- arch/arm/mach-pxa/icontrol.c | 2 +- arch/arm/mach-pxa/idp.c | 2 +- arch/arm/mach-pxa/include/mach/addr-map.h | 48 + arch/arm/mach-pxa/include/mach/balloon3.h | 6 +- arch/arm/mach-pxa/include/mach/colibri.h | 14 +- arch/arm/mach-pxa/include/mach/hardware.h | 47 +- arch/arm/mach-pxa/include/mach/irqs.h | 48 +- arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 66 - arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 9 - arch/arm/mach-pxa/include/mach/regs-intc.h | 4 - arch/arm/mach-pxa/include/mach/smemc.h | 74 + arch/arm/mach-pxa/irq.c | 129 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/lpd270.c | 5 +- arch/arm/mach-pxa/lubbock.c | 5 +- arch/arm/mach-pxa/magician.c | 2 +- arch/arm/mach-pxa/mainstone.c | 5 +- arch/arm/mach-pxa/mioa701.c | 2 +- arch/arm/mach-pxa/mp900.c | 2 +- arch/arm/mach-pxa/palmld.c | 2 +- arch/arm/mach-pxa/palmt5.c | 2 +- arch/arm/mach-pxa/palmtc.c | 190 ++- arch/arm/mach-pxa/palmte2.c | 2 +- arch/arm/mach-pxa/palmtreo.c | 4 +- arch/arm/mach-pxa/palmtx.c | 2 +- arch/arm/mach-pxa/palmz72.c | 2 +- arch/arm/mach-pxa/pcm027.c | 2 +- arch/arm/mach-pxa/poodle.c | 2 +- arch/arm/mach-pxa/pxa25x.c | 86 +- arch/arm/mach-pxa/pxa27x.c | 102 +- arch/arm/mach-pxa/pxa3xx.c | 234 +-- arch/arm/mach-pxa/pxa930.c | 2 +- arch/arm/mach-pxa/pxa95x.c | 308 +++ arch/arm/mach-pxa/raumfeld.c | 11 +- arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-pxa/saarb.c | 114 + arch/arm/mach-pxa/sleep.S | 2 +- arch/arm/mach-pxa/smemc.c | 51 +- arch/arm/mach-pxa/spitz.c | 13 +- arch/arm/mach-pxa/stargate2.c | 7 +- arch/arm/mach-pxa/tavorevb.c | 2 +- arch/arm/mach-pxa/tavorevb3.c | 2 +- arch/arm/mach-pxa/time.c | 35 +- arch/arm/mach-pxa/tosa.c | 9 +- arch/arm/mach-pxa/trizeps4.c | 5 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-pxa/vpac270.c | 2 +- arch/arm/mach-pxa/xcep.c | 7 +- arch/arm/mach-pxa/z2.c | 2 +- arch/arm/mach-pxa/zeus.c | 10 +- arch/arm/mach-pxa/zylonite.c | 2 +- arch/arm/mach-realview/core.c | 18 +- arch/arm/mach-realview/core.h | 1 - arch/arm/mach-realview/hotplug.c | 44 +- arch/arm/mach-realview/include/mach/entry-macro.S | 65 +- arch/arm/mach-realview/include/mach/smp.h | 5 +- arch/arm/mach-realview/platsmp.c | 116 +- arch/arm/mach-realview/realview_eb.c | 14 +- arch/arm/mach-realview/realview_pb1176.c | 11 +- arch/arm/mach-realview/realview_pb11mp.c | 10 +- arch/arm/mach-realview/realview_pba8.c | 6 +- arch/arm/mach-realview/realview_pbx.c | 13 +- arch/arm/mach-s3c2412/Kconfig | 2 +- arch/arm/mach-s5pv310/cpu.c | 6 +- arch/arm/mach-s5pv310/hotplug.c | 44 +- arch/arm/mach-s5pv310/include/mach/smp.h | 7 +- arch/arm/mach-s5pv310/platsmp.c | 68 +- arch/arm/mach-s5pv310/time.c | 6 +- arch/arm/mach-sa1100/Kconfig | 10 + arch/arm/mach-sa1100/Makefile | 3 + arch/arm/mach-sa1100/cpu-sa1100.c | 51 +- arch/arm/mach-sa1100/cpu-sa1110.c | 57 +- arch/arm/mach-sa1100/generic.c | 23 - arch/arm/mach-sa1100/include/mach/hardware.h | 8 + arch/arm/mach-sa1100/include/mach/nanoengine.h | 52 + arch/arm/mach-sa1100/nanoengine.c | 119 + arch/arm/mach-sa1100/pci-nanoengine.c | 284 +++ arch/arm/mach-sa1100/time.c | 36 +- arch/arm/mach-shmobile/Kconfig | 6 +- arch/arm/mach-shmobile/board-ap4evb.c | 1 + arch/arm/mach-shmobile/clock-sh7367.c | 2 +- arch/arm/mach-shmobile/clock-sh7372.c | 2 +- arch/arm/mach-shmobile/clock-sh7377.c | 2 +- .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 87 + arch/arm/mach-shmobile/include/mach/zboot.h | 20 + arch/arm/mach-shmobile/include/mach/zboot_macros.h | 65 + arch/arm/mach-tcc8k/clock.c | 3 +- arch/arm/mach-tcc8k/time.c | 5 +- arch/arm/mach-tegra/clock.c | 2 +- arch/arm/mach-tegra/clock.h | 2 +- arch/arm/mach-tegra/hotplug.c | 44 +- arch/arm/mach-tegra/include/mach/entry-macro.S | 66 +- arch/arm/mach-tegra/include/mach/io.h | 4 +- arch/arm/mach-tegra/include/mach/smp.h | 12 +- arch/arm/mach-tegra/irq.c | 4 +- arch/arm/mach-tegra/platsmp.c | 35 +- arch/arm/mach-tegra/tegra2_clocks.c | 3 +- arch/arm/mach-tegra/timer.c | 31 +- arch/arm/mach-u300/clock.c | 2 +- arch/arm/mach-u300/timer.c | 22 +- arch/arm/mach-ux500/clock.c | 3 +- arch/arm/mach-ux500/cpu.c | 4 +- arch/arm/mach-ux500/headsmp.S | 1 - arch/arm/mach-ux500/hotplug.c | 18 +- arch/arm/mach-ux500/include/mach/entry-macro.S | 68 +- arch/arm/mach-ux500/include/mach/smp.h | 5 +- arch/arm/mach-ux500/platsmp.c | 75 +- arch/arm/mach-versatile/Kconfig | 1 + arch/arm/mach-versatile/core.c | 15 +- arch/arm/mach-vexpress/Makefile | 1 + arch/arm/mach-vexpress/core.h | 2 - arch/arm/mach-vexpress/ct-ca9x4.c | 12 +- arch/arm/mach-vexpress/hotplug.c | 128 + arch/arm/mach-vexpress/include/mach/entry-macro.S | 62 +- arch/arm/mach-vexpress/include/mach/smp.h | 5 +- arch/arm/mach-vexpress/platsmp.c | 76 +- arch/arm/mach-vexpress/v2m.c | 8 +- arch/arm/mach-w90x900/clock.h | 2 +- arch/arm/mach-w90x900/time.c | 5 +- arch/arm/mm/Kconfig | 43 +- arch/arm/mm/Makefile | 4 +- arch/arm/mm/dma-mapping.c | 11 +- arch/arm/mm/fault-armv.c | 9 +- arch/arm/mm/fault.c | 31 +- arch/arm/mm/idmap.c | 90 + arch/arm/mm/ioremap.c | 8 +- arch/arm/mm/mm.h | 4 +- arch/arm/mm/mmu.c | 90 +- arch/arm/mm/pgd.c | 57 +- arch/arm/mm/proc-macros.S | 37 +- arch/arm/mm/proc-v7.S | 27 +- arch/arm/mm/proc-xscale.S | 4 +- arch/arm/plat-iop/time.c | 27 +- arch/arm/plat-mxc/epit.c | 5 +- arch/arm/plat-mxc/time.c | 5 +- arch/arm/plat-nomadik/Kconfig | 1 + arch/arm/plat-nomadik/timer.c | 80 +- arch/arm/plat-omap/Kconfig | 4 +- arch/arm/plat-omap/counter_32k.c | 47 +- arch/arm/plat-omap/include/plat/clkdev_omap.h | 2 +- arch/arm/plat-omap/include/plat/io.h | 4 +- arch/arm/plat-omap/include/plat/smp.h | 5 +- arch/arm/plat-orion/time.c | 50 +- arch/arm/plat-pxa/Makefile | 1 + arch/arm/plat-pxa/include/plat/mfp.h | 4 +- arch/arm/plat-spear/include/plat/clock.h | 2 +- arch/arm/plat-spear/time.c | 6 +- arch/arm/plat-stmp3xxx/clock.c | 2 +- arch/arm/plat-stmp3xxx/timer.c | 5 +- arch/arm/plat-versatile/Makefile | 5 +- arch/arm/plat-versatile/include/plat/sched_clock.h | 6 + arch/arm/plat-versatile/sched-clock.c | 51 +- arch/arm/vfp/vfpmodule.c | 24 +- arch/sh/Kconfig | 2 +- arch/sh/boards/mach-highlander/setup.c | 2 +- arch/sh/include/asm/clkdev.h | 38 +- arch/sh/kernel/Makefile | 2 +- arch/sh/kernel/clkdev.c | 171 -- arch/sh/kernel/cpu/clock-cpg.c | 2 +- arch/sh/kernel/cpu/clock.c | 16 - arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-shx3.c | 2 +- drivers/Kconfig | 2 + drivers/Makefile | 2 + drivers/amba/bus.c | 39 + drivers/clk/Kconfig | 4 + drivers/clk/Makefile | 2 + {arch/arm/common => drivers/clk}/clkdev.c | 13 +- drivers/dma/amba-pl08x.c | 163 +- drivers/mmc/host/mmci.c | 199 ++- drivers/mmc/host/mmci.h | 9 + drivers/pcmcia/Kconfig | 3 +- drivers/pcmcia/Makefile | 5 +- drivers/pcmcia/pxa2xx_balloon3.c | 11 +- drivers/pcmcia/pxa2xx_base.c | 64 +- drivers/pcmcia/pxa2xx_colibri.c | 229 ++ drivers/pcmcia/sa1100_generic.c | 3 + drivers/pcmcia/sa1100_generic.h | 1 + drivers/pcmcia/sa1100_nanoengine.c | 219 ++ drivers/pcmcia/soc_common.c | 128 +- drivers/pcmcia/soc_common.h | 3 + drivers/rtc/rtc-sa1100.c | 161 +- drivers/serial/amba-pl011.c | 590 +++++- drivers/video/Kconfig | 10 + drivers/video/Makefile | 1 + drivers/video/pxa3xx-gcu.c | 772 ++++++ drivers/video/pxa3xx-gcu.h | 38 + fs/proc/vmcore.c | 2 +- include/linux/amba/bus.h | 8 + include/linux/amba/pl08x.h | 2 +- include/linux/amba/serial.h | 21 + include/linux/clkdev.h | 36 + include/linux/crash_dump.h | 9 +- kernel/time/clocksource.c | 1 + scripts/recordmcount.c | 7 +- scripts/recordmcount.h | 5 +- 395 files changed, 12976 insertions(+), 6964 deletions(-) create mode 100644 Documentation/arm/swp_emulation create mode 100644 arch/arm/boot/compressed/head-shmobile.S rename arch/arm/{plat-versatile => common}/timer-sp.c (95%) create mode 100644 arch/arm/include/asm/entry-macro-multi.S create mode 100644 arch/arm/include/asm/hardware/entry-macro-gic.S rename arch/arm/{plat-versatile/include/plat => include/asm/hardware}/timer-sp.h (100%) create mode 100644 arch/arm/include/asm/sched_clock.h delete mode 100644 arch/arm/include/asm/smp_mpidr.h create mode 100644 arch/arm/kernel/perf_event_v6.c create mode 100644 arch/arm/kernel/perf_event_v7.c create mode 100644 arch/arm/kernel/perf_event_xscale.c create mode 100644 arch/arm/kernel/pj4-cp0.c create mode 100644 arch/arm/kernel/sched_clock.c create mode 100644 arch/arm/kernel/smp_tlb.c create mode 100644 arch/arm/kernel/swp_emulate.c create mode 100644 arch/arm/mach-dove/cm-a510.c create mode 100644 arch/arm/mach-dove/mpp.c create mode 100644 arch/arm/mach-dove/mpp.h create mode 100644 arch/arm/mach-mmp/brownstone.c create mode 100644 arch/arm/mach-orion5x/ls-chl-setup.c create mode 100644 arch/arm/mach-pxa/clock-pxa2xx.c create mode 100644 arch/arm/mach-pxa/clock-pxa3xx.c rename arch/arm/mach-pxa/{colibri-pxa270-evalboard.c => colibri-evalboard.c} (51%) create mode 100644 arch/arm/mach-pxa/include/mach/addr-map.h create mode 100644 arch/arm/mach-pxa/include/mach/smemc.h create mode 100644 arch/arm/mach-pxa/pxa95x.c create mode 100644 arch/arm/mach-pxa/saarb.c create mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h create mode 100644 arch/arm/mach-sa1100/nanoengine.c create mode 100644 arch/arm/mach-sa1100/pci-nanoengine.c create mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt create mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h create mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h create mode 100644 arch/arm/mach-vexpress/hotplug.c create mode 100644 arch/arm/mm/idmap.c create mode 100644 arch/arm/plat-versatile/include/plat/sched_clock.h delete mode 100644 arch/sh/kernel/clkdev.c create mode 100644 drivers/clk/Kconfig create mode 100644 drivers/clk/Makefile rename {arch/arm/common => drivers/clk}/clkdev.c (93%) create mode 100644 drivers/pcmcia/pxa2xx_colibri.c create mode 100644 drivers/pcmcia/sa1100_nanoengine.c create mode 100644 drivers/video/pxa3xx-gcu.c create mode 100644 drivers/video/pxa3xx-gcu.h create mode 100644 include/linux/clkdev.h Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Renaming arch/arm/mach-mx25/clock.c => arch/arm/mach-imx/clock-imx25.c Auto-merging arch/arm/mach-imx/clock-imx25.c Renaming arch/arm/mach-mx5/clock-mx51.c => arch/arm/mach-mx5/clock-mx51-mx53.c Auto-merging arch/arm/mach-mx5/clock-mx51-mx53.c Auto-merging arch/arm/mach-imx/clock-imx21.c Auto-merging arch/arm/mach-imx/clock-imx27.c Removing arch/arm/mach-imx/devices.c Removing arch/arm/mach-imx/devices.h Removing arch/arm/mach-mx25/Kconfig Removing arch/arm/mach-mx25/Makefile Removing arch/arm/mach-mx25/Makefile.boot Removing arch/arm/mach-mx25/devices-imx25.h Removing arch/arm/mach-mx25/devices.c Removing arch/arm/mach-mx25/devices.h Auto-merging arch/arm/mach-mx3/clock-imx31.c Auto-merging arch/arm/mach-mx3/clock-imx35.c Removing arch/arm/plat-mxc/devices/platform-esdhc.c Auto-merging drivers/dma/imx-sdma.c Merge made by recursive. arch/arm/Makefile | 2 +- arch/arm/configs/mx3_defconfig | 1 + arch/arm/mach-imx/Kconfig | 133 ++++- arch/arm/mach-imx/Makefile | 8 +- arch/arm/mach-imx/Makefile.boot | 4 + arch/arm/mach-imx/clock-imx21.c | 2 +- .../{mach-mx25/clock.c => mach-imx/clock-imx25.c} | 2 +- arch/arm/mach-imx/clock-imx27.c | 24 +- arch/arm/mach-imx/cpu-imx27.c | 14 +- arch/arm/mach-imx/devices-imx21.h | 24 + arch/arm/mach-imx/devices-imx25.h | 87 +++ arch/arm/mach-imx/devices-imx27.h | 35 ++ arch/arm/mach-imx/devices.c | 553 -------------------- arch/arm/mach-imx/devices.h | 29 - arch/arm/mach-imx/dma-v1.c | 4 +- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 17 +- .../eukrea_mbimxsd25-baseboard.c} | 10 +- arch/arm/mach-imx/mach-cpuimx27.c | 21 +- .../mach-eukrea_cpuimx25.c} | 19 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 12 +- arch/arm/mach-imx/mach-imx27lite.c | 1 - arch/arm/mach-imx/mach-mx1ads.c | 1 - arch/arm/mach-imx/mach-mx21ads.c | 20 +- arch/arm/{mach-mx25 => mach-imx}/mach-mx25_3ds.c | 22 +- arch/arm/mach-imx/mach-mx27_3ds.c | 12 +- arch/arm/mach-imx/mach-mx27ads.c | 17 +- arch/arm/mach-imx/mach-mxt_td60.c | 11 +- arch/arm/mach-imx/mach-pca100.c | 33 +- arch/arm/mach-imx/mach-pcm038.c | 12 +- arch/arm/mach-imx/mach-scb9328.c | 1 - arch/arm/mach-imx/mm-imx1.c | 7 +- arch/arm/mach-imx/mm-imx21.c | 21 +- arch/arm/{mach-mx25/mm.c => mach-imx/mm-imx25.c} | 27 +- arch/arm/mach-imx/mm-imx27.c | 21 +- arch/arm/mach-imx/pcm970-baseboard.c | 12 +- arch/arm/mach-imx/pm-imx27.c | 3 + arch/arm/mach-mx25/Kconfig | 34 -- arch/arm/mach-mx25/Makefile | 5 - arch/arm/mach-mx25/Makefile.boot | 3 - arch/arm/mach-mx25/devices-imx25.h | 54 -- arch/arm/mach-mx25/devices.c | 308 ----------- arch/arm/mach-mx25/devices.h | 13 - arch/arm/mach-mx3/Kconfig | 82 +++- arch/arm/mach-mx3/Makefile | 7 +- arch/arm/mach-mx3/clock-imx31.c | 4 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- arch/arm/mach-mx3/cpu.c | 31 +- arch/arm/mach-mx3/devices-imx31.h | 27 + arch/arm/mach-mx3/devices-imx35.h | 41 ++- arch/arm/mach-mx3/devices.c | 271 +--------- arch/arm/mach-mx3/devices.h | 10 - arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 4 +- arch/arm/mach-mx3/mach-armadillo5x0.c | 14 +- arch/arm/mach-mx3/mach-cpuimx35.c | 22 +- arch/arm/mach-mx3/mach-kzm_arm11_01.c | 6 +- arch/arm/mach-mx3/mach-mx31_3ds.c | 13 +- arch/arm/mach-mx3/mach-mx31lilly.c | 9 +- arch/arm/mach-mx3/mach-mx31lite.c | 5 +- arch/arm/mach-mx3/mach-mx31moboard.c | 20 +- arch/arm/mach-mx3/mach-mx35_3ds.c | 15 +- arch/arm/mach-mx3/mach-pcm037.c | 23 +- arch/arm/mach-mx3/mach-pcm043.c | 34 +- arch/arm/mach-mx3/mm.c | 84 ++-- arch/arm/mach-mx3/mx31lilly-db.c | 5 +- arch/arm/mach-mx3/mx31lite-db.c | 8 +- arch/arm/mach-mx3/mx31moboard-devboard.c | 20 +- arch/arm/mach-mx3/mx31moboard-marxbot.c | 21 +- arch/arm/mach-mx3/mx31moboard-smartbot.c | 16 +- arch/arm/mach-mx5/Kconfig | 22 +- arch/arm/mach-mx5/Makefile | 2 +- arch/arm/mach-mx5/board-cpuimx51.c | 18 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 36 +- arch/arm/mach-mx5/board-mx51_3ds.c | 5 +- arch/arm/mach-mx5/board-mx51_babbage.c | 65 ++- arch/arm/mach-mx5/board-mx51_efikamx.c | 247 +++++++++- .../mach-mx5/{clock-mx51.c => clock-mx51-mx53.c} | 86 +++- arch/arm/mach-mx5/cpu.c | 118 +++-- arch/arm/mach-mx5/crm_regs.h | 6 +- arch/arm/mach-mx5/devices-imx51.h | 11 +- arch/arm/mach-mx5/devices.c | 42 +- arch/arm/mach-mx5/devices.h | 1 - arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 16 +- arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 8 +- arch/arm/mach-mx5/mm.c | 75 ++-- arch/arm/mach-mxc91231/mm.c | 53 +-- arch/arm/plat-mxc/Kconfig | 15 +- arch/arm/plat-mxc/Makefile | 5 +- arch/arm/plat-mxc/audmux-v2.c | 4 +- arch/arm/plat-mxc/{irq.c => avic.c} | 32 +- arch/arm/plat-mxc/cpufreq.c | 1 - arch/arm/plat-mxc/devices.c | 23 +- arch/arm/plat-mxc/devices/Kconfig | 54 ++- arch/arm/plat-mxc/devices/Makefile | 16 +- arch/arm/plat-mxc/devices/platform-esdhc.c | 71 --- arch/arm/plat-mxc/devices/platform-fec.c | 8 +- arch/arm/plat-mxc/devices/platform-flexcan.c | 48 ++- arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 56 ++ arch/arm/plat-mxc/devices/platform-imx-dma.c | 127 ++++- arch/arm/plat-mxc/devices/platform-imx-fb.c | 52 ++ arch/arm/plat-mxc/devices/platform-imx-i2c.c | 16 +- arch/arm/plat-mxc/devices/platform-imx-keypad.c | 62 +++ arch/arm/plat-mxc/devices/platform-imx-ssi.c | 17 +- arch/arm/plat-mxc/devices/platform-imx-uart.c | 16 +- arch/arm/plat-mxc/devices/platform-imx2-wdt.c | 68 +++ arch/arm/plat-mxc/devices/platform-imx21-hcd.c | 41 ++ arch/arm/plat-mxc/devices/platform-imx_udc.c | 75 +++ arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | 41 ++ arch/arm/plat-mxc/devices/platform-mx1-camera.c | 42 ++ arch/arm/plat-mxc/devices/platform-mx2-camera.c | 64 +++ arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 69 +++ arch/arm/plat-mxc/devices/platform-mxc-mmc.c | 72 +++ arch/arm/plat-mxc/devices/platform-mxc_nand.c | 10 +- arch/arm/plat-mxc/devices/platform-mxc_pwm.c | 60 +++ arch/arm/plat-mxc/devices/platform-mxc_rnga.c | 56 ++ arch/arm/plat-mxc/devices/platform-mxc_w1.c | 50 ++ .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 74 +++ arch/arm/plat-mxc/devices/platform-spi_imx.c | 16 +- arch/arm/plat-mxc/ehci.c | 26 +- arch/arm/plat-mxc/gpio.c | 97 ++++- arch/arm/plat-mxc/include/mach/common.h | 7 +- arch/arm/plat-mxc/include/mach/debug-macro.S | 23 +- arch/arm/plat-mxc/include/mach/devices-common.h | 174 ++++++- arch/arm/plat-mxc/include/mach/entry-macro.S | 14 +- arch/arm/plat-mxc/include/mach/gpio.h | 5 + arch/arm/plat-mxc/include/mach/hardware.h | 88 +++- arch/arm/plat-mxc/include/mach/imxfb.h | 3 + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 28 +- arch/arm/plat-mxc/include/mach/iomux-mx53.h | 303 +++++++++++ arch/arm/plat-mxc/include/mach/iomux-v3.h | 38 ++- arch/arm/plat-mxc/include/mach/memory.h | 5 +- arch/arm/plat-mxc/include/mach/mx1.h | 155 +----- arch/arm/plat-mxc/include/mach/mx21.h | 50 +-- arch/arm/plat-mxc/include/mach/mx25.h | 46 +- arch/arm/plat-mxc/include/mach/mx27.h | 105 +--- arch/arm/plat-mxc/include/mach/mx2x.h | 149 ------ arch/arm/plat-mxc/include/mach/mx31.h | 87 +--- arch/arm/plat-mxc/include/mach/mx35.h | 51 +-- arch/arm/plat-mxc/include/mach/mx3x.h | 198 +------- arch/arm/plat-mxc/include/mach/mx51.h | 69 +--- arch/arm/plat-mxc/include/mach/mx53.h | 353 +++++++++++++ arch/arm/plat-mxc/include/mach/mxc.h | 16 + arch/arm/plat-mxc/include/mach/mxc91231.h | 23 +- arch/arm/plat-mxc/include/mach/sdma.h | 46 ++ arch/arm/plat-mxc/iomux-v3.c | 22 +- arch/arm/plat-mxc/irq-common.c | 60 +++ arch/arm/plat-mxc/irq-common.h | 29 + arch/arm/plat-mxc/ssi-fiq.S | 2 + arch/arm/plat-mxc/system.c | 10 +- arch/arm/plat-mxc/tzic.c | 46 ++- drivers/dma/imx-sdma.c | 174 +++---- drivers/usb/gadget/fsl_mxc_udc.c | 4 +- drivers/watchdog/imx2_wdt.c | 2 +- 152 files changed, 4000 insertions(+), 3113 deletions(-) rename arch/arm/{mach-mx25/clock.c => mach-imx/clock-imx25.c} (99%) create mode 100644 arch/arm/mach-imx/devices-imx25.h delete mode 100644 arch/arm/mach-imx/devices.c delete mode 100644 arch/arm/mach-imx/devices.h rename arch/arm/{mach-mx25/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd25-baseboard.c} (96%) rename arch/arm/{mach-mx25/mach-cpuimx25.c => mach-imx/mach-eukrea_cpuimx25.c} (89%) rename arch/arm/{mach-mx25 => mach-imx}/mach-mx25_3ds.c (90%) rename arch/arm/{mach-mx25/mm.c => mach-imx/mm-imx25.c} (69%) delete mode 100644 arch/arm/mach-mx25/Kconfig delete mode 100644 arch/arm/mach-mx25/Makefile delete mode 100644 arch/arm/mach-mx25/Makefile.boot delete mode 100644 arch/arm/mach-mx25/devices-imx25.h delete mode 100644 arch/arm/mach-mx25/devices.c delete mode 100644 arch/arm/mach-mx25/devices.h rename arch/arm/mach-mx5/{clock-mx51.c => clock-mx51-mx53.c} (92%) rename arch/arm/plat-mxc/{irq.c => avic.c} (89%) delete mode 100644 arch/arm/plat-mxc/devices/platform-esdhc.c create mode 100644 arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx-fb.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx-keypad.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx2-wdt.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx21-hcd.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx_udc.c create mode 100644 arch/arm/plat-mxc/devices/platform-imxdi_rtc.c create mode 100644 arch/arm/plat-mxc/devices/platform-mx1-camera.c create mode 100644 arch/arm/plat-mxc/devices/platform-mx2-camera.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc-ehci.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc-mmc.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_pwm.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rnga.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_w1.c create mode 100644 arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx53.h create mode 100644 arch/arm/plat-mxc/include/mach/mx53.h create mode 100644 arch/arm/plat-mxc/irq-common.c create mode 100644 arch/arm/plat-mxc/irq-common.h Merging linux-spec/for-next $ git merge linux-spec/for-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Auto-merging arch/arm/mach-msm/Kconfig Merge made by recursive. arch/arm/mach-msm/Kconfig | 8 + arch/arm/mach-msm/Makefile | 5 +- arch/arm/mach-msm/board-msm7x30.c | 20 + arch/arm/mach-msm/board-qsd8x50.c | 19 + arch/arm/mach-msm/board-trout-gpio.c | 8 + arch/arm/mach-msm/board-trout-panel.c | 297 ++++++++++++++++ arch/arm/mach-msm/clock.c | 15 + arch/arm/mach-msm/devices-msm7x00.c | 69 ++++- arch/arm/mach-msm/devices-msm7x30.c | 72 ++++ arch/arm/mach-msm/devices-msm8x60-iommu.c | 243 +++++++------ arch/arm/mach-msm/devices-qsd8x50.c | 71 ++++ arch/arm/mach-msm/devices.h | 6 + arch/arm/mach-msm/gpio-v2.c | 426 +++++++++++++++++++++++ arch/arm/mach-msm/include/mach/iommu.h | 15 +- arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h | 22 ++- arch/arm/mach-msm/include/mach/irqs-8x60.h | 7 +- arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 3 + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 3 + arch/arm/mach-msm/io.c | 1 + arch/arm/mach-msm/iommu.c | 146 ++++++-- arch/arm/mach-msm/iommu_dev.c | 4 +- arch/arm/mach-msm/sirc.c | 3 - arch/arm/mach-msm/smd.c | 17 +- arch/arm/mach-msm/smd_debug.c | 2 + drivers/mmc/host/msm_sdcc.c | 139 ++++++-- drivers/mmc/host/msm_sdcc.h | 8 +- drivers/serial/msm_serial.c | 2 +- 27 files changed, 1434 insertions(+), 197 deletions(-) create mode 100644 arch/arm/mach-msm/board-trout-panel.c create mode 100644 arch/arm/mach-msm/gpio-v2.c Merging omap/for-next $ git merge omap/for-next Resolved 'arch/arm/plat-omap/Kconfig' using previous resolution. Auto-merging MAINTAINERS Removing arch/arm/configs/ams_delta_defconfig Removing arch/arm/configs/htcherald_defconfig Removing arch/arm/configs/n770_defconfig Removing arch/arm/configs/omap_generic_1510_defconfig Removing arch/arm/configs/omap_generic_1610_defconfig Removing arch/arm/configs/omap_generic_1710_defconfig Removing arch/arm/configs/omap_h2_1610_defconfig Removing arch/arm/configs/omap_innovator_1510_defconfig Removing arch/arm/configs/omap_innovator_1610_defconfig Removing arch/arm/configs/omap_osk_5912_defconfig Removing arch/arm/configs/omap_perseus2_730_defconfig Removing arch/arm/configs/palmte_defconfig Removing arch/arm/configs/palmtt_defconfig Removing arch/arm/configs/palmz71_defconfig Removing arch/arm/configs/sx1_defconfig Auto-merging arch/arm/mach-omap1/time.c Removing arch/arm/mach-omap2/board-zoom2.c Removing arch/arm/mach-omap2/cm.c Removing arch/arm/mach-omap2/cm4xxx.c Auto-merging arch/arm/mach-omap2/dpll3xxx.c Auto-merging arch/arm/mach-omap2/include/mach/entry-macro.S Auto-merging arch/arm/mach-omap2/omap4-common.c Removing arch/arm/mach-omap2/powerdomains.h Auto-merging arch/arm/mach-omap2/timer-gp.c Auto-merging arch/arm/plat-omap/Kconfig CONFLICT (content): Merge conflict in arch/arm/plat-omap/Kconfig Auto-merging arch/arm/plat-omap/include/plat/clkdev_omap.h Removing arch/arm/plat-omap/include/plat/powerdomain.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 66307ef] Merge remote branch 'omap/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/OMAP/omap_pm | 25 + MAINTAINERS | 14 + arch/arm/configs/ams_delta_defconfig | 121 -- arch/arm/configs/htcherald_defconfig | 73 - arch/arm/configs/n770_defconfig | 138 -- arch/arm/configs/omap1_defconfig | 286 ++++ arch/arm/configs/omap_generic_1510_defconfig | 84 - arch/arm/configs/omap_generic_1610_defconfig | 87 - arch/arm/configs/omap_generic_1710_defconfig | 75 - arch/arm/configs/omap_h2_1610_defconfig | 109 -- arch/arm/configs/omap_innovator_1510_defconfig | 102 -- arch/arm/configs/omap_innovator_1610_defconfig | 58 - arch/arm/configs/omap_osk_5912_defconfig | 87 - arch/arm/configs/omap_perseus2_730_defconfig | 65 - arch/arm/configs/palmte_defconfig | 48 - arch/arm/configs/palmtt_defconfig | 56 - arch/arm/configs/palmz71_defconfig | 53 - arch/arm/configs/sx1_defconfig | 110 -- arch/arm/include/asm/hardware/cache-l2x0.h | 12 +- arch/arm/mach-omap1/Kconfig | 11 +- arch/arm/mach-omap1/Makefile | 12 +- arch/arm/mach-omap1/board-ams-delta.c | 137 +- arch/arm/mach-omap1/board-fsample.c | 89 +- arch/arm/mach-omap1/board-h2.c | 79 +- arch/arm/mach-omap1/board-h3.c | 97 +- arch/arm/mach-omap1/board-htcherald.c | 102 +- arch/arm/mach-omap1/board-innovator.c | 32 +- arch/arm/mach-omap1/board-nokia770.c | 30 +- arch/arm/mach-omap1/board-osk.c | 27 +- arch/arm/mach-omap1/board-palmte.c | 29 +- arch/arm/mach-omap1/board-palmtt.c | 28 +- arch/arm/mach-omap1/board-palmz71.c | 31 +- arch/arm/mach-omap1/board-perseus2.c | 91 +- arch/arm/mach-omap1/board-sx1.c | 58 +- arch/arm/mach-omap1/board-voiceblue.c | 7 +- arch/arm/mach-omap1/clock_data.c | 27 +- arch/arm/mach-omap1/devices.c | 4 + arch/arm/mach-omap1/dma.c | 390 +++++ arch/arm/mach-omap1/flash.c | 1 + arch/arm/mach-omap1/fpga.c | 10 +- arch/arm/mach-omap1/gpio15xx.c | 99 ++ arch/arm/mach-omap1/gpio16xx.c | 200 +++ arch/arm/mach-omap1/gpio7xx.c | 262 ++++ arch/arm/mach-omap1/include/mach/entry-macro.S | 27 +- arch/arm/mach-omap1/io.c | 39 + arch/arm/mach-omap1/irq.c | 5 + arch/arm/mach-omap1/lcd_dma.c | 3 + arch/arm/mach-omap1/leds.c | 3 + arch/arm/mach-omap1/mailbox.c | 5 +- arch/arm/mach-omap1/mcbsp.c | 5 +- arch/arm/mach-omap1/mux.c | 2 +- arch/arm/mach-omap1/pm.c | 3 + arch/arm/mach-omap1/pm_bus.c | 4 +- arch/arm/mach-omap1/serial.c | 11 +- arch/arm/mach-omap1/time.c | 1 + arch/arm/mach-omap2/Kconfig | 34 +- arch/arm/mach-omap2/Makefile | 83 +- arch/arm/mach-omap2/board-2430sdp.c | 8 +- arch/arm/mach-omap2/board-3430sdp.c | 6 +- arch/arm/mach-omap2/board-3630sdp.c | 8 +- arch/arm/mach-omap2/board-4430sdp.c | 45 +- arch/arm/mach-omap2/board-am3517crane.c | 116 ++ arch/arm/mach-omap2/board-am3517evm.c | 7 +- arch/arm/mach-omap2/board-apollon.c | 10 +- arch/arm/mach-omap2/board-cm-t35.c | 15 +- arch/arm/mach-omap2/board-cm-t3517.c | 4 +- arch/arm/mach-omap2/board-devkit8000.c | 14 +- arch/arm/mach-omap2/board-generic.c | 3 +- arch/arm/mach-omap2/board-h4.c | 71 +- arch/arm/mach-omap2/board-igep0020.c | 124 +- arch/arm/mach-omap2/board-igep0030.c | 7 +- arch/arm/mach-omap2/board-ldp.c | 8 +- arch/arm/mach-omap2/board-n8x0.c | 70 +- arch/arm/mach-omap2/board-omap3beagle.c | 8 +- arch/arm/mach-omap2/board-omap3evm.c | 6 +- arch/arm/mach-omap2/board-omap3logic.c | 6 +- arch/arm/mach-omap2/board-omap3pandora.c | 10 +- arch/arm/mach-omap2/board-omap3stalker.c | 6 +- arch/arm/mach-omap2/board-omap3touchbook.c | 8 +- arch/arm/mach-omap2/board-omap4panda.c | 22 +- arch/arm/mach-omap2/board-overo.c | 8 +- arch/arm/mach-omap2/board-rm680.c | 187 +++ arch/arm/mach-omap2/board-rx51-peripherals.c | 77 +- arch/arm/mach-omap2/board-rx51-video.c | 9 +- arch/arm/mach-omap2/board-rx51.c | 10 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- .../arm/mach-omap2/{board-zoom3.c => board-zoom.c} | 102 +- arch/arm/mach-omap2/board-zoom2.c | 117 -- arch/arm/mach-omap2/clkt2xxx_apll.c | 12 +- arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 10 +- arch/arm/mach-omap2/clkt2xxx_osc.c | 2 +- arch/arm/mach-omap2/clkt2xxx_sys.c | 2 +- arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 14 +- arch/arm/mach-omap2/clkt_dpll.c | 1 - arch/arm/mach-omap2/clock.c | 6 +- arch/arm/mach-omap2/clock.h | 1 - arch/arm/mach-omap2/clock2420_data.c | 14 +- arch/arm/mach-omap2/clock2430.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 14 +- arch/arm/mach-omap2/clock34xx.c | 2 +- arch/arm/mach-omap2/clock3517.c | 2 +- arch/arm/mach-omap2/clock3xxx.c | 6 +- arch/arm/mach-omap2/clock3xxx_data.c | 230 ++-- arch/arm/mach-omap2/clock44xx_data.c | 690 ++++++--- arch/arm/mach-omap2/clockdomain.c | 220 ++-- .../include/plat => mach-omap2}/clockdomain.h | 40 +- ...clockdomains.h => clockdomains2xxx_3xxx_data.c} | 109 +-- ...{clockdomains44xx.h => clockdomains44xx_data.c} | 169 ++- arch/arm/mach-omap2/cm-regbits-24xx.h | 11 +- arch/arm/mach-omap2/cm-regbits-34xx.h | 13 +- arch/arm/mach-omap2/cm-regbits-44xx.h | 3 - arch/arm/mach-omap2/cm.c | 68 - arch/arm/mach-omap2/cm.h | 137 +-- arch/arm/mach-omap2/cm1_44xx.h | 261 ++++ arch/arm/mach-omap2/cm2_44xx.h | 508 ++++++ arch/arm/mach-omap2/cm2xxx_3xxx.c | 471 ++++++ arch/arm/mach-omap2/cm2xxx_3xxx.h | 147 ++ arch/arm/mach-omap2/cm44xx.c | 52 + arch/arm/mach-omap2/cm44xx.h | 668 +-------- arch/arm/mach-omap2/cm4xxx.c | 62 - arch/arm/mach-omap2/cminst44xx.c | 214 +++ arch/arm/mach-omap2/cminst44xx.h | 31 + arch/arm/mach-omap2/control.c | 133 ++- arch/arm/mach-omap2/control.h | 42 +- arch/arm/mach-omap2/cpuidle34xx.c | 40 +- arch/arm/mach-omap2/devices.c | 108 +- arch/arm/mach-omap2/dma.c | 297 ++++ arch/arm/mach-omap2/dpll3xxx.c | 57 +- arch/arm/mach-omap2/dsp.c | 23 +- arch/arm/mach-omap2/gpio.c | 104 ++ arch/arm/mach-omap2/gpmc-nand.c | 2 +- arch/arm/mach-omap2/gpmc-onenand.c | 19 +- arch/arm/mach-omap2/gpmc.c | 12 +- arch/arm/mach-omap2/include/mach/entry-macro.S | 44 +- arch/arm/mach-omap2/io.c | 141 ++- arch/arm/mach-omap2/irq.c | 5 +- arch/arm/mach-omap2/mailbox.c | 19 +- arch/arm/mach-omap2/mux.c | 525 +++++-- arch/arm/mach-omap2/mux.h | 154 ++- arch/arm/mach-omap2/mux2420.c | 10 +- arch/arm/mach-omap2/mux2430.c | 10 +- arch/arm/mach-omap2/mux34xx.c | 9 +- arch/arm/mach-omap2/mux44xx.c | 1625 +++++++++++++++++++ arch/arm/mach-omap2/mux44xx.h | 298 ++++ arch/arm/mach-omap2/omap-iommu.c | 10 +- arch/arm/mach-omap2/omap4-common.c | 30 +- arch/arm/mach-omap2/omap_hwmod.c | 483 ++++--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 465 ++++++- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 519 ++++++- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 870 +++++++++++- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1644 +++++++++++++++++--- arch/arm/mach-omap2/omap_opp_data.h | 72 + arch/arm/mach-omap2/omap_twl.c | 277 ++++ arch/arm/mach-omap2/opp.c | 93 ++ arch/arm/mach-omap2/opp3xxx_data.c | 107 ++ arch/arm/mach-omap2/opp4xxx_data.c | 57 + arch/arm/mach-omap2/pm-debug.c | 21 +- arch/arm/mach-omap2/pm.c | 144 ++- arch/arm/mach-omap2/pm.h | 59 +- arch/arm/mach-omap2/pm24xx.c | 224 ++-- arch/arm/mach-omap2/pm34xx.c | 236 ++-- arch/arm/mach-omap2/pm44xx.c | 18 +- arch/arm/mach-omap2/powerdomain-common.c | 110 ++ arch/arm/mach-omap2/powerdomain.c | 441 ++---- arch/arm/mach-omap2/powerdomain.h | 233 +++ arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 242 +++ arch/arm/mach-omap2/powerdomain44xx.c | 225 +++ arch/arm/mach-omap2/powerdomains.h | 153 -- arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 79 + arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.h | 22 + ...{powerdomains24xx.h => powerdomains2xxx_data.c} | 48 +- ...{powerdomains34xx.h => powerdomains3xxx_data.c} | 56 +- ...{powerdomains44xx.h => powerdomains44xx_data.c} | 92 +- arch/arm/mach-omap2/prcm-common.h | 85 +- arch/arm/mach-omap2/prcm.c | 556 +------ arch/arm/mach-omap2/prcm44xx.h | 42 + arch/arm/mach-omap2/prcm_mpu44xx.c | 45 + arch/arm/mach-omap2/prcm_mpu44xx.h | 104 ++ arch/arm/mach-omap2/prm-regbits-24xx.h | 2 +- arch/arm/mach-omap2/prm-regbits-34xx.h | 11 +- arch/arm/mach-omap2/prm-regbits-44xx.h | 2 - arch/arm/mach-omap2/prm.h | 369 +----- arch/arm/mach-omap2/prm2xxx_3xxx.c | 64 +- arch/arm/mach-omap2/prm2xxx_3xxx.h | 367 +++++ arch/arm/mach-omap2/prm44xx.c | 81 +- arch/arm/mach-omap2/prm44xx.h | 766 +++++----- arch/arm/mach-omap2/prminst44xx.c | 66 + arch/arm/mach-omap2/prminst44xx.h | 25 + arch/arm/mach-omap2/scrm44xx.h | 175 +++ .../{board-rx51-sdram.c => sdram-nokia.c} | 102 +- arch/arm/mach-omap2/sdram-nokia.h | 12 + arch/arm/mach-omap2/sdrc.c | 2 - arch/arm/mach-omap2/sdrc.h | 1 - arch/arm/mach-omap2/sdrc2xxx.c | 6 +- arch/arm/mach-omap2/serial.c | 69 +- arch/arm/mach-omap2/sleep34xx.S | 836 ++++++----- arch/arm/mach-omap2/smartreflex-class3.c | 59 + arch/arm/mach-omap2/smartreflex.c | 1029 ++++++++++++ arch/arm/mach-omap2/sr_device.c | 146 ++ arch/arm/mach-omap2/sram242x.S | 10 +- arch/arm/mach-omap2/sram243x.S | 10 +- arch/arm/mach-omap2/sram34xx.S | 8 +- arch/arm/mach-omap2/timer-gp.c | 3 +- arch/arm/mach-omap2/usb-tusb6010.c | 5 +- arch/arm/mach-omap2/voltage.c | 1571 +++++++++++++++++++ arch/arm/mach-omap2/wd_timer.c | 54 + arch/arm/mach-omap2/wd_timer.h | 17 + arch/arm/plat-omap/Kconfig | 35 + arch/arm/plat-omap/devices.c | 40 - arch/arm/plat-omap/dma.c | 695 ++++----- arch/arm/plat-omap/gpio.c | 670 +++------ arch/arm/plat-omap/i2c.c | 128 +- arch/arm/plat-omap/include/plat/clkdev_omap.h | 20 +- arch/arm/plat-omap/include/plat/clock.h | 16 +- arch/arm/plat-omap/include/plat/common.h | 2 + arch/arm/plat-omap/include/plat/dma.h | 232 ++-- arch/arm/plat-omap/include/plat/fpga.h | 4 - arch/arm/plat-omap/include/plat/gpio.h | 48 +- arch/arm/plat-omap/include/plat/gpmc.h | 9 +- arch/arm/plat-omap/include/plat/i2c.h | 13 + arch/arm/plat-omap/include/plat/io.h | 5 +- arch/arm/plat-omap/include/plat/iommu.h | 5 + arch/arm/plat-omap/include/plat/irqs.h | 2 +- arch/arm/plat-omap/include/plat/keypad.h | 35 +- arch/arm/plat-omap/include/plat/l4_3xxx.h | 24 + arch/arm/plat-omap/include/plat/mailbox.h | 8 +- arch/arm/plat-omap/include/plat/omap-pm.h | 39 +- arch/arm/plat-omap/include/plat/omap-serial.h | 14 +- arch/arm/plat-omap/include/plat/omap_device.h | 1 + arch/arm/plat-omap/include/plat/omap_hwmod.h | 73 +- arch/arm/plat-omap/include/plat/powerdomain.h | 167 -- arch/arm/plat-omap/include/plat/prcm.h | 20 +- arch/arm/plat-omap/include/plat/serial.h | 5 +- arch/arm/plat-omap/include/plat/smartreflex.h | 245 +++ arch/arm/plat-omap/include/plat/sram.h | 11 + arch/arm/plat-omap/include/plat/uncompress.h | 3 + arch/arm/plat-omap/include/plat/voltage.h | 146 ++ arch/arm/plat-omap/io.c | 58 - arch/arm/plat-omap/iommu.c | 24 + arch/arm/plat-omap/iovmm.c | 81 +- arch/arm/plat-omap/mailbox.c | 130 +- arch/arm/plat-omap/mcbsp.c | 26 +- arch/arm/plat-omap/omap-pm-noop.c | 78 +- arch/arm/plat-omap/omap_device.c | 28 + arch/arm/plat-omap/sram.c | 14 +- drivers/i2c/busses/i2c-omap.c | 73 +- drivers/input/keyboard/omap-keypad.c | 41 +- drivers/input/serio/Kconfig | 1 - drivers/mtd/onenand/omap2.c | 3 + drivers/serial/8250.c | 26 +- drivers/serial/omap-serial.c | 40 +- drivers/staging/tidspbridge/core/_tiomap.h | 15 +- include/linux/i2c-omap.h | 5 + include/linux/input/matrix_keypad.h | 2 +- include/linux/serial_reg.h | 19 + 255 files changed, 21054 insertions(+), 8699 deletions(-) delete mode 100644 arch/arm/configs/ams_delta_defconfig delete mode 100644 arch/arm/configs/htcherald_defconfig delete mode 100644 arch/arm/configs/n770_defconfig create mode 100644 arch/arm/configs/omap1_defconfig delete mode 100644 arch/arm/configs/omap_generic_1510_defconfig delete mode 100644 arch/arm/configs/omap_generic_1610_defconfig delete mode 100644 arch/arm/configs/omap_generic_1710_defconfig delete mode 100644 arch/arm/configs/omap_h2_1610_defconfig delete mode 100644 arch/arm/configs/omap_innovator_1510_defconfig delete mode 100644 arch/arm/configs/omap_innovator_1610_defconfig delete mode 100644 arch/arm/configs/omap_osk_5912_defconfig delete mode 100644 arch/arm/configs/omap_perseus2_730_defconfig delete mode 100644 arch/arm/configs/palmte_defconfig delete mode 100644 arch/arm/configs/palmtt_defconfig delete mode 100644 arch/arm/configs/palmz71_defconfig delete mode 100644 arch/arm/configs/sx1_defconfig create mode 100644 arch/arm/mach-omap1/dma.c create mode 100644 arch/arm/mach-omap1/gpio15xx.c create mode 100644 arch/arm/mach-omap1/gpio16xx.c create mode 100644 arch/arm/mach-omap1/gpio7xx.c create mode 100644 arch/arm/mach-omap2/board-am3517crane.c create mode 100644 arch/arm/mach-omap2/board-rm680.c rename arch/arm/mach-omap2/{board-zoom3.c => board-zoom.c} (74%) delete mode 100644 arch/arm/mach-omap2/board-zoom2.c rename arch/arm/{plat-omap/include/plat => mach-omap2}/clockdomain.h (82%) rename arch/arm/mach-omap2/{clockdomains.h => clockdomains2xxx_3xxx_data.c} (87%) rename arch/arm/mach-omap2/{clockdomains44xx.h => clockdomains44xx_data.c} (58%) delete mode 100644 arch/arm/mach-omap2/cm.c create mode 100644 arch/arm/mach-omap2/cm1_44xx.h create mode 100644 arch/arm/mach-omap2/cm2_44xx.h create mode 100644 arch/arm/mach-omap2/cm2xxx_3xxx.c create mode 100644 arch/arm/mach-omap2/cm2xxx_3xxx.h create mode 100644 arch/arm/mach-omap2/cm44xx.c delete mode 100644 arch/arm/mach-omap2/cm4xxx.c create mode 100644 arch/arm/mach-omap2/cminst44xx.c create mode 100644 arch/arm/mach-omap2/cminst44xx.h create mode 100644 arch/arm/mach-omap2/dma.c create mode 100644 arch/arm/mach-omap2/gpio.c create mode 100644 arch/arm/mach-omap2/mux44xx.c create mode 100644 arch/arm/mach-omap2/mux44xx.h create mode 100644 arch/arm/mach-omap2/omap_opp_data.h create mode 100644 arch/arm/mach-omap2/omap_twl.c create mode 100644 arch/arm/mach-omap2/opp.c create mode 100644 arch/arm/mach-omap2/opp3xxx_data.c create mode 100644 arch/arm/mach-omap2/opp4xxx_data.c create mode 100644 arch/arm/mach-omap2/powerdomain-common.c create mode 100644 arch/arm/mach-omap2/powerdomain.h create mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c create mode 100644 arch/arm/mach-omap2/powerdomain44xx.c delete mode 100644 arch/arm/mach-omap2/powerdomains.h create mode 100644 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c create mode 100644 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.h rename arch/arm/mach-omap2/{powerdomains24xx.h => powerdomains2xxx_data.c} (76%) rename arch/arm/mach-omap2/{powerdomains34xx.h => powerdomains3xxx_data.c} (86%) rename arch/arm/mach-omap2/{powerdomains44xx.h => powerdomains44xx_data.c} (79%) create mode 100644 arch/arm/mach-omap2/prcm44xx.h create mode 100644 arch/arm/mach-omap2/prcm_mpu44xx.c create mode 100644 arch/arm/mach-omap2/prcm_mpu44xx.h create mode 100644 arch/arm/mach-omap2/prm2xxx_3xxx.h create mode 100644 arch/arm/mach-omap2/prminst44xx.c create mode 100644 arch/arm/mach-omap2/prminst44xx.h create mode 100644 arch/arm/mach-omap2/scrm44xx.h rename arch/arm/mach-omap2/{board-rx51-sdram.c => sdram-nokia.c} (66%) create mode 100644 arch/arm/mach-omap2/sdram-nokia.h create mode 100644 arch/arm/mach-omap2/smartreflex-class3.c create mode 100644 arch/arm/mach-omap2/smartreflex.c create mode 100644 arch/arm/mach-omap2/sr_device.c create mode 100644 arch/arm/mach-omap2/voltage.c create mode 100644 arch/arm/mach-omap2/wd_timer.c create mode 100644 arch/arm/mach-omap2/wd_timer.h create mode 100644 arch/arm/plat-omap/include/plat/l4_3xxx.h delete mode 100644 arch/arm/plat-omap/include/plat/powerdomain.h create mode 100644 arch/arm/plat-omap/include/plat/smartreflex.h create mode 100644 arch/arm/plat-omap/include/plat/voltage.h Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Auto-merging arch/arm/mach-s3c2410/mach-h1940.c Merge made by recursive. Merging s5p/for-next $ git merge s5p/for-next Auto-merging arch/arm/mach-s5pv310/cpu.c Removing arch/arm/mach-s5pv310/include/mach/regs-srom.h Merge made by recursive. arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- arch/arm/mach-s3c64xx/clock.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 73 +++--- arch/arm/mach-s3c64xx/irq-eint.c | 37 ++-- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s5p6442/dev-audio.c | 44 +++- arch/arm/mach-s5p6442/include/mach/map.h | 3 + arch/arm/mach-s5p6442/mach-smdk6442.c | 11 + arch/arm/mach-s5p6442/setup-i2c0.c | 5 +- arch/arm/mach-s5p64x0/Makefile | 4 +- arch/arm/mach-s5p64x0/clock-s5p6440.c | 8 +- arch/arm/mach-s5p64x0/clock-s5p6450.c | 20 ++- arch/arm/mach-s5p64x0/dev-audio.c | 144 +++++++-- arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} | 221 ++++++++++++-- arch/arm/mach-s5p64x0/include/mach/map.h | 5 + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 57 +--- arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 + arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 + arch/arm/mach-s5pc100/dev-audio.c | 54 +++- arch/arm/mach-s5pc100/include/mach/map.h | 2 + arch/arm/mach-s5pv210/Kconfig | 2 + arch/arm/mach-s5pv210/clock.c | 16 +- arch/arm/mach-s5pv210/cpu.c | 5 - arch/arm/mach-s5pv210/dev-audio.c | 56 +++- arch/arm/mach-s5pv210/include/mach/irqs.h | 3 +- arch/arm/mach-s5pv210/include/mach/map.h | 6 + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 5 +- arch/arm/mach-s5pv210/mach-smdkc110.c | 2 + arch/arm/mach-s5pv210/mach-smdkv210.c | 140 +++++++++- arch/arm/mach-s5pv310/Kconfig | 16 + arch/arm/mach-s5pv310/Makefile | 5 +- arch/arm/mach-s5pv310/clock.c | 30 ++ arch/arm/mach-s5pv310/cpu.c | 7 +- arch/arm/mach-s5pv310/dev-audio.c | 364 +++++++++++++++++++++++ arch/arm/mach-s5pv310/dev-pd.c | 139 +++++++++ arch/arm/mach-s5pv310/dma.c | 168 +++++++++++ arch/arm/mach-s5pv310/include/mach/dma.h | 26 ++ arch/arm/mach-s5pv310/include/mach/irqs.h | 6 + arch/arm/mach-s5pv310/include/mach/map.h | 29 ++ arch/arm/mach-s5pv310/include/mach/regs-pmu.h | 30 ++ arch/arm/mach-s5pv310/include/mach/regs-srom.h | 50 --- arch/arm/mach-s5pv310/irq-eint.c | 2 +- arch/arm/mach-s5pv310/mach-smdkc210.c | 56 +++-- arch/arm/mach-s5pv310/mach-smdkv310.c | 56 +++-- arch/arm/mach-s5pv310/mach-universal_c210.c | 80 +++++ arch/arm/plat-s3c24xx/devs.c | 17 +- arch/arm/plat-s3c24xx/irq.c | 2 +- arch/arm/plat-s5p/Kconfig | 10 + arch/arm/plat-s5p/Makefile | 2 + arch/arm/plat-s5p/cpu.c | 5 + arch/arm/plat-s5p/dev-csis0.c | 34 +++ arch/arm/plat-s5p/dev-csis1.c | 34 +++ arch/arm/plat-s5p/include/plat/csis.h | 28 ++ arch/arm/plat-s5p/include/plat/map-s5p.h | 1 + arch/arm/plat-s5p/include/plat/regs-srom.h | 54 ++++ arch/arm/plat-s5p/irq-eint.c | 4 +- arch/arm/plat-samsung/Kconfig | 8 + arch/arm/plat-samsung/Makefile | 5 + arch/arm/plat-samsung/dev-asocdma.c | 24 ++ arch/arm/plat-samsung/gpiolib.c | 7 + arch/arm/plat-samsung/include/plat/audio.h | 24 ++ arch/arm/plat-samsung/include/plat/devs.h | 17 +- arch/arm/plat-samsung/include/plat/gpio-core.h | 2 + arch/arm/plat-samsung/include/plat/pd.h | 30 ++ arch/arm/plat-samsung/include/plat/pm.h | 4 +- arch/arm/plat-samsung/irq-uart.c | 36 ++-- arch/arm/plat-samsung/irq-vic-timer.c | 22 +- arch/arm/plat-samsung/pd.c | 95 ++++++ arch/arm/plat-samsung/pm.c | 6 +- sound/soc/s3c24xx/goni_wm8994.c | 4 +- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 4 +- sound/soc/s3c24xx/neo1973_wm8753.c | 4 +- sound/soc/s3c24xx/rx1950_uda1380.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 4 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- sound/soc/s3c24xx/smartq_wm8987.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 +- sound/soc/s3c24xx/smdk_spdif.c | 2 +- sound/soc/s3c24xx/smdk_wm9713.c | 2 +- 85 files changed, 2132 insertions(+), 378 deletions(-) rename arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} (58%) create mode 100644 arch/arm/mach-s5pv310/dev-audio.c create mode 100644 arch/arm/mach-s5pv310/dev-pd.c create mode 100644 arch/arm/mach-s5pv310/dma.c create mode 100644 arch/arm/mach-s5pv310/include/mach/dma.h create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-pmu.h delete mode 100644 arch/arm/mach-s5pv310/include/mach/regs-srom.h create mode 100644 arch/arm/plat-s5p/dev-csis0.c create mode 100644 arch/arm/plat-s5p/dev-csis1.c create mode 100644 arch/arm/plat-s5p/include/plat/csis.h create mode 100644 arch/arm/plat-s5p/include/plat/regs-srom.h create mode 100644 arch/arm/plat-samsung/dev-asocdma.c create mode 100644 arch/arm/plat-samsung/include/plat/pd.h create mode 100644 arch/arm/plat-samsung/pd.c Merging tegra/for-next $ git merge tegra/for-next Resolved 'arch/arm/mach-tegra/timer.c' using previous resolution. Auto-merging arch/arm/mach-tegra/timer.c CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b1bf4c0] Merge remote branch 'tegra/for-next' $ git diff -M --stat --summary HEAD^.. Merging ux500-core/ux500-core $ git merge ux500-core/ux500-core Auto-merging arch/arm/Kconfig Auto-merging arch/arm/mach-ux500/clock.c Auto-merging arch/arm/mach-ux500/cpu.c Removing arch/arm/mach-ux500/devices-db5500.c Auto-merging arch/arm/mach-ux500/platsmp.c Removing drivers/gpio/tc35892-gpio.c Auto-merging drivers/input/keyboard/Kconfig Auto-merging drivers/input/keyboard/Makefile Removing drivers/mfd/tc35892.c Auto-merging drivers/net/caif/caif_shm_u5500.c Removing include/linux/mfd/tc35892.h Merge made by recursive. arch/arm/Kconfig | 1 + arch/arm/mach-ux500/Makefile | 14 +- arch/arm/mach-ux500/board-mop500-keypads.c | 229 ++++++++++ arch/arm/mach-ux500/board-mop500-sdi.c | 79 +++- arch/arm/mach-ux500/board-mop500.c | 228 +++------- arch/arm/mach-ux500/board-mop500.h | 9 + arch/arm/mach-ux500/board-u5500-sdi.c | 49 ++ arch/arm/mach-ux500/board-u5500.c | 19 +- arch/arm/mach-ux500/clock.c | 365 +++++++++++----- arch/arm/mach-ux500/clock.h | 4 + arch/arm/mach-ux500/cpu-db5500.c | 38 ++- arch/arm/mach-ux500/cpu-db8500.c | 58 ++- arch/arm/mach-ux500/cpu.c | 13 +- arch/arm/mach-ux500/cpufreq.c | 211 +++++++++ arch/arm/mach-ux500/devices-common.c | 145 ++++++ arch/arm/mach-ux500/devices-common.h | 82 ++++ arch/arm/mach-ux500/devices-db5500.c | 46 -- arch/arm/mach-ux500/devices-db5500.h | 66 +++ arch/arm/mach-ux500/devices-db8500.c | 169 +------- arch/arm/mach-ux500/devices-db8500.h | 98 ++++ arch/arm/mach-ux500/devices.c | 63 --- arch/arm/mach-ux500/dma-db5500.c | 120 +++++ arch/arm/mach-ux500/include/mach/db5500-regs.h | 4 + arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 +- arch/arm/mach-ux500/include/mach/devices.h | 17 - arch/arm/mach-ux500/include/mach/gpio.h | 38 -- arch/arm/mach-ux500/include/mach/hardware.h | 2 + .../mach-ux500/include/mach/irqs-board-mop500.h | 28 ++- arch/arm/mach-ux500/include/mach/irqs.h | 44 -- .../include/mach/{mbox.h => mbox-db5500.h} | 0 arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 ++ arch/arm/mach-ux500/include/mach/prcmu-regs.h | 15 +- arch/arm/mach-ux500/include/mach/prcmu.h | 15 +- arch/arm/mach-ux500/include/mach/setup.h | 7 +- arch/arm/mach-ux500/include/mach/uncompress.h | 23 +- arch/arm/mach-ux500/{mbox.c => mbox-db5500.c} | 2 +- .../mach-ux500/{modem_irq.c => modem-irq-db5500.c} | 0 arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/mach-ux500/prcmu.c | 179 +++++++- arch/arm/plat-nomadik/gpio.c | 52 ++- arch/arm/plat-nomadik/include/plat/pincfg.h | 70 +++- drivers/gpio/Kconfig | 8 +- drivers/gpio/Makefile | 2 +- drivers/gpio/tc35892-gpio.c | 389 ---------------- drivers/gpio/tc3589x-gpio.c | 389 ++++++++++++++++ drivers/input/keyboard/Kconfig | 10 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/tc3589x-keypad.c | 473 ++++++++++++++++++++ drivers/mfd/Kconfig | 6 +- drivers/mfd/Makefile | 2 +- drivers/mfd/tc35892.c | 345 -------------- drivers/mfd/tc3589x.c | 422 +++++++++++++++++ drivers/net/caif/caif_shm_u5500.c | 2 +- include/linux/mfd/tc35892.h | 136 ------ include/linux/mfd/tc3589x.h | 195 ++++++++ 55 files changed, 3388 insertions(+), 1629 deletions(-) create mode 100644 arch/arm/mach-ux500/board-mop500-keypads.c create mode 100644 arch/arm/mach-ux500/board-u5500-sdi.c create mode 100644 arch/arm/mach-ux500/cpufreq.c create mode 100644 arch/arm/mach-ux500/devices-common.c create mode 100644 arch/arm/mach-ux500/devices-common.h delete mode 100644 arch/arm/mach-ux500/devices-db5500.c create mode 100644 arch/arm/mach-ux500/devices-db5500.h create mode 100644 arch/arm/mach-ux500/devices-db8500.h create mode 100644 arch/arm/mach-ux500/dma-db5500.c rename arch/arm/mach-ux500/include/mach/{mbox.h => mbox-db5500.h} (100%) create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h rename arch/arm/mach-ux500/{mbox.c => mbox-db5500.c} (99%) rename arch/arm/mach-ux500/{modem_irq.c => modem-irq-db5500.c} (100%) delete mode 100644 drivers/gpio/tc35892-gpio.c create mode 100644 drivers/gpio/tc3589x-gpio.c create mode 100644 drivers/input/keyboard/tc3589x-keypad.c delete mode 100644 drivers/mfd/tc35892.c create mode 100644 drivers/mfd/tc3589x.c delete mode 100644 include/linux/mfd/tc35892.h create mode 100644 include/linux/mfd/tc3589x.h Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Removing arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h Removing arch/blackfin/mach-bf518/include/mach/defBF51x_base.h Removing arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h Removing arch/blackfin/mach-bf527/include/mach/defBF52x_base.h Removing arch/blackfin/mach-bf533/include/mach/fio_flag.h Merge made by recursive. arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 113 ++ arch/blackfin/include/asm/bfin_dma.h | 91 + arch/blackfin/include/asm/bfin_serial.h | 263 +++ arch/blackfin/include/asm/dma.h | 37 +- arch/blackfin/include/asm/io.h | 268 +--- arch/blackfin/include/mach-common/ports-a.h | 25 + arch/blackfin/include/mach-common/ports-b.h | 25 + arch/blackfin/include/mach-common/ports-c.h | 25 + arch/blackfin/include/mach-common/ports-d.h | 25 + arch/blackfin/include/mach-common/ports-e.h | 25 + arch/blackfin/include/mach-common/ports-f.h | 25 + arch/blackfin/include/mach-common/ports-g.h | 25 + arch/blackfin/include/mach-common/ports-h.h | 25 + arch/blackfin/include/mach-common/ports-i.h | 25 + arch/blackfin/include/mach-common/ports-j.h | 25 + arch/blackfin/mach-bf518/dma.c | 2 +- .../blackfin/mach-bf518/include/mach/bfin_serial.h | 14 + .../mach-bf518/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf518/include/mach/blackfin.h | 68 +- arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 1038 ++++++++++- arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 5 +- arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 5 +- arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 5 +- .../mach-bf518/include/mach/cdefBF51x_base.h | 1061 ---------- arch/blackfin/mach-bf518/include/mach/defBF512.h | 1388 +++++++++++++- .../mach-bf518/include/mach/defBF51x_base.h | 1495 -------------- arch/blackfin/mach-bf518/include/mach/gpio.h | 4 + arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 + arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 + arch/blackfin/mach-bf527/boards/ezbrd.c | 1 + arch/blackfin/mach-bf527/boards/ezkit.c | 1 + arch/blackfin/mach-bf527/dma.c | 2 +- .../blackfin/mach-bf527/include/mach/bfin_serial.h | 14 + .../mach-bf527/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf527/include/mach/blackfin.h | 48 +- arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 1092 ++++++++++- arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 7 +- arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 7 +- .../mach-bf527/include/mach/cdefBF52x_base.h | 1113 ----------- arch/blackfin/mach-bf527/include/mach/defBF522.h | 1393 +++++++++++++- arch/blackfin/mach-bf527/include/mach/defBF525.h | 2 +- arch/blackfin/mach-bf527/include/mach/defBF527.h | 2 +- .../mach-bf527/include/mach/defBF52x_base.h | 1506 -------------- arch/blackfin/mach-bf527/include/mach/gpio.h | 4 + arch/blackfin/mach-bf533/boards/blackstamp.c | 15 +- arch/blackfin/mach-bf533/boards/ip0x.c | 9 - arch/blackfin/mach-bf533/boards/stamp.c | 20 +- arch/blackfin/mach-bf533/dma.c | 2 +- .../blackfin/mach-bf533/include/mach/bfin_serial.h | 14 + .../mach-bf533/include/mach/bfin_serial_5xx.h | 74 +- arch/blackfin/mach-bf533/include/mach/blackfin.h | 30 +- arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 63 +- arch/blackfin/mach-bf533/include/mach/defBF532.h | 128 +-- arch/blackfin/mach-bf533/include/mach/fio_flag.h | 55 - arch/blackfin/mach-bf533/include/mach/gpio.h | 2 + arch/blackfin/mach-bf537/dma.c | 2 +- .../blackfin/mach-bf537/include/mach/bfin_serial.h | 14 + .../mach-bf537/include/mach/bfin_serial_5xx.h | 72 +- arch/blackfin/mach-bf537/include/mach/blackfin.h | 38 +- arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 27 +- arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 5 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 111 +- arch/blackfin/mach-bf537/include/mach/defBF537.h | 5 +- arch/blackfin/mach-bf537/include/mach/gpio.h | 4 + arch/blackfin/mach-bf538/dma.c | 18 +- .../blackfin/mach-bf538/include/mach/bfin_serial.h | 14 + .../mach-bf538/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf538/include/mach/blackfin.h | 37 +- arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 504 ++--- arch/blackfin/mach-bf538/include/mach/cdefBF539.h | 8 +- arch/blackfin/mach-bf538/include/mach/defBF538.h | 1825 +++++++++++++++++ arch/blackfin/mach-bf538/include/mach/defBF539.h | 2095 +------------------- arch/blackfin/mach-bf538/include/mach/gpio.h | 5 + arch/blackfin/mach-bf548/boards/cm_bf548.c | 1 + arch/blackfin/mach-bf548/boards/ezkit.c | 1 + arch/blackfin/mach-bf548/dma.c | 2 +- .../blackfin/mach-bf548/include/mach/bfin_serial.h | 16 + .../mach-bf548/include/mach/bfin_serial_5xx.h | 60 +- arch/blackfin/mach-bf548/include/mach/blackfin.h | 70 +- arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 10 +- .../mach-bf548/include/mach/cdefBF54x_base.h | 23 +- arch/blackfin/mach-bf548/include/mach/defBF542.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF544.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF547.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF548.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF549.h | 7 +- .../mach-bf548/include/mach/defBF54x_base.h | 321 +--- arch/blackfin/mach-bf548/include/mach/gpio.h | 11 + arch/blackfin/mach-bf561/dma.c | 18 +- .../blackfin/mach-bf561/include/mach/bfin_serial.h | 14 + .../mach-bf561/include/mach/bfin_serial_5xx.h | 74 +- arch/blackfin/mach-bf561/include/mach/blackfin.h | 26 +- arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 503 ++--- arch/blackfin/mach-bf561/include/mach/defBF561.h | 408 ++--- arch/blackfin/mach-bf561/include/mach/gpio.h | 2 + arch/blackfin/mach-bf561/smp.c | 4 +- drivers/net/irda/bfin_sir.h | 2 + include/asm-generic/io.h | 30 + 102 files changed, 8445 insertions(+), 9942 deletions(-) create mode 100644 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig create mode 100644 arch/blackfin/include/asm/bfin_dma.h create mode 100644 arch/blackfin/include/asm/bfin_serial.h create mode 100644 arch/blackfin/include/mach-common/ports-a.h create mode 100644 arch/blackfin/include/mach-common/ports-b.h create mode 100644 arch/blackfin/include/mach-common/ports-c.h create mode 100644 arch/blackfin/include/mach-common/ports-d.h create mode 100644 arch/blackfin/include/mach-common/ports-e.h create mode 100644 arch/blackfin/include/mach-common/ports-f.h create mode 100644 arch/blackfin/include/mach-common/ports-g.h create mode 100644 arch/blackfin/include/mach-common/ports-h.h create mode 100644 arch/blackfin/include/mach-common/ports-i.h create mode 100644 arch/blackfin/include/mach-common/ports-j.h create mode 100644 arch/blackfin/mach-bf518/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF51x_base.h create mode 100644 arch/blackfin/mach-bf527/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF52x_base.h create mode 100644 arch/blackfin/mach-bf533/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf533/include/mach/fio_flag.h create mode 100644 arch/blackfin/mach-bf537/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf538/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf538/include/mach/defBF538.h create mode 100644 arch/blackfin/mach-bf548/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf561/include/mach/bfin_serial.h Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Merge made by recursive. Documentation/ABI/testing/pstore | 35 +++++ drivers/acpi/apei/Kconfig | 1 + drivers/acpi/apei/erst.c | 133 +++++++++++++++++++ fs/Kconfig | 1 + fs/Makefile | 1 + fs/pstore/Kconfig | 13 ++ fs/pstore/Makefile | 7 + fs/pstore/inode.c | 260 ++++++++++++++++++++++++++++++++++++++ fs/pstore/internal.h | 5 + fs/pstore/platform.c | 164 ++++++++++++++++++++++++ include/linux/magic.h | 1 + include/linux/pstore.h | 60 +++++++++ 12 files changed, 681 insertions(+), 0 deletions(-) create mode 100644 Documentation/ABI/testing/pstore create mode 100644 fs/pstore/Kconfig create mode 100644 fs/pstore/Makefile create mode 100644 fs/pstore/inode.c create mode 100644 fs/pstore/internal.h create mode 100644 fs/pstore/platform.c create mode 100644 include/linux/pstore.h Merging m68k/for-next $ git merge m68k/for-next Merge made by recursive. arch/m68k/include/asm/sun3_pgtable.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/mcfcache.h Removing arch/m68knommu/mm/fault.c Removing arch/m68knommu/mm/memory.c Merge made by recursive. arch/m68k/include/asm/cacheflush_no.h | 95 ++++++-------- arch/m68k/include/asm/coldfire.h | 2 +- arch/m68k/include/asm/entry_no.h | 59 +++++---- arch/m68k/include/asm/gpio.h | 2 +- arch/m68k/include/asm/io_no.h | 1 - arch/m68k/include/asm/m5206sim.h | 14 ++- arch/m68k/include/asm/m520xsim.h | 17 +++- arch/m68k/include/asm/m523xsim.h | 11 ++ arch/m68k/include/asm/m5249sim.h | 10 ++ arch/m68k/include/asm/m5272sim.h | 8 + arch/m68k/include/asm/m527xsim.h | 10 ++ arch/m68k/include/asm/m528xsim.h | 11 ++ arch/m68k/include/asm/m52xxacr.h | 94 ++++++++++++++ arch/m68k/include/asm/m5307sim.h | 43 +++---- arch/m68k/include/asm/m532xsim.h | 33 ++---- arch/m68k/include/asm/m53xxacr.h | 101 +++++++++++++++ arch/m68k/include/asm/m5407sim.h | 42 +----- arch/m68k/include/asm/m54xxacr.h | 97 ++++++++++++++ arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 23 +++- arch/m68k/include/asm/mcfcache.h | 150 ---------------------- arch/m68k/include/asm/mcfsim.h | 4 +- arch/m68k/include/asm/mcfuart.h | 45 +------- arch/m68k/include/asm/processor.h | 13 +- arch/m68knommu/Kconfig | 99 +++++++++++++-- arch/m68knommu/Makefile | 14 +- arch/m68knommu/kernel/setup.c | 72 +++-------- arch/m68knommu/mm/Makefile | 2 +- arch/m68knommu/mm/fault.c | 57 -------- arch/m68knommu/mm/kmap.c | 9 -- arch/m68knommu/mm/memory.c | 33 ----- arch/m68knommu/platform/{548x => 54xx}/Makefile | 0 arch/m68knommu/platform/{548x => 54xx}/config.c | 32 +++--- arch/m68knommu/platform/coldfire/Makefile | 4 +- arch/m68knommu/platform/coldfire/cache.c | 48 +++++++ arch/m68knommu/platform/coldfire/entry.S | 56 ++------- arch/m68knommu/platform/coldfire/head.S | 26 +++- 37 files changed, 726 insertions(+), 621 deletions(-) create mode 100644 arch/m68k/include/asm/m52xxacr.h create mode 100644 arch/m68k/include/asm/m53xxacr.h create mode 100644 arch/m68k/include/asm/m54xxacr.h rename arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} (95%) rename arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} (73%) delete mode 100644 arch/m68k/include/asm/mcfcache.h delete mode 100644 arch/m68knommu/mm/fault.c delete mode 100644 arch/m68knommu/mm/memory.c rename arch/m68knommu/platform/{548x => 54xx}/Makefile (100%) rename arch/m68knommu/platform/{548x => 54xx}/config.c (74%) create mode 100644 arch/m68knommu/platform/coldfire/cache.c Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/kernel/vmlinux.lds.S | 16 +++------------- arch/microblaze/lib/memmove.c | 2 +- 2 files changed, 4 insertions(+), 14 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 Already up-to-date. Merging powerpc/next $ git merge powerpc/next Auto-merging Documentation/kernel-parameters.txt Merge made by recursive. Documentation/kernel-parameters.txt | 8 + Documentation/powerpc/booting-without-of.txt | 4 +- Documentation/powerpc/dts-bindings/4xx/cpm.txt | 52 +++ arch/powerpc/Kconfig | 16 +- arch/powerpc/boot/dts/canyonlands.dts | 31 +- arch/powerpc/boot/dts/kilauea.dts | 9 + arch/powerpc/configs/40x/kilauea_defconfig | 5 + arch/powerpc/configs/44x/canyonlands_defconfig | 3 + arch/powerpc/include/asm/bitops.h | 9 + arch/powerpc/include/asm/cputable.h | 9 +- arch/powerpc/include/asm/cputhreads.h | 15 +- arch/powerpc/include/asm/device.h | 6 + arch/powerpc/include/asm/firmware.h | 3 +- arch/powerpc/include/asm/hvcall.h | 4 +- arch/powerpc/include/asm/lppaca.h | 5 +- arch/powerpc/include/asm/machdep.h | 6 +- arch/powerpc/include/asm/mmzone.h | 5 + arch/powerpc/include/asm/nvram.h | 52 +-- arch/powerpc/include/asm/ppc-opcode.h | 8 + arch/powerpc/include/asm/processor.h | 2 - arch/powerpc/include/asm/prom.h | 2 +- arch/powerpc/include/asm/topology.h | 10 + arch/powerpc/include/asm/vdso_datapage.h | 2 - arch/powerpc/kernel/Makefile | 9 +- arch/powerpc/kernel/asm-offsets.c | 1 - arch/powerpc/kernel/cputable.c | 22 +- arch/powerpc/kernel/crash_dump.c | 33 ++ arch/powerpc/kernel/dma-iommu.c | 2 +- arch/powerpc/kernel/entry_32.S | 1 + arch/powerpc/kernel/exceptions-64s.S | 1 + arch/powerpc/kernel/fpu.S | 1 + arch/powerpc/kernel/head_40x.S | 1 + arch/powerpc/kernel/head_44x.S | 1 + arch/powerpc/kernel/head_64.S | 7 +- arch/powerpc/kernel/head_8xx.S | 1 + arch/powerpc/kernel/head_fsl_booke.S | 1 + arch/powerpc/kernel/iommu.c | 14 +- arch/powerpc/kernel/misc.S | 5 - arch/powerpc/kernel/misc_32.S | 1 + arch/powerpc/kernel/misc_64.S | 1 + arch/powerpc/kernel/nvram_64.c | 481 ++++++++--------------- arch/powerpc/kernel/pci_64.c | 3 +- arch/powerpc/kernel/ppc_ksyms.c | 7 + arch/powerpc/kernel/ppc_save_regs.S | 1 + arch/powerpc/kernel/ptrace.c | 22 +- arch/powerpc/kernel/ptrace32.c | 7 + arch/powerpc/kernel/rtas.c | 3 + arch/powerpc/kernel/setup_64.c | 4 +- arch/powerpc/kernel/smp.c | 19 +- arch/powerpc/kernel/time.c | 2 +- arch/powerpc/kernel/vector.S | 1 + arch/powerpc/kernel/vio.c | 15 +- arch/powerpc/lib/Makefile | 2 +- arch/powerpc/lib/hweight_64.S | 110 +++++ arch/powerpc/mm/hash_utils_64.c | 2 +- arch/powerpc/mm/mmu_context_nohash.c | 12 +- arch/powerpc/mm/numa.c | 303 ++++++++++++++- arch/powerpc/mm/pgtable_32.c | 3 +- arch/powerpc/mm/pgtable_64.c | 2 + arch/powerpc/platforms/44x/Makefile | 5 +- arch/powerpc/platforms/cell/beat_iommu.c | 3 +- arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 3 +- arch/powerpc/platforms/chrp/time.c | 4 + arch/powerpc/platforms/iseries/mf.c | 62 --- arch/powerpc/platforms/pasemi/iommu.c | 19 +- arch/powerpc/platforms/powermac/setup.c | 9 + arch/powerpc/platforms/pseries/Kconfig | 10 + arch/powerpc/platforms/pseries/Makefile | 1 + arch/powerpc/platforms/pseries/firmware.c | 1 + arch/powerpc/platforms/pseries/hvCall.S | 1 + arch/powerpc/platforms/pseries/iommu.c | 49 +-- arch/powerpc/platforms/pseries/lpar.c | 12 + arch/powerpc/platforms/pseries/nvram.c | 205 ++++++++++ arch/powerpc/platforms/pseries/pseries_energy.c | 326 +++++++++++++++ arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/dart_iommu.c | 9 +- arch/powerpc/sysdev/ppc4xx_cpm.c | 346 ++++++++++++++++ arch/powerpc/sysdev/tsi108_dev.c | 8 +- drivers/char/hvc_vio.c | 2 +- drivers/macintosh/macio_asic.c | 7 +- drivers/macintosh/therm_pm72.c | 30 +-- drivers/of/address.c | 54 ++-- drivers/ps3/Makefile | 2 +- drivers/rtc/rtc-cmos.c | 3 +- include/linux/of_address.h | 6 +- 85 files changed, 1884 insertions(+), 661 deletions(-) create mode 100644 Documentation/powerpc/dts-bindings/4xx/cpm.txt create mode 100644 arch/powerpc/lib/hweight_64.S create mode 100644 arch/powerpc/platforms/pseries/pseries_energy.c create mode 100644 arch/powerpc/sysdev/ppc4xx_cpm.c Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Auto-merging arch/powerpc/platforms/Kconfig Auto-merging arch/powerpc/sysdev/mpc8xxx_gpio.c Merge made by recursive. arch/powerpc/platforms/Kconfig | 7 ++- arch/powerpc/sysdev/mpc8xxx_gpio.c | 75 ++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 11 deletions(-) Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/Kconfig | 129 ++++--- arch/s390/Kconfig.debug | 6 +- arch/s390/defconfig | 152 +++----- arch/s390/hypfs/Makefile | 2 +- arch/s390/hypfs/hypfs.h | 33 ++- arch/s390/hypfs/hypfs_dbfs.c | 116 ++++++ arch/s390/hypfs/hypfs_diag.c | 82 +--- arch/s390/hypfs/hypfs_vm.c | 62 +-- arch/s390/hypfs/inode.c | 18 +- arch/s390/include/asm/ccwdev.h | 2 + arch/s390/include/asm/cputime.h | 2 +- arch/s390/include/asm/dasd.h | 3 + arch/s390/include/asm/ftrace.h | 11 +- arch/s390/include/asm/hardirq.h | 16 - arch/s390/include/asm/irq.h | 34 +- arch/s390/include/asm/kprobes.h | 20 +- arch/s390/include/asm/processor.h | 3 +- arch/s390/include/asm/ptrace.h | 50 +++- arch/s390/include/asm/qdio.h | 1 + arch/s390/include/asm/s390_ext.h | 29 +- arch/s390/include/asm/smp.h | 3 +- arch/s390/include/asm/system.h | 4 +- arch/s390/include/asm/thread_info.h | 10 +- arch/s390/include/asm/timex.h | 20 + arch/s390/kernel/asm-offsets.c | 14 +- arch/s390/kernel/compat_ptrace.h | 53 +-- arch/s390/kernel/entry.S | 270 +++++++------- arch/s390/kernel/entry.h | 2 +- arch/s390/kernel/entry64.S | 69 ++-- arch/s390/kernel/ftrace.c | 236 ++++++------ arch/s390/kernel/irq.c | 41 ++- arch/s390/kernel/kprobes.c | 470 +++++++++++------------ arch/s390/kernel/mcount.S | 30 +-- arch/s390/kernel/mcount64.S | 27 +- arch/s390/kernel/nmi.c | 3 +- arch/s390/kernel/process.c | 12 +- arch/s390/kernel/ptrace.c | 304 +++++++++------ arch/s390/kernel/s390_ext.c | 125 +++---- arch/s390/kernel/signal.c | 2 +- arch/s390/kernel/smp.c | 43 ++- arch/s390/kernel/time.c | 3 + arch/s390/kernel/traps.c | 9 +- arch/s390/kernel/vtime.c | 1 + arch/s390/kvm/Kconfig | 7 +- arch/s390/lib/delay.c | 2 - arch/s390/mm/fault.c | 35 +- drivers/s390/block/Kconfig | 24 +- drivers/s390/block/dasd.c | 314 +++++++++++----- drivers/s390/block/dasd_3990_erp.c | 16 +- drivers/s390/block/dasd_devmap.c | 155 ++++++++- drivers/s390/block/dasd_diag.c | 3 + drivers/s390/block/dasd_eckd.c | 664 ++++++++++++++++++++++++++----- drivers/s390/block/dasd_eckd.h | 17 +- drivers/s390/block/dasd_eer.c | 1 + drivers/s390/block/dasd_erp.c | 3 +- drivers/s390/block/dasd_fba.c | 21 +- drivers/s390/block/dasd_int.h | 35 ++- drivers/s390/char/Kconfig | 69 ++-- drivers/s390/char/con3215.c | 2 + drivers/s390/char/raw3270.c | 2 + drivers/s390/char/sclp.c | 18 +- drivers/s390/char/tape_core.c | 2 + drivers/s390/char/vmur.c | 2 + drivers/s390/cio/ccwgroup.c | 78 ++-- drivers/s390/cio/chsc.c | 19 + drivers/s390/cio/chsc.h | 18 + drivers/s390/cio/css.c | 8 + drivers/s390/cio/device_ops.c | 40 ++ drivers/s390/cio/itcw.c | 62 +++- drivers/s390/cio/qdio.h | 7 +- drivers/s390/cio/qdio_debug.c | 1 + drivers/s390/cio/qdio_main.c | 17 +- drivers/s390/cio/qdio_setup.c | 1 + drivers/s390/cio/qdio_thinint.c | 56 +--- drivers/s390/crypto/ap_bus.c | 65 +++ drivers/s390/crypto/ap_bus.h | 2 + drivers/s390/crypto/zcrypt_api.c | 12 +- drivers/s390/crypto/zcrypt_api.h | 1 + drivers/s390/crypto/zcrypt_cex2a.c | 82 ++++- drivers/s390/crypto/zcrypt_cex2a.h | 25 ++ drivers/s390/crypto/zcrypt_pcica.c | 1 + drivers/s390/crypto/zcrypt_pcicc.c | 1 + drivers/s390/crypto/zcrypt_pcixcc.c | 17 +- drivers/s390/kvm/kvm_virtio.c | 3 + drivers/s390/net/Kconfig | 51 ++- drivers/s390/net/claw.c | 2 + drivers/s390/net/ctcm_main.c | 2 + drivers/s390/net/lcs.c | 2 + drivers/s390/net/qeth_core_main.c | 4 +- drivers/s390/scsi/zfcp_qdio.c | 2 + net/iucv/iucv.c | 2 + tools/perf/arch/s390/Makefile | 4 + tools/perf/arch/s390/util/dwarf-regs.c | 22 + 93 files changed, 2864 insertions(+), 1657 deletions(-) create mode 100644 arch/s390/hypfs/hypfs_dbfs.c create mode 100644 tools/perf/arch/s390/Makefile create mode 100644 tools/perf/arch/s390/util/dwarf-regs.c Merging sh/sh-latest $ git merge sh/sh-latest Resolved 'arch/sh/kernel/cpu/sh2a/clock-sh7201.c' using previous resolution. Auto-merging arch/sh/Kconfig Auto-merging arch/sh/kernel/Makefile Auto-merging arch/sh/kernel/cpu/sh2a/clock-sh7201.c CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/clock-sh7201.c Removing arch/sh/kernel/io_generic.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 62edb4a] Merge remote branch 'sh/sh-latest' $ git diff -M --stat --summary HEAD^.. arch/sh/Kconfig | 20 +- arch/sh/boards/board-secureedge5410.c | 2 - arch/sh/boards/mach-rsk/devices-rsk7203.c | 37 +++- arch/sh/boards/mach-sdk7786/Makefile | 2 +- arch/sh/boards/mach-sdk7786/nmi.c | 83 +++++++ arch/sh/boards/mach-sdk7786/setup.c | 1 + arch/sh/boards/mach-se/7206/setup.c | 6 + arch/sh/boards/mach-se/board-se7619.c | 6 + arch/sh/drivers/pci/pci.c | 3 +- arch/sh/include/asm/io.h | 345 +++++++++++++++-------------- arch/sh/include/asm/io_generic.h | 25 -- arch/sh/include/asm/machvec.h | 21 -- arch/sh/include/asm/unaligned-sh4a.h | 164 +++++---------- arch/sh/include/mach-sdk7786/mach/fpga.h | 8 + arch/sh/kernel/Makefile | 6 +- arch/sh/kernel/cpu/Makefile | 2 +- arch/sh/kernel/cpu/proc.c | 148 ++++++++++++ arch/sh/kernel/cpu/sh2/clock-sh7619.c | 22 +- arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 20 +- arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 21 +- arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 20 +- arch/sh/kernel/io_generic.c | 180 --------------- arch/sh/kernel/iomap.c | 165 ++++++++++++++ arch/sh/kernel/ioport.c | 43 ++++ arch/sh/kernel/machvec.c | 22 -- arch/sh/kernel/setup.c | 144 ------------ drivers/dma/shdma.c | 132 ++++++++++-- drivers/dma/shdma.h | 1 + 28 files changed, 901 insertions(+), 748 deletions(-) create mode 100644 arch/sh/boards/mach-sdk7786/nmi.c create mode 100644 arch/sh/kernel/cpu/proc.c delete mode 100644 arch/sh/kernel/io_generic.c create mode 100644 arch/sh/kernel/iomap.c create mode 100644 arch/sh/kernel/ioport.c Merging rmobile/rmobile-latest $ git merge rmobile/rmobile-latest Resolved 'arch/arm/mach-shmobile/Kconfig' using previous resolution. Auto-merging arch/arm/Kconfig Auto-merging arch/arm/mach-shmobile/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging arch/arm/mm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a7741d9] Merge remote branch 'rmobile/rmobile-latest' $ git diff -M --stat --summary HEAD^.. .mailmap | 1 + arch/arm/Kconfig | 9 +- arch/arm/configs/ag5evm_defconfig | 83 + arch/arm/configs/mackerel_defconfig | 138 + arch/arm/mach-shmobile/Kconfig | 33 +- arch/arm/mach-shmobile/Makefile | 15 +- arch/arm/mach-shmobile/board-ag5evm.c | 314 +++ arch/arm/mach-shmobile/board-ap4evb.c | 10 + arch/arm/mach-shmobile/board-mackerel.c | 595 +++++ arch/arm/mach-shmobile/clock-sh73a0.c | 356 +++ arch/arm/mach-shmobile/include/mach/common.h | 8 + .../mach-shmobile/include/mach/entry-macro-gic.S | 89 + .../mach-shmobile/include/mach/entry-macro-intc.S | 61 + arch/arm/mach-shmobile/include/mach/entry-macro.S | 52 +- arch/arm/mach-shmobile/include/mach/irqs.h | 5 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/arm/mach-shmobile/include/mach/sh73a0.h | 467 ++++ arch/arm/mach-shmobile/intc-sh73a0.c | 267 ++ arch/arm/mach-shmobile/pfc-sh73a0.c | 2746 ++++++++++++++++++++ arch/arm/mach-shmobile/setup-sh7372.c | 10 + arch/arm/mach-shmobile/setup-sh73a0.c | 412 +++ arch/arm/mm/Kconfig | 2 +- arch/sh/include/mach-common/mach/romimage.h | 2 +- arch/sh/include/mach-ecovec24/mach/romimage.h | 2 +- arch/sh/include/mach-kfr2r09/mach/romimage.h | 2 +- drivers/mmc/host/Kconfig | 6 + drivers/mmc/host/sh_mmcif.c | 449 +++- drivers/serial/sh-sci.h | 7 + include/linux/mmc/sh_mmcif.h | 60 +- 29 files changed, 5990 insertions(+), 213 deletions(-) create mode 100644 arch/arm/configs/ag5evm_defconfig create mode 100644 arch/arm/configs/mackerel_defconfig create mode 100644 arch/arm/mach-shmobile/board-ag5evm.c create mode 100644 arch/arm/mach-shmobile/board-mackerel.c create mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro-gic.S create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro-intc.S create mode 100644 arch/arm/mach-shmobile/include/mach/sh73a0.h create mode 100644 arch/arm/mach-shmobile/intc-sh73a0.c create mode 100644 arch/arm/mach-shmobile/pfc-sh73a0.c create mode 100644 arch/arm/mach-shmobile/setup-sh73a0.c $ git am -3 ../patches/0001-rmobile-merge-fixup-for-clkdev-changes.patch Applying: rmobile: merge fixup for clkdev changes $ git reset HEAD^ Unstaged changes after reset: M arch/arm/Kconfig $ git add . $ git commit -v -a --amend [master a539e07] Merge remote branch 'rmobile/rmobile-latest' Merging sparc/master $ git merge sparc/master Merge made by recursive. arch/sparc/include/asm/oplib_64.h | 4 ++-- arch/sparc/prom/console_32.c | 7 ++++--- arch/sparc/prom/console_64.c | 2 -- arch/sparc/prom/init_64.c | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) Merging tile/master $ git merge tile/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. Auto-merging arch/xtensa/Kconfig Auto-merging arch/xtensa/Makefile Auto-merging arch/xtensa/configs/iss_defconfig CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Auto-merging arch/xtensa/include/asm/coprocessor.h Auto-merging arch/xtensa/kernel/Makefile Auto-merging arch/xtensa/kernel/time.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f3322e2] Merge remote branch 'xtensa/master' $ git diff -M --stat --summary HEAD^.. arch/xtensa/Kconfig | 17 +- arch/xtensa/Makefile | 5 +- arch/xtensa/boot/Makefile | 1 + arch/xtensa/include/asm/coprocessor.h | 9 +- arch/xtensa/include/asm/io.h | 40 ++-- arch/xtensa/include/asm/irq.h | 7 +- arch/xtensa/include/asm/serial.h | 12 +- arch/xtensa/kernel/Makefile | 4 +- arch/xtensa/kernel/time.c | 2 +- arch/xtensa/platforms/xtavnet/Makefile | 10 + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ .../platforms/xtavnet/include/platform/lcd.h | 22 ++ .../platforms/xtavnet/include/platform/serial.h | 1 + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ 15 files changed, 526 insertions(+), 37 deletions(-) create mode 100644 arch/xtensa/platforms/xtavnet/Makefile create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c create mode 100644 arch/xtensa/platforms/xtavnet/setup.c Merging ceph/for-next $ git merge ceph/for-next Auto-merging fs/ceph/dir.c Merge made by recursive. fs/ceph/Makefile | 23 +---------------- fs/ceph/debugfs.c | 9 ++++-- fs/ceph/dir.c | 20 +++++++++++++++ fs/ceph/export.c | 2 +- fs/ceph/inode.c | 4 +++ fs/ceph/mds_client.c | 56 +++++++++++++++++++++++++++--------------- fs/ceph/mds_client.h | 2 +- fs/ceph/super.c | 3 +- fs/ceph/super.h | 2 + include/linux/ceph/ceph_fs.h | 16 +++++++++-- net/ceph/ceph_hash.c | 3 ++ 11 files changed, 89 insertions(+), 51 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/cache.c | 16 +- fs/cifs/cifs_spnego.c | 10 +- fs/cifs/cifsfs.c | 15 +- fs/cifs/cifsglob.h | 5 +- fs/cifs/connect.c | 421 +++++++++++++++++++++++-------------------------- fs/cifs/dir.c | 43 +++--- fs/cifs/sess.c | 33 ++--- fs/cifs/transport.c | 2 +- 8 files changed, 257 insertions(+), 288 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Auto-merging include/linux/magic.h Merge made by recursive. fs/ecryptfs/crypto.c | 30 ++++++++++++++---------------- fs/ecryptfs/ecryptfs_kernel.h | 5 ++--- fs/ecryptfs/file.c | 28 +++++++++++++--------------- fs/ecryptfs/inode.c | 32 ++++++++++++++------------------ fs/ecryptfs/keystore.c | 26 +++++++++++++------------- fs/ecryptfs/kthread.c | 19 +++++++++++++++---- fs/ecryptfs/main.c | 12 +++++++----- fs/ecryptfs/mmap.c | 35 +++++++++++++++++++++-------------- include/linux/magic.h | 1 + 9 files changed, 100 insertions(+), 88 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Already up-to-date. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Merge made by recursive. fs/fuse/dev.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++--- fs/fuse/dir.c | 53 ++++++++--------- fs/fuse/file.c | 66 +++++++++++++++++---- fs/fuse/fuse_i.h | 27 ++++++--- fs/fuse/inode.c | 30 ++++------ include/linux/fuse.h | 26 ++++++++- 6 files changed, 281 insertions(+), 77 deletions(-) Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/bmap.c | 11 ++++++-- fs/gfs2/glock.c | 71 ++++++++++++++++++++++++-------------------------- fs/gfs2/glock.h | 28 ++++---------------- fs/gfs2/glops.c | 1 - fs/gfs2/incore.h | 12 +++++--- fs/gfs2/inode.c | 9 ------ fs/gfs2/lock_dlm.c | 15 +++-------- fs/gfs2/ops_inode.c | 18 +------------ fs/gfs2/quota.c | 13 ++++++++- fs/gfs2/rgrp.c | 57 +++++++++------------------------------- fs/gfs2/rgrp.h | 1 + fs/gfs2/xattr.c | 23 +---------------- 12 files changed, 86 insertions(+), 173 deletions(-) Merging hfsplus/for-next $ git merge hfsplus/for-next Merge made by recursive. fs/hfsplus/bfind.c | 6 +- fs/hfsplus/bitmap.c | 3 +- fs/hfsplus/bnode.c | 70 +++++++++++------- fs/hfsplus/brec.c | 28 +++++--- fs/hfsplus/btree.c | 33 ++++++--- fs/hfsplus/catalog.c | 85 ++++++++++++++-------- fs/hfsplus/dir.c | 37 +++++++--- fs/hfsplus/extents.c | 96 ++++++++++++++++--------- fs/hfsplus/hfsplus_fs.h | 125 +++++++++++++++++++------------- fs/hfsplus/hfsplus_raw.h | 3 +- fs/hfsplus/inode.c | 89 +++++++++++++++-------- fs/hfsplus/ioctl.c | 6 +- fs/hfsplus/options.c | 44 +++++++++++- fs/hfsplus/part_tbl.c | 129 +++++++++++++++++++-------------- fs/hfsplus/super.c | 130 ++++++++++++++++++++------------- fs/hfsplus/unicode.c | 41 +++++++---- fs/hfsplus/wrapper.c | 178 +++++++++++++++++++++++++++++----------------- 17 files changed, 703 insertions(+), 400 deletions(-) Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Resolved 'fs/logfs/logfs.h' using previous resolution. Auto-merging fs/logfs/dir.c Auto-merging fs/logfs/file.c Auto-merging fs/logfs/logfs.h CONFLICT (content): Merge conflict in fs/logfs/logfs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c5394792] Merge remote branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/lockd/Makefile | 6 +- fs/lockd/clnt4xdr.c | 605 +++++++++ fs/lockd/clntlock.c | 4 +- fs/lockd/clntproc.c | 18 +- fs/lockd/clntxdr.c | 627 +++++++++ fs/lockd/host.c | 410 ++++--- fs/lockd/mon.c | 110 +- fs/lockd/svc4proc.c | 20 +- fs/lockd/svclock.c | 34 +- fs/lockd/svcproc.c | 28 +- fs/lockd/xdr.c | 287 ---- fs/lockd/xdr4.c | 255 ---- fs/nfs/dir.c | 15 +- fs/nfs/internal.h | 11 +- fs/nfs/mount_clnt.c | 83 +- fs/nfs/nfs2xdr.c | 1297 ++++++++++++------ fs/nfs/nfs3xdr.c | 2892 +++++++++++++++++++++++++++++----------- fs/nfs/nfs4_fs.h | 1 - fs/nfs/nfs4proc.c | 18 +- fs/nfs/nfs4xdr.c | 1401 +++++++++---------- fs/nfs/pagelist.c | 7 +- fs/nfs/proc.c | 2 +- fs/nfs/super.c | 4 +- fs/nfs/unlink.c | 2 +- fs/nfsd/nfs4callback.c | 686 ++++++---- include/linux/lockd/debug.h | 10 - include/linux/lockd/lockd.h | 6 +- include/linux/nfs3.h | 3 + include/linux/nfs_xdr.h | 3 +- include/linux/sunrpc/auth.h | 8 +- include/linux/sunrpc/clnt.h | 4 +- include/linux/sunrpc/xdr.h | 10 +- net/sunrpc/auth.c | 28 +- net/sunrpc/auth_gss/auth_gss.c | 44 +- net/sunrpc/clnt.c | 21 +- net/sunrpc/rpcb_clnt.c | 147 +-- 36 files changed, 5836 insertions(+), 3271 deletions(-) create mode 100644 fs/lockd/clnt4xdr.c create mode 100644 fs/lockd/clntxdr.c Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Merge made by recursive. fs/nfsd/nfs3proc.c | 8 ++-- fs/nfsd/nfs4proc.c | 46 ++++++++++++++-- fs/nfsd/nfs4recover.c | 1 - fs/nfsd/nfs4state.c | 58 ++++++++++----------- fs/nfsd/nfs4xdr.c | 37 ++++++++++--- fs/nfsd/nfsctl.c | 2 + fs/nfsd/xdr4.h | 5 ++ include/linux/nfs4.h | 3 + include/linux/sunrpc/svc_xprt.h | 1 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 2 - net/sunrpc/svc_xprt.c | 92 +++++++++++++++------------------ net/sunrpc/svcauth.c | 1 - net/sunrpc/svcauth_unix.c | 2 - net/sunrpc/svcsock.c | 10 ++-- 15 files changed, 157 insertions(+), 113 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + fs/nilfs2/bmap.c | 47 ++++++++++--- fs/nilfs2/btnode.c | 3 +- fs/nilfs2/dir.c | 3 +- fs/nilfs2/file.c | 1 + fs/nilfs2/ifile.c | 11 +-- fs/nilfs2/inode.c | 180 ++++++++++++++++++++++++++++++++++++++++-------- fs/nilfs2/ioctl.c | 12 ++-- fs/nilfs2/mdt.c | 32 +++------ fs/nilfs2/namei.c | 1 + fs/nilfs2/nilfs.h | 13 +--- fs/nilfs2/page.c | 86 +++++++++++++++++++++++- fs/nilfs2/page.h | 3 + fs/nilfs2/recovery.c | 2 +- fs/nilfs2/sb.h | 8 -- fs/nilfs2/segment.c | 43 +++--------- fs/nilfs2/super.c | 29 +++++--- fs/nilfs2/the_nilfs.c | 6 +- fs/nilfs2/the_nilfs.h | 3 - 19 files changed, 337 insertions(+), 147 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/Kconfig | 2 +- fs/ocfs2/alloc.c | 3 + fs/ocfs2/aops.c | 59 +++++++++- fs/ocfs2/cluster/heartbeat.c | 246 ++++++++++++++++++++++++++++++++------ fs/ocfs2/cluster/netdebug.c | 253 +++++++++++++++++++++++++++------------ fs/ocfs2/cluster/tcp.c | 143 ++++++++++++++++------ fs/ocfs2/cluster/tcp_internal.h | 33 ++++-- fs/ocfs2/dlm/dlmast.c | 76 ++++++++---- fs/ocfs2/dlm/dlmcommon.h | 86 +++++++------- fs/ocfs2/dlm/dlmdebug.c | 200 ++++++++++++------------------- fs/ocfs2/dlm/dlmdebug.h | 5 - fs/ocfs2/dlm/dlmdomain.c | 10 +- fs/ocfs2/dlm/dlmlock.c | 3 + fs/ocfs2/dlm/dlmthread.c | 132 +++++++++++---------- fs/ocfs2/namei.c | 5 +- fs/ocfs2/ocfs2.h | 5 + 16 files changed, 823 insertions(+), 438 deletions(-) Merging omfs/for-next $ git merge omfs/for-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging udf/for_next $ git merge udf/for_next Merge made by recursive. fs/udf/balloc.c | 3 +- fs/udf/dir.c | 5 --- fs/udf/file.c | 11 +++--- fs/udf/ialloc.c | 21 +++-------- fs/udf/inode.c | 51 +++++++++++--------------- fs/udf/namei.c | 101 ++++++++++++++-------------------------------------- fs/udf/partition.c | 27 ++++++++++---- fs/udf/super.c | 67 +++++++++++++++++++++------------- fs/udf/symlink.c | 12 ++++--- fs/udf/udf_i.h | 13 +++++++ fs/udf/udf_sb.h | 22 +++++++++-- fs/udf/udfdecl.h | 4 ++- 12 files changed, 162 insertions(+), 175 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Merge made by recursive. fs/9p/acl.c | 2 +- fs/9p/xattr.c | 2 +- net/9p/protocol.c | 34 ++++++++++------------------------ 3 files changed, 12 insertions(+), 26 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 425 ++++++++++++------------------ fs/xfs/linux-2.6/xfs_aops.h | 16 ++ fs/xfs/linux-2.6/xfs_export.c | 12 +- fs/xfs/linux-2.6/xfs_trace.h | 29 ++- fs/xfs/xfs_alloc.c | 351 ++++++++++--------------- fs/xfs/xfs_buf_item.h | 11 - fs/xfs/xfs_iomap.c | 149 +---------- fs/xfs/xfs_iomap.h | 27 +-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 585 ++++++++++++++++------------------------- 10 files changed, 606 insertions(+), 1005 deletions(-) Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging vfs-scale/vfs-scale-working $ git merge vfs-scale/vfs-scale-working Resolved 'fs/cifs/dir.c' using previous resolution. Resolved 'fs/fuse/inode.c' using previous resolution. Resolved 'fs/hfsplus/hfsplus_fs.h' using previous resolution. Resolved 'fs/hfsplus/unicode.c' using previous resolution. Removing Documentation/filesystems/dentry-locking.txt Auto-merging fs/ceph/dir.c Auto-merging fs/ceph/inode.c Auto-merging fs/ceph/mds_client.c Auto-merging fs/cifs/cifsfs.c Auto-merging fs/cifs/dir.c CONFLICT (content): Merge conflict in fs/cifs/dir.c Auto-merging fs/ecryptfs/inode.c Auto-merging fs/ecryptfs/main.c Auto-merging fs/fuse/dir.c Auto-merging fs/fuse/inode.c CONFLICT (content): Merge conflict in fs/fuse/inode.c Auto-merging fs/gfs2/ops_inode.c Auto-merging fs/hfsplus/dir.c Auto-merging fs/hfsplus/hfsplus_fs.h CONFLICT (content): Merge conflict in fs/hfsplus/hfsplus_fs.h Auto-merging fs/hfsplus/super.c Auto-merging fs/hfsplus/unicode.c CONFLICT (content): Merge conflict in fs/hfsplus/unicode.c Auto-merging fs/nfs/dir.c Auto-merging fs/nfs/unlink.c Auto-merging fs/nilfs2/super.c Auto-merging fs/ocfs2/namei.c Auto-merging fs/udf/super.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 625def6] Merge remote branch 'vfs-scale/vfs-scale-working' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/Locking | 31 +- Documentation/filesystems/dentry-locking.txt | 174 ---- Documentation/filesystems/path-lookup.txt | 294 ++++++ Documentation/filesystems/porting | 66 ++- Documentation/filesystems/vfs.txt | 80 ++- arch/ia64/kernel/perfmon.c | 6 +- arch/powerpc/platforms/cell/spufs/inode.c | 18 +- drivers/infiniband/hw/ipath/ipath_fs.c | 8 +- drivers/infiniband/hw/qib/qib_fs.c | 5 +- drivers/mtd/mtdchar.c | 2 +- drivers/staging/autofs/root.c | 2 +- drivers/staging/pohmelfs/inode.c | 9 +- drivers/staging/pohmelfs/path_entry.c | 17 +- drivers/staging/smbfs/cache.c | 16 +- drivers/staging/smbfs/dir.c | 34 +- drivers/staging/smbfs/inode.c | 9 +- drivers/usb/core/inode.c | 12 +- fs/9p/vfs_dentry.c | 4 +- fs/9p/vfs_inode.c | 39 +- fs/adfs/dir.c | 13 +- fs/adfs/super.c | 11 +- fs/affs/amigaffs.c | 4 +- fs/affs/namei.c | 68 +- fs/affs/super.c | 11 +- fs/afs/dir.c | 6 +- fs/afs/super.c | 10 +- fs/anon_inodes.c | 6 +- fs/autofs4/autofs_i.h | 21 +- fs/autofs4/expire.c | 141 ++-- fs/autofs4/inode.c | 2 +- fs/autofs4/root.c | 78 +- fs/autofs4/waitq.c | 23 +- fs/befs/linuxvfs.c | 10 +- fs/bfs/inode.c | 9 +- fs/block_dev.c | 9 +- fs/btrfs/acl.c | 19 +- fs/btrfs/ctree.h | 4 +- fs/btrfs/export.c | 4 +- fs/btrfs/inode.c | 27 +- fs/ceph/dir.c | 21 +- fs/ceph/inode.c | 27 +- fs/ceph/mds_client.c | 2 +- fs/cifs/cifsfs.c | 9 +- fs/cifs/dir.c | 33 +- fs/cifs/inode.c | 14 +- fs/cifs/link.c | 4 +- fs/cifs/readdir.c | 6 +- fs/coda/cache.c | 4 +- fs/coda/dir.c | 8 +- fs/coda/inode.c | 9 +- fs/configfs/configfs_internal.h | 4 +- fs/configfs/dir.c | 13 +- fs/configfs/inode.c | 8 +- fs/dcache.c | 1388 ++++++++++++++++++-------- fs/ecryptfs/dentry.c | 15 +- fs/ecryptfs/inode.c | 8 +- fs/ecryptfs/main.c | 4 +- fs/ecryptfs/super.c | 12 +- fs/efs/super.c | 9 +- fs/exofs/super.c | 9 +- fs/exportfs/expfs.c | 14 +- fs/ext2/acl.c | 11 +- fs/ext2/acl.h | 8 +- fs/ext2/file.c | 2 +- fs/ext2/namei.c | 4 +- fs/ext2/super.c | 9 +- fs/ext3/acl.c | 11 +- fs/ext3/acl.h | 8 +- fs/ext3/file.c | 2 +- fs/ext3/namei.c | 4 +- fs/ext3/super.c | 9 +- fs/ext4/acl.c | 11 +- fs/ext4/acl.h | 4 +- fs/ext4/file.c | 2 +- fs/ext4/namei.c | 4 +- fs/ext4/super.c | 9 +- fs/fat/inode.c | 13 +- fs/fat/namei_msdos.c | 23 +- fs/fat/namei_vfat.c | 63 +- fs/filesystems.c | 3 + fs/freevxfs/vxfs_inode.c | 9 +- fs/fs_struct.c | 36 +- fs/fuse/dir.c | 9 +- fs/fuse/inode.c | 13 +- fs/generic_acl.c | 20 + fs/gfs2/dentry.c | 5 +- fs/gfs2/export.c | 4 +- fs/gfs2/ops_fstype.c | 2 +- fs/gfs2/ops_inode.c | 2 +- fs/gfs2/super.c | 9 +- fs/hfs/dir.c | 2 +- fs/hfs/hfs_fs.h | 8 +- fs/hfs/string.c | 17 +- fs/hfs/super.c | 11 +- fs/hfsplus/dir.c | 2 +- fs/hfsplus/hfsplus_fs.h | 9 +- fs/hfsplus/super.c | 12 +- fs/hfsplus/unicode.c | 19 +- fs/hostfs/hostfs_kern.c | 37 +- fs/hpfs/dentry.c | 27 +- fs/hpfs/super.c | 9 +- fs/hppfs/hppfs.c | 9 +- fs/hugetlbfs/inode.c | 9 +- fs/inode.c | 50 +- fs/internal.h | 1 + fs/isofs/inode.c | 131 ++-- fs/isofs/namei.c | 5 +- fs/jffs2/super.c | 9 +- fs/jfs/namei.c | 61 +- fs/jfs/super.c | 12 +- fs/libfs.c | 63 +- fs/locks.c | 2 +- fs/logfs/inode.c | 9 +- fs/minix/inode.c | 9 +- fs/minix/namei.c | 2 +- fs/namei.c | 937 ++++++++++++++---- fs/namespace.c | 271 +++++- fs/ncpfs/dir.c | 84 +- fs/ncpfs/inode.c | 11 +- fs/ncpfs/ncplib_kernel.h | 16 +- fs/nfs/dir.c | 17 +- fs/nfs/getroot.c | 10 +- fs/nfs/inode.c | 9 +- fs/nfs/namespace.c | 17 +- fs/nfs/unlink.c | 2 +- fs/nfsd/vfs.c | 5 +- fs/nilfs2/super.c | 12 +- fs/notify/fsnotify.c | 8 +- fs/ntfs/inode.c | 9 +- fs/ocfs2/dcache.c | 10 +- fs/ocfs2/dlmfs/dlmfs.c | 9 +- fs/ocfs2/export.c | 4 +- fs/ocfs2/namei.c | 10 +- fs/ocfs2/super.c | 9 +- fs/openpromfs/inode.c | 9 +- fs/pipe.c | 12 +- fs/pnode.c | 4 +- fs/proc/base.c | 14 +- fs/proc/generic.c | 4 +- fs/proc/inode.c | 9 +- fs/proc/proc_sysctl.c | 23 +- fs/qnx4/inode.c | 9 +- fs/reiserfs/super.c | 9 +- fs/reiserfs/xattr.c | 2 +- fs/romfs/super.c | 9 +- fs/squashfs/super.c | 9 +- fs/super.c | 5 +- fs/sysfs/dir.c | 22 +- fs/sysv/inode.c | 9 +- fs/sysv/namei.c | 5 +- fs/sysv/super.c | 2 +- fs/ubifs/super.c | 10 +- fs/udf/super.c | 9 +- fs/ufs/super.c | 9 +- fs/xfs/linux-2.6/xfs_acl.c | 8 +- fs/xfs/linux-2.6/xfs_iops.c | 8 +- fs/xfs/xfs_acl.h | 4 +- fs/xfs/xfs_iget.c | 13 +- include/linux/bit_spinlock.h | 4 + include/linux/dcache.h | 243 +++--- include/linux/fs.h | 63 +- include/linux/fs_struct.h | 3 + include/linux/fsnotify.h | 2 - include/linux/fsnotify_backend.h | 11 +- include/linux/generic_acl.h | 1 + include/linux/list_bl.h | 141 +++ include/linux/mount.h | 53 +- include/linux/namei.h | 16 +- include/linux/ncp_fs.h | 4 +- include/linux/path.h | 2 + include/linux/posix_acl.h | 19 + include/linux/rculist_bl.h | 128 +++ include/linux/security.h | 8 +- include/linux/seqlock.h | 80 ++- include/linux/slab.h | 2 - ipc/mqueue.c | 9 +- kernel/cgroup.c | 54 +- mm/filemap.c | 3 - mm/shmem.c | 15 +- mm/slab.c | 32 +- mm/slob.c | 5 - mm/slub.c | 40 - mm/util.c | 21 - net/socket.c | 24 +- net/sunrpc/rpc_pipe.c | 14 +- security/security.c | 9 + security/selinux/selinuxfs.c | 16 +- security/tomoyo/realpath.c | 1 + 188 files changed, 4542 insertions(+), 1905 deletions(-) delete mode 100644 Documentation/filesystems/dentry-locking.txt create mode 100644 Documentation/filesystems/path-lookup.txt create mode 100644 include/linux/list_bl.h create mode 100644 include/linux/rculist_bl.h Merging pci/linux-next $ git merge pci/linux-next Merge made by recursive. arch/x86/pci/irq.c | 3 +- drivers/media/video/cafe_ccic.c | 4 +-- drivers/net/myri10ge/myri10ge.c | 4 +-- drivers/net/sfc/falcon.c | 25 ++++---------------- drivers/net/skge.c | 4 +-- drivers/net/sky2.c | 5 +--- drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- drivers/pci/msi.c | 5 ++- drivers/pci/msi.h | 6 ----- drivers/pci/pci-acpi.c | 1 + drivers/pci/pci-driver.c | 5 ++- drivers/pci/pci-stub.c | 7 ++++++ drivers/pci/pci.c | 7 +---- drivers/pci/pcie/aspm.c | 21 ++++++++++++++--- drivers/pci/pcie/pme.c | 27 +++------------------- drivers/pci/pcie/portdrv.h | 2 + drivers/pci/pcie/portdrv_core.c | 25 +++++++++++--------- drivers/pci/pcie/portdrv_pci.c | 37 +++++++++++++++++++++++++++--- drivers/scsi/ipr.c | 8 +------ drivers/scsi/pmcraid.c | 7 +----- drivers/staging/sm7xx/smtcfb.c | 2 +- include/linux/pci-aspm.h | 5 +++- include/linux/pci.h | 8 ++---- include/linux/pci_ids.h | 3 +- include/linux/pci_regs.h | 10 ++++++++ sound/pci/cs5535audio/cs5535audio_pm.c | 7 +----- 26 files changed, 122 insertions(+), 120 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. .../ABI/testing/sysfs-driver-hid-roccat-kone | 16 +- .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 108 +++ .../ABI/testing/sysfs-driver-hid-roccat-pyra | 18 +- drivers/base/core.c | 41 +- drivers/hid/Kconfig | 17 + drivers/hid/Makefile | 14 +- drivers/hid/hid-3m-pct.c | 2 +- drivers/hid/hid-a4tech.c | 6 +- drivers/hid/hid-apple.c | 63 ++- drivers/hid/hid-axff.c | 14 +- drivers/hid/hid-belkin.c | 4 +- drivers/hid/hid-cando.c | 2 +- drivers/hid/hid-cherry.c | 3 +- drivers/hid/hid-core.c | 119 ++- drivers/hid/hid-cypress.c | 4 +- drivers/hid/hid-debug.c | 4 +- drivers/hid/hid-drff.c | 14 +- drivers/hid/hid-egalax.c | 2 +- drivers/hid/hid-elecom.c | 3 +- drivers/hid/hid-emsff.c | 161 ++++ drivers/hid/hid-gaff.c | 13 +- drivers/hid/hid-ids.h | 11 + drivers/hid/hid-input.c | 18 +- drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lg.c | 15 +- drivers/hid/hid-lg2ff.c | 9 +- drivers/hid/hid-lg3ff.c | 9 +- drivers/hid/hid-lg4ff.c | 9 +- drivers/hid/hid-lgff.c | 8 +- drivers/hid/hid-magicmouse.c | 20 +- drivers/hid/hid-microsoft.c | 7 +- drivers/hid/hid-monterey.c | 3 +- drivers/hid/hid-mosart.c | 22 +- drivers/hid/hid-ntrig.c | 9 +- drivers/hid/hid-ortek.c | 3 +- drivers/hid/hid-petalynx.c | 7 +- drivers/hid/hid-picolcd.c | 57 +- drivers/hid/hid-pl.c | 16 +- drivers/hid/hid-prodikeys.c | 27 +- drivers/hid/hid-quanta.c | 2 +- drivers/hid/hid-roccat-kone.c | 404 ++++------ drivers/hid/hid-roccat-kone.h | 19 +- drivers/hid/hid-roccat-koneplus.c | 837 ++++++++++++++++++++ drivers/hid/hid-roccat-koneplus.h | 224 ++++++ drivers/hid/hid-roccat-pyra.c | 411 +++------- drivers/hid/hid-roccat-pyra.h | 23 +- drivers/hid/hid-roccat.c | 53 +- drivers/hid/hid-roccat.h | 5 +- drivers/hid/hid-samsung.c | 8 +- drivers/hid/hid-sjoy.c | 16 +- drivers/hid/hid-sony.c | 11 +- drivers/hid/hid-stantum.c | 2 +- drivers/hid/hid-sunplus.c | 3 +- drivers/hid/hid-tmff.c | 27 +- drivers/hid/hid-topseed.c | 1 + drivers/hid/hid-wacom.c | 28 +- drivers/hid/hid-zpff.c | 11 +- drivers/hid/hid-zydacron.c | 11 +- drivers/hid/hidraw.c | 33 +- drivers/hid/usbhid/Makefile | 6 +- drivers/hid/usbhid/hid-core.c | 105 +-- drivers/hid/usbhid/hid-pidff.c | 164 ++-- drivers/hid/usbhid/hid-quirks.c | 2 +- drivers/hid/usbhid/hiddev.c | 241 +++--- drivers/hid/usbhid/usbhid.h | 1 - drivers/hid/usbhid/usbkbd.c | 24 +- drivers/input/mouse/bcm5974.c | 40 + include/linux/device.h | 1 + include/linux/hid.h | 75 ++- 69 files changed, 2460 insertions(+), 1210 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus create mode 100644 drivers/hid/hid-emsff.c create mode 100644 drivers/hid/hid-roccat-koneplus.c create mode 100644 drivers/hid/hid-roccat-koneplus.h Merging quilt/i2c $ git merge quilt/i2c Auto-merging MAINTAINERS Merge made by recursive. Documentation/i2c/muxes/gpio-i2cmux | 65 ++++++++++++ MAINTAINERS | 8 ++ drivers/i2c/busses/i2c-i801.c | 1 + drivers/i2c/busses/i2c-nforce2.c | 2 +- drivers/i2c/muxes/Kconfig | 12 +++ drivers/i2c/muxes/Makefile | 1 + drivers/i2c/muxes/gpio-i2cmux.c | 184 +++++++++++++++++++++++++++++++++++ include/linux/gpio-i2cmux.h | 38 +++++++ 8 files changed, 310 insertions(+), 1 deletions(-) create mode 100644 Documentation/i2c/muxes/gpio-i2cmux create mode 100644 drivers/i2c/muxes/gpio-i2cmux.c create mode 100644 include/linux/gpio-i2cmux.h Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Merge made by recursive. drivers/i2c/busses/Kconfig | 8 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-eg20t.c | 900 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 909 insertions(+), 0 deletions(-) create mode 100644 drivers/i2c/busses/i2c-eg20t.c Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Auto-merging drivers/hwmon/it87.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 10 +++++ Documentation/hwmon/adm9240 | 2 +- Documentation/hwmon/ads7828 | 2 +- Documentation/hwmon/w83627hf | 22 +++++++++++ Documentation/hwmon/w83793 | 2 +- drivers/hwmon/Kconfig | 4 +- drivers/hwmon/adm9240.c | 32 +++++++++++++++-- drivers/hwmon/ads7828.c | 4 +- drivers/hwmon/emc1403.c | 16 ++++++-- drivers/hwmon/fschmd.c | 5 +-- drivers/hwmon/it87.c | 30 +++++++-------- drivers/hwmon/lm78.c | 14 ++++---- drivers/hwmon/pc87360.c | 53 ++++++++++++---------------- drivers/hwmon/pc87427.c | 26 +++++++------- drivers/hwmon/w83781d.c | 29 +++++++-------- drivers/hwmon/w83792d.c | 44 +++++++++++++++++++++-- drivers/hwmon/w83793.c | 38 ++++++++++++++++---- 17 files changed, 224 insertions(+), 109 deletions(-) Merging hwmon-staging/hwmon-next $ git merge hwmon-staging/hwmon-next Auto-merging drivers/hwmon/Kconfig Merge made by recursive. Documentation/hwmon/ds620 | 23 + Documentation/hwmon/sysfs-interface | 40 +- drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/abituguru.c | 36 +- drivers/hwmon/abituguru3.c | 45 +- drivers/hwmon/adt7470.c | 4 +- drivers/hwmon/applesmc.c | 1632 ++++++++++++----------------------- drivers/hwmon/asb100.c | 9 +- drivers/hwmon/asus_atk0110.c | 7 +- drivers/hwmon/coretemp.c | 11 +- drivers/hwmon/dme1737.c | 12 +- drivers/hwmon/ds620.c | 370 ++++++++ drivers/hwmon/f71805f.c | 29 +- drivers/hwmon/f71882fg.c | 23 +- drivers/hwmon/hp_accel.c | 13 +- drivers/hwmon/hwmon-vid.c | 11 +- drivers/hwmon/hwmon.c | 4 +- drivers/hwmon/ibmaem.c | 4 +- drivers/hwmon/lis3lv02d.c | 23 +- drivers/hwmon/lm70.c | 5 +- drivers/hwmon/lm95241.c | 495 +++++------ drivers/hwmon/pcf8591.c | 5 +- drivers/hwmon/pkgtemp.c | 7 +- drivers/hwmon/sis5595.c | 10 +- drivers/hwmon/smsc47b397.c | 13 +- drivers/hwmon/smsc47m1.c | 31 +- drivers/hwmon/via-cputemp.c | 35 +- drivers/hwmon/via686a.c | 10 +- drivers/hwmon/vt1211.c | 30 +- drivers/hwmon/vt8231.c | 10 +- drivers/hwmon/w83627ehf.c | 23 +- drivers/hwmon/w83627hf.c | 17 +- 33 files changed, 1452 insertions(+), 1546 deletions(-) create mode 100644 Documentation/hwmon/ds620 create mode 100644 drivers/hwmon/ds620.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Merge made by recursive. Documentation/dontdiff | 26 ++++++++++++++++++++++++++ Documentation/kernel-docs.txt | 27 ++------------------------- 2 files changed, 28 insertions(+), 25 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merging Documentation/feature-removal-schedule.txt Removing Documentation/video4linux/README.cpia Auto-merging MAINTAINERS Removing drivers/input/misc/winbond-cir.c Removing drivers/media/IR/ir-functions.c Removing drivers/media/IR/ir-keytable.c Removing drivers/media/IR/ir-sysfs.c Removing drivers/media/IR/keymaps/rc-tbs-nec.c Removing drivers/media/IR/rc-map.c Removing drivers/media/dvb/frontends/s921_core.c Removing drivers/media/dvb/frontends/s921_core.h Removing drivers/media/dvb/frontends/s921_module.c Removing drivers/media/dvb/frontends/s921_module.h Auto-merging drivers/media/video/cafe_ccic.c Removing drivers/media/video/usbvideo/Kconfig Removing drivers/media/video/usbvideo/Makefile Removing drivers/media/video/usbvideo/ibmcam.c Removing drivers/media/video/usbvideo/konicawc.c Removing drivers/media/video/usbvideo/ultracam.c Removing drivers/media/video/v4l1-compat.c Auto-merging drivers/mfd/Kconfig Auto-merging drivers/mfd/Makefile Removing drivers/staging/cpia/Kconfig Removing drivers/staging/cpia/Makefile Removing drivers/staging/cpia/TODO Removing drivers/staging/cpia/cpia.c Removing drivers/staging/cpia/cpia.h Removing drivers/staging/cpia/cpia_pp.c Removing drivers/staging/cpia/cpia_usb.c Removing drivers/staging/stradis/Kconfig Removing drivers/staging/stradis/Makefile Removing drivers/staging/stradis/TODO Removing drivers/staging/stradis/stradis.c Removing include/media/ir-common.h Removing include/media/ir-core.h Merge made by recursive. Documentation/dvb/lmedm04.txt | 2 +- Documentation/feature-removal-schedule.txt | 24 +- Documentation/video4linux/CARDLIST.em28xx | 2 +- Documentation/video4linux/README.cpia | 191 - Documentation/video4linux/Zoran | 74 +- Documentation/video4linux/bttv/Cards | 4 - Documentation/video4linux/gspca.txt | 1 + Documentation/video4linux/meye.txt | 10 +- Documentation/video4linux/videobuf | 7 +- MAINTAINERS | 6 - drivers/input/misc/Kconfig | 18 - drivers/input/misc/Makefile | 1 - drivers/input/misc/winbond-cir.c | 1608 -------- drivers/media/IR/ir-functions.c | 356 -- drivers/media/IR/ir-keytable.c | 710 ---- drivers/media/IR/ir-sysfs.c | 362 -- drivers/media/IR/keymaps/rc-tbs-nec.c | 73 - drivers/media/IR/rc-map.c | 107 - drivers/media/Kconfig | 17 +- drivers/media/Makefile | 2 +- drivers/media/common/saa7146_video.c | 32 - drivers/media/common/tuners/max2165.c | 10 +- drivers/media/dvb/dm1105/Kconfig | 3 +- drivers/media/dvb/dm1105/dm1105.c | 44 +- drivers/media/dvb/dvb-usb/Kconfig | 10 +- drivers/media/dvb/dvb-usb/Makefile | 3 + drivers/media/dvb/dvb-usb/a800.c | 6 +- drivers/media/dvb/dvb-usb/af9005-remote.c | 16 +- drivers/media/dvb/dvb-usb/af9005.c | 16 +- drivers/media/dvb/dvb-usb/af9005.h | 4 +- drivers/media/dvb/dvb-usb/af9015.c | 22 +- drivers/media/dvb/dvb-usb/anysee.c | 4 +- drivers/media/dvb/dvb-usb/az6027.c | 13 +- drivers/media/dvb/dvb-usb/cinergyT2-core.c | 6 +- drivers/media/dvb/dvb-usb/cxusb.c | 62 +- drivers/media/dvb/dvb-usb/dib0700.h | 2 +- drivers/media/dvb/dvb-usb/dib0700_core.c | 18 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 146 +- drivers/media/dvb/dvb-usb/dibusb-common.c | 4 +- drivers/media/dvb/dvb-usb/dibusb-mb.c | 16 +- drivers/media/dvb/dvb-usb/dibusb-mc.c | 4 +- drivers/media/dvb/dvb-usb/dibusb.h | 2 +- drivers/media/dvb/dvb-usb/digitv.c | 14 +- drivers/media/dvb/dvb-usb/dtt200u.c | 18 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 103 +- drivers/media/dvb/dvb-usb/dvb-usb.h | 29 +- drivers/media/dvb/dvb-usb/dw2102.c | 54 +- drivers/media/dvb/dvb-usb/gp8psk.c | 28 + drivers/media/dvb/dvb-usb/gp8psk.h | 8 +- drivers/media/dvb/dvb-usb/lmedm04.c | 329 +- drivers/media/dvb/dvb-usb/m920x.c | 24 +- drivers/media/dvb/dvb-usb/nova-t-usb2.c | 18 +- drivers/media/dvb/dvb-usb/opera1.c | 16 +- drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 ++++ drivers/media/dvb/dvb-usb/vp702x.c | 12 +- drivers/media/dvb/dvb-usb/vp7045.c | 12 +- drivers/media/dvb/frontends/Kconfig | 10 +- drivers/media/dvb/frontends/Makefile | 2 +- drivers/media/dvb/frontends/atbm8830.c | 8 +- drivers/media/dvb/frontends/au8522_decoder.c | 51 +- drivers/media/dvb/frontends/au8522_priv.h | 2 + drivers/media/dvb/frontends/ix2505v.c | 2 +- drivers/media/dvb/frontends/lgs8gxx.c | 11 +- drivers/media/dvb/frontends/mb86a20s.c | 615 +++ drivers/media/dvb/frontends/mb86a20s.h | 52 + drivers/media/dvb/frontends/s921.c | 548 +++ drivers/media/dvb/frontends/s921.h | 47 + drivers/media/dvb/frontends/s921_core.c | 216 -- drivers/media/dvb/frontends/s921_core.h | 114 - drivers/media/dvb/frontends/s921_module.c | 192 - drivers/media/dvb/frontends/s921_module.h | 49 - drivers/media/dvb/frontends/stb0899_drv.c | 2 +- drivers/media/dvb/frontends/stb6100.c | 198 +- drivers/media/dvb/frontends/stv090x.c | 22 + drivers/media/dvb/frontends/stv090x.h | 15 + drivers/media/dvb/mantis/Kconfig | 2 +- drivers/media/dvb/mantis/hopper_cards.c | 2 + drivers/media/dvb/mantis/hopper_vp3028.c | 6 +- drivers/media/dvb/mantis/mantis_cards.c | 2 + drivers/media/dvb/mantis/mantis_common.h | 4 +- drivers/media/dvb/mantis/mantis_dvb.c | 17 +- drivers/media/dvb/mantis/mantis_input.c | 76 +- drivers/media/dvb/mantis/mantis_ioc.c | 4 +- drivers/media/dvb/mantis/mantis_ioc.h | 2 +- drivers/media/dvb/mantis/mantis_vp1033.c | 2 +- drivers/media/dvb/mantis/mantis_vp1034.c | 10 +- drivers/media/dvb/mantis/mantis_vp1041.c | 6 +- drivers/media/dvb/mantis/mantis_vp2033.c | 4 +- drivers/media/dvb/mantis/mantis_vp2040.c | 4 +- drivers/media/dvb/mantis/mantis_vp3030.c | 8 +- drivers/media/dvb/ngene/ngene-core.c | 5 +- drivers/media/dvb/siano/Kconfig | 2 +- drivers/media/dvb/siano/smscoreapi.c | 2 +- drivers/media/dvb/siano/smsir.c | 52 +- drivers/media/dvb/siano/smsir.h | 5 +- drivers/media/dvb/siano/smsusb.c | 9 +- drivers/media/dvb/ttpci/Kconfig | 3 +- drivers/media/dvb/ttpci/budget-ci.c | 53 +- drivers/media/radio/Kconfig | 16 + drivers/media/radio/Makefile | 1 + drivers/media/radio/radio-wl1273.c | 2331 +++++++++++ drivers/media/radio/si4713-i2c.c | 74 +- drivers/media/radio/si4713-i2c.h | 5 +- drivers/media/{IR => rc}/Kconfig | 70 +- drivers/media/{IR => rc}/Makefile | 8 +- drivers/media/{IR => rc}/ene_ir.c | 131 +- drivers/media/{IR => rc}/ene_ir.h | 3 +- drivers/media/{IR => rc}/imon.c | 107 +- drivers/media/{IR => rc}/ir-jvc-decoder.c | 17 +- drivers/media/{IR => rc}/ir-lirc-codec.c | 132 +- drivers/media/{IR => rc}/ir-nec-decoder.c | 19 +- drivers/media/{IR/ir-raw-event.c => rc/ir-raw.c} | 197 +- drivers/media/{IR => rc}/ir-rc5-decoder.c | 17 +- drivers/media/{IR => rc}/ir-rc5-sz-decoder.c | 17 +- drivers/media/{IR => rc}/ir-rc6-decoder.c | 21 +- drivers/media/{IR => rc}/ir-sony-decoder.c | 15 +- drivers/media/{IR => rc}/keymaps/Kconfig | 2 +- drivers/media/{IR => rc}/keymaps/Makefile | 2 + .../{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-anysee.c | 10 +- .../media/{IR => rc}/keymaps/rc-apac-viewcomp.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c | 10 +- .../{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-a16d.c | 10 +- .../{IR => rc}/keymaps/rc-avermedia-cardbus.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-dvbt.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-m135a.c | 10 +- .../{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-avermedia.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-avertv-303.c | 10 +- .../{IR => rc}/keymaps/rc-azurewave-ad-tu700.c | 10 +- .../media/{IR => rc}/keymaps/rc-behold-columbus.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-behold.c | 78 +- .../media/{IR => rc}/keymaps/rc-budget-ci-old.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-cinergy.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c | 10 +- .../{IR => rc}/keymaps/rc-digitalnow-tinytwin.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-digittrade.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c | 10 +- .../media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c | 10 +- .../{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-em-terratec.c | 10 +- .../{IR => rc}/keymaps/rc-encore-enltv-fm53.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c | 10 +- .../media/{IR => rc}/keymaps/rc-encore-enltv2.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-eztv.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-flydvb.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-flyvideo.c | 10 +- .../media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c | 10 +- .../media/{IR => rc}/keymaps/rc-gadmei-rm008z.c | 10 +- .../{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-gotview7135.c | 10 +- .../media/{IR => rc}/keymaps/rc-hauppauge-new.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-imon-mce.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-imon-pad.c | 10 +- .../media/{IR => rc}/keymaps/rc-iodata-bctv7e.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-kaiomy.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c | 10 +- .../{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c | 10 +- .../media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-lirc.c | 12 +- drivers/media/{IR => rc}/keymaps/rc-lme2510.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-manli.c | 10 +- .../media/{IR => rc}/keymaps/rc-msi-digivox-ii.c | 10 +- .../media/{IR => rc}/keymaps/rc-msi-digivox-iii.c | 10 +- .../{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c | 10 +- .../media/{IR => rc}/keymaps/rc-msi-tvanywhere.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-nebula.c | 10 +- .../keymaps/rc-nec-terratec-cinergy-xs.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-norwood.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-npgtech.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c | 10 +- .../media/{IR => rc}/keymaps/rc-pinnacle-color.c | 10 +- .../media/{IR => rc}/keymaps/rc-pinnacle-grey.c | 10 +- .../media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c | 10 +- drivers/media/rc/keymaps/rc-pixelview-002t.c | 77 + .../media/{IR => rc}/keymaps/rc-pixelview-mk12.c | 10 +- .../media/{IR => rc}/keymaps/rc-pixelview-new.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-pixelview.c | 10 +- .../{IR => rc}/keymaps/rc-powercolor-real-angel.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-purpletv.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-pv951.c | 10 +- .../{IR => rc}/keymaps/rc-rc5-hauppauge-new.c | 48 +- drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c | 10 +- .../{IR => rc}/keymaps/rc-real-audio-220-32-keys.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-streamzap.c | 10 +- drivers/media/rc/keymaps/rc-tbs-nec.c | 75 + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 + .../{IR => rc}/keymaps/rc-terratec-cinergy-xs.c | 10 +- .../media/{IR => rc}/keymaps/rc-terratec-slim.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c | 10 +- .../{IR => rc}/keymaps/rc-total-media-in-hand.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-trekstor.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-tt-1500.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c | 10 +- .../media/{IR => rc}/keymaps/rc-videomate-s350.c | 10 +- .../media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c | 10 +- .../{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-winfast.c | 10 +- drivers/media/{IR => rc}/lirc_dev.c | 8 +- drivers/media/{IR => rc}/mceusb.c | 114 +- drivers/media/{IR => rc}/nuvoton-cir.c | 94 +- drivers/media/{IR => rc}/nuvoton-cir.h | 3 +- .../media/{IR/ir-core-priv.h => rc/rc-core-priv.h} | 34 +- drivers/media/rc/rc-loopback.c | 260 ++ drivers/media/rc/rc-main.c | 1135 ++++++ drivers/media/{IR => rc}/streamzap.c | 79 +- drivers/media/rc/winbond-cir.c | 932 +++++ drivers/media/video/Kconfig | 25 +- drivers/media/video/Makefile | 10 +- drivers/media/video/au0828/au0828-video.c | 118 +- drivers/media/video/au0828/au0828.h | 6 +- drivers/media/video/bt8xx/Kconfig | 4 +- drivers/media/video/bt8xx/bttv-driver.c | 34 - drivers/media/video/bt8xx/bttv-input.c | 226 +- drivers/media/video/bt8xx/bttv.h | 1 - drivers/media/video/bt8xx/bttvp.h | 34 +- drivers/media/video/cafe_ccic.c | 5 +- drivers/media/video/cpia2/cpia2_v4l.c | 38 - drivers/media/video/cx18/Kconfig | 3 +- drivers/media/video/cx18/cx18-cards.c | 63 +- drivers/media/video/cx18/cx18-driver.c | 11 +- drivers/media/video/cx18/cx18-driver.h | 13 +- drivers/media/video/cx18/cx18-dvb.c | 64 +- drivers/media/video/cx18/cx18-i2c.c | 2 +- drivers/media/video/cx18/cx18-mailbox.c | 6 +- drivers/media/video/cx18/cx18-streams.c | 45 +- drivers/media/video/cx18/cx18-streams.h | 3 +- drivers/media/video/cx231xx/Kconfig | 19 +- drivers/media/video/cx231xx/Makefile | 5 +- drivers/media/video/cx231xx/cx231xx-417.c | 4 +- drivers/media/video/cx231xx/cx231xx-avcore.c | 1 + drivers/media/video/cx231xx/cx231xx-cards.c | 65 +- drivers/media/video/cx231xx/cx231xx-core.c | 4 +- drivers/media/video/cx231xx/cx231xx-dvb.c | 40 + drivers/media/video/cx231xx/cx231xx-input.c | 112 + drivers/media/video/cx231xx/cx231xx-video.c | 12 - drivers/media/video/cx231xx/cx231xx.h | 26 +- drivers/media/video/cx23885/Kconfig | 2 +- drivers/media/video/cx23885/cx23885-input.c | 70 +- drivers/media/video/cx23885/cx23885-video.c | 32 - drivers/media/video/cx23885/cx23885.h | 5 +- drivers/media/video/cx23885/cx23888-ir.c | 14 +- drivers/media/video/cx25840/cx25840-core.c | 18 +- drivers/media/video/cx25840/cx25840-ir.c | 14 +- drivers/media/video/cx88/Kconfig | 3 +- drivers/media/video/cx88/cx88-blackbird.c | 2 +- drivers/media/video/cx88/cx88-cards.c | 2 +- drivers/media/video/cx88/cx88-input.c | 241 +- drivers/media/video/cx88/cx88-video.c | 12 - drivers/media/video/davinci/vpfe_capture.c | 2 +- drivers/media/video/em28xx/Kconfig | 5 +- drivers/media/video/em28xx/em28xx-cards.c | 72 +- drivers/media/video/em28xx/em28xx-dvb.c | 16 + drivers/media/video/em28xx/em28xx-input.c | 78 +- drivers/media/video/em28xx/em28xx-vbi.c | 1 + drivers/media/video/em28xx/em28xx-video.c | 16 - drivers/media/video/em28xx/em28xx.h | 4 +- drivers/media/video/fsl-viu.c | 5 + drivers/media/video/gspca/cpia1.c | 12 +- drivers/media/video/gspca/gspca.c | 54 +- drivers/media/video/gspca/gspca.h | 2 +- drivers/media/video/gspca/m5602/m5602_ov9650.c | 2 +- drivers/media/video/gspca/ov519.c | 1683 +++++---- drivers/media/video/gspca/ov534.c | 14 +- drivers/media/video/gspca/ov534_9.c | 1 - drivers/media/video/gspca/pac207.c | 4 +- drivers/media/video/gspca/sn9c20x.c | 141 +- drivers/media/video/gspca/sonixb.c | 236 +- drivers/media/video/gspca/sonixj.c | 18 +- drivers/media/video/gspca/spca561.c | 2 +- drivers/media/video/gspca/sq905c.c | 1 + drivers/media/video/gspca/sq930x.c | 28 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 57 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 11 +- drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 18 +- drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 3 + drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 4 + drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 21 +- drivers/media/video/gspca/stv06xx/stv06xx_st6422.h | 3 + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 9 +- drivers/media/video/gspca/t613.c | 2 +- drivers/media/video/gspca/tv8532.c | 2 +- drivers/media/video/gspca/w996Xcf.c | 325 +- drivers/media/video/gspca/xirlink_cit.c | 194 +- drivers/media/video/gspca/zc3xx.c | 2 +- drivers/media/video/imx074.c | 1 - drivers/media/video/ir-kbd-i2c.c | 75 +- drivers/media/video/ivtv/Kconfig | 3 +- drivers/media/video/ivtv/ivtv-driver.c | 28 +- drivers/media/video/ivtv/ivtv-fileops.c | 4 +- drivers/media/video/ivtv/ivtv-i2c.c | 6 +- drivers/media/video/ivtv/ivtv-vbi.c | 115 +- drivers/media/video/ivtv/ivtv-vbi.h | 5 +- drivers/media/video/mem2mem_testdev.c | 21 +- drivers/media/video/mt9m001.c | 1 - drivers/media/video/mt9m111.c | 1 - drivers/media/video/mt9t031.c | 1 - drivers/media/video/mt9v022.c | 1 - drivers/media/video/mx3_camera.c | 3 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 4 +- drivers/media/video/pwc/pwc-ctrl.c | 7 +- drivers/media/video/pwc/pwc-if.c | 68 +- drivers/media/video/pwc/pwc-v4l.c | 30 +- drivers/media/video/pwc/pwc.h | 1 - drivers/media/video/rj54n1cb0c.c | 1 - drivers/media/video/s2255drv.c | 43 +- drivers/media/video/s5p-fimc/fimc-core.c | 2 +- drivers/media/video/saa7134/Kconfig | 2 +- drivers/media/video/saa7134/saa7134-cards.c | 110 + drivers/media/video/saa7134/saa7134-dvb.c | 69 + drivers/media/video/saa7134/saa7134-input.c | 430 +-- drivers/media/video/saa7134/saa7134-tvaudio.c | 12 +- drivers/media/video/saa7134/saa7134-video.c | 11 - drivers/media/video/saa7134/saa7134.h | 25 +- drivers/media/video/saa7164/saa7164-api.c | 123 +- drivers/media/video/saa7164/saa7164-buffer.c | 92 +- drivers/media/video/saa7164/saa7164-bus.c | 16 +- drivers/media/video/saa7164/saa7164-cards.c | 2 +- drivers/media/video/saa7164/saa7164-cmd.c | 10 +- drivers/media/video/saa7164/saa7164-core.c | 40 +- drivers/media/video/saa7164/saa7164-encoder.c | 33 +- drivers/media/video/saa7164/saa7164-fw.c | 12 +- drivers/media/video/saa7164/saa7164-i2c.c | 4 +- drivers/media/video/saa7164/saa7164-vbi.c | 37 +- drivers/media/video/saa7164/saa7164.h | 17 +- drivers/media/video/sn9c102/sn9c102_devtable.h | 4 +- drivers/media/video/soc_camera.c | 4 +- drivers/media/video/sr030pc30.c | 2 +- drivers/media/video/stk-webcam.c | 148 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/timblogiw.c | 894 +++++ drivers/media/video/tlg2300/Kconfig | 4 +- drivers/media/video/usbvideo/Kconfig | 45 - drivers/media/video/usbvideo/Makefile | 4 - drivers/media/video/usbvideo/ibmcam.c | 3977 ------------------- drivers/media/video/usbvideo/konicawc.c | 992 ----- drivers/media/video/usbvideo/ultracam.c | 685 ---- drivers/media/video/usbvision/usbvision-video.c | 3 - drivers/media/video/uvc/uvc_v4l2.c | 7 +- drivers/media/video/v4l1-compat.c | 1277 ------- drivers/media/video/v4l2-compat-ioctl32.c | 325 -- drivers/media/video/v4l2-ctrls.c | 2 +- drivers/media/video/v4l2-ioctl.c | 86 - drivers/media/video/via-camera.c | 13 - drivers/media/video/videobuf-core.c | 30 - drivers/media/video/videobuf-dma-sg.c | 34 +- drivers/media/video/vivi.c | 12 - drivers/media/video/zoran/zoran.h | 107 - drivers/media/video/zoran/zoran_card.c | 2 +- drivers/media/video/zoran/zoran_device.c | 2 +- drivers/media/video/zoran/zoran_driver.c | 321 -- drivers/mfd/Kconfig | 10 + drivers/mfd/Makefile | 1 + drivers/mfd/timberdale.c | 61 +- drivers/mfd/timberdale.h | 2 +- drivers/mfd/wl1273-core.c | 148 + drivers/staging/Kconfig | 4 +- drivers/staging/Makefile | 4 +- drivers/staging/cpia/Kconfig | 39 - drivers/staging/cpia/Makefile | 5 - drivers/staging/cpia/TODO | 8 - drivers/staging/cpia/cpia.c | 4028 -------------------- drivers/staging/cpia/cpia.h | 432 --- drivers/staging/cpia/cpia_pp.c | 869 ----- drivers/staging/cpia/cpia_usb.c | 640 ---- drivers/staging/cx25821/Kconfig | 4 +- drivers/staging/cx25821/cx25821-alsa.c | 71 +- drivers/staging/cx25821/cx25821-audio-upstream.c | 66 +- drivers/staging/cx25821/cx25821-cards.c | 2 + drivers/staging/cx25821/cx25821-core.c | 191 +- drivers/staging/cx25821/cx25821-i2c.c | 19 +- drivers/staging/cx25821/cx25821-medusa-video.c | 7 +- .../staging/cx25821/cx25821-video-upstream-ch2.c | 63 +- drivers/staging/cx25821/cx25821-video-upstream.c | 90 +- drivers/staging/cx25821/cx25821-video.c | 113 +- drivers/staging/cx25821/cx25821-video.h | 15 +- drivers/staging/cx25821/cx25821.h | 9 +- drivers/staging/dt3155v4l/dt3155v4l.c | 3 - drivers/staging/go7007/Kconfig | 4 +- drivers/staging/se401/Kconfig | 13 + drivers/staging/se401/Makefile | 1 + drivers/{media/video => staging/se401}/se401.c | 0 drivers/{media/video => staging/se401}/se401.h | 0 drivers/staging/stradis/Kconfig | 7 - drivers/staging/stradis/Makefile | 3 - drivers/staging/stradis/TODO | 6 - drivers/staging/stradis/stradis.c | 2222 ----------- drivers/staging/tm6000/Kconfig | 2 +- drivers/staging/tm6000/tm6000-cards.c | 7 - drivers/staging/tm6000/tm6000-core.c | 27 +- drivers/staging/tm6000/tm6000-i2c.c | 39 +- drivers/staging/tm6000/tm6000-input.c | 100 +- drivers/staging/tm6000/tm6000-video.c | 12 - drivers/staging/usbvideo/Kconfig | 15 + drivers/staging/usbvideo/Makefile | 2 + .../{media/video => staging}/usbvideo/usbvideo.c | 0 .../{media/video => staging}/usbvideo/usbvideo.h | 0 drivers/{media/video => staging}/usbvideo/vicam.c | 0 include/linux/input.h | 2 + include/linux/mfd/wl1273-core.h | 288 ++ include/linux/videodev.h | 22 +- include/media/ir-common.h | 107 - include/media/ir-core.h | 214 -- include/media/ir-kbd-i2c.h | 13 +- include/media/lirc_dev.h | 6 +- include/media/rc-core.h | 220 ++ include/media/rc-map.h | 44 +- include/media/si4713.h | 3 +- include/media/timb_radio.h | 1 - include/media/timb_video.h | 33 + include/media/v4l2-ioctl.h | 22 +- include/media/videobuf-core.h | 8 - 421 files changed, 14595 insertions(+), 25637 deletions(-) delete mode 100644 Documentation/video4linux/README.cpia delete mode 100644 drivers/input/misc/winbond-cir.c delete mode 100644 drivers/media/IR/ir-functions.c delete mode 100644 drivers/media/IR/ir-keytable.c delete mode 100644 drivers/media/IR/ir-sysfs.c delete mode 100644 drivers/media/IR/keymaps/rc-tbs-nec.c delete mode 100644 drivers/media/IR/rc-map.c create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c create mode 100644 drivers/media/dvb/frontends/mb86a20s.c create mode 100644 drivers/media/dvb/frontends/mb86a20s.h create mode 100644 drivers/media/dvb/frontends/s921.c create mode 100644 drivers/media/dvb/frontends/s921.h delete mode 100644 drivers/media/dvb/frontends/s921_core.c delete mode 100644 drivers/media/dvb/frontends/s921_core.h delete mode 100644 drivers/media/dvb/frontends/s921_module.c delete mode 100644 drivers/media/dvb/frontends/s921_module.h create mode 100644 drivers/media/radio/radio-wl1273.c rename drivers/media/{IR => rc}/Kconfig (75%) rename drivers/media/{IR => rc}/Makefile (78%) rename drivers/media/{IR => rc}/ene_ir.c (91%) rename drivers/media/{IR => rc}/ene_ir.h (99%) rename drivers/media/{IR => rc}/imon.c (96%) rename drivers/media/{IR => rc}/ir-jvc-decoder.c (91%) rename drivers/media/{IR => rc}/ir-lirc-codec.c (71%) rename drivers/media/{IR => rc}/ir-nec-decoder.c (92%) rename drivers/media/{IR/ir-raw-event.c => rc/ir-raw.c} (61%) rename drivers/media/{IR => rc}/ir-rc5-decoder.c (91%) rename drivers/media/{IR => rc}/ir-rc5-sz-decoder.c (88%) rename drivers/media/{IR => rc}/ir-rc6-decoder.c (92%) rename drivers/media/{IR => rc}/ir-sony-decoder.c (91%) rename drivers/media/{IR => rc}/keymaps/Kconfig (96%) rename drivers/media/{IR => rc}/keymaps/Makefile (97%) rename drivers/media/{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-anysee.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-apac-viewcomp.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-a16d.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-cardbus.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-dvbt.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m135a.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avertv-303.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-azurewave-ad-tu700.c (93%) rename drivers/media/{IR => rc}/keymaps/rc-behold-columbus.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-behold.c (68%) rename drivers/media/{IR => rc}/keymaps/rc-budget-ci-old.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-cinergy.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c (93%) rename drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c (96%) rename drivers/media/{IR => rc}/keymaps/rc-digitalnow-tinytwin.c (93%) rename drivers/media/{IR => rc}/keymaps/rc-digittrade.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-em-terratec.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv-fm53.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv2.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c (85%) rename drivers/media/{IR => rc}/keymaps/rc-eztv.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-flydvb.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-flyvideo.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-gadmei-rm008z.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-gotview7135.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-hauppauge-new.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-imon-mce.c (95%) rename drivers/media/{IR => rc}/keymaps/rc-imon-pad.c (95%) rename drivers/media/{IR => rc}/keymaps/rc-iodata-bctv7e.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-kaiomy.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-lirc.c (79%) rename drivers/media/{IR => rc}/keymaps/rc-lme2510.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-manli.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-ii.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-iii.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-nebula.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-nec-terratec-cinergy-xs.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-norwood.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-npgtech.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-color.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-grey.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c (86%) create mode 100644 drivers/media/rc/keymaps/rc-pixelview-002t.c rename drivers/media/{IR => rc}/keymaps/rc-pixelview-mk12.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-pixelview-new.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-pixelview.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-powercolor-real-angel.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-purpletv.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-pv951.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-rc5-hauppauge-new.c (70%) rename drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-real-audio-220-32-keys.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-streamzap.c (91%) create mode 100644 drivers/media/rc/keymaps/rc-tbs-nec.c create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c rename drivers/media/{IR => rc}/keymaps/rc-terratec-cinergy-xs.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-terratec-slim.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-total-media-in-hand.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-trekstor.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-tt-1500.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-videomate-s350.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-winfast.c (92%) rename drivers/media/{IR => rc}/lirc_dev.c (98%) rename drivers/media/{IR => rc}/mceusb.c (94%) rename drivers/media/{IR => rc}/nuvoton-cir.c (95%) rename drivers/media/{IR => rc}/nuvoton-cir.h (99%) rename drivers/media/{IR/ir-core-priv.h => rc/rc-core-priv.h} (83%) create mode 100644 drivers/media/rc/rc-loopback.c create mode 100644 drivers/media/rc/rc-main.c rename drivers/media/{IR => rc}/streamzap.c (91%) create mode 100644 drivers/media/rc/winbond-cir.c create mode 100644 drivers/media/video/cx231xx/cx231xx-input.c create mode 100644 drivers/media/video/timblogiw.c delete mode 100644 drivers/media/video/usbvideo/Kconfig delete mode 100644 drivers/media/video/usbvideo/Makefile delete mode 100644 drivers/media/video/usbvideo/ibmcam.c delete mode 100644 drivers/media/video/usbvideo/konicawc.c delete mode 100644 drivers/media/video/usbvideo/ultracam.c delete mode 100644 drivers/media/video/v4l1-compat.c create mode 100644 drivers/mfd/wl1273-core.c delete mode 100644 drivers/staging/cpia/Kconfig delete mode 100644 drivers/staging/cpia/Makefile delete mode 100644 drivers/staging/cpia/TODO delete mode 100644 drivers/staging/cpia/cpia.c delete mode 100644 drivers/staging/cpia/cpia.h delete mode 100644 drivers/staging/cpia/cpia_pp.c delete mode 100644 drivers/staging/cpia/cpia_usb.c create mode 100644 drivers/staging/se401/Kconfig create mode 100644 drivers/staging/se401/Makefile rename drivers/{media/video => staging/se401}/se401.c (100%) rename drivers/{media/video => staging/se401}/se401.h (100%) delete mode 100644 drivers/staging/stradis/Kconfig delete mode 100644 drivers/staging/stradis/Makefile delete mode 100644 drivers/staging/stradis/TODO delete mode 100644 drivers/staging/stradis/stradis.c create mode 100644 drivers/staging/usbvideo/Kconfig create mode 100644 drivers/staging/usbvideo/Makefile rename drivers/{media/video => staging}/usbvideo/usbvideo.c (100%) rename drivers/{media/video => staging}/usbvideo/usbvideo.h (100%) rename drivers/{media/video => staging}/usbvideo/vicam.c (100%) create mode 100644 include/linux/mfd/wl1273-core.h delete mode 100644 include/media/ir-common.h delete mode 100644 include/media/ir-core.h create mode 100644 include/media/rc-core.h create mode 100644 include/media/timb_video.h Merging kbuild/for-next $ git merge kbuild/for-next Auto-merging Makefile Auto-merging scripts/tags.sh Merge made by recursive. Documentation/coccinelle.txt | 4 + Documentation/kbuild/kbuild.txt | 8 ++ Documentation/kbuild/kconfig-language.txt | 7 +- Documentation/make/headers_install.txt | 5 +- Makefile | 1 + include/linux/Kbuild | 9 ++- kernel/Makefile | 2 +- scripts/.gitignore | 1 + scripts/basic/fixdep.c | 119 ++++++++++++++++------------ scripts/checksyscalls.sh | 4 +- scripts/coccinelle/misc/doubleinit.cocci | 6 +- scripts/coccinelle/null/deref_null.cocci | 39 ++++------ scripts/config | 13 +++- scripts/genksyms/parse.c_shipped | 2 +- scripts/genksyms/parse.y | 2 +- scripts/headers.sh | 2 +- scripts/headers_check.pl | 6 +- scripts/headers_install.pl | 7 ++ scripts/kconfig/conf.c | 2 - scripts/kconfig/confdata.c | 27 ++----- scripts/kconfig/expr.c | 44 ++++++++++- scripts/kconfig/expr.h | 3 +- scripts/kconfig/lkc.h | 7 +- scripts/kconfig/menu.c | 15 +++- scripts/kconfig/nconf.c | 2 +- scripts/kconfig/symbol.c | 8 ++- scripts/mod/modpost.c | 1 + scripts/package/builddeb | 44 ++++++++++- scripts/tags.sh | 2 +- usr/gen_init_cpio.c | 8 ++ 30 files changed, 268 insertions(+), 132 deletions(-) Merging kconfig/for-next $ git merge kconfig/for-next Already up-to-date! Merge made by recursive. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Auto-merging drivers/ata/Kconfig Auto-merging drivers/ata/Makefile Auto-merging drivers/scsi/ipr.c Merge made by recursive. drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 1 + drivers/ata/acard-ahci.c | 528 +++++++++++++++++++++++++++++++++++ drivers/ata/ahci.h | 3 + drivers/ata/libahci.c | 11 +- drivers/ata/libata-scsi.c | 60 ++--- drivers/scsi/ipr.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 3 +- include/linux/libata.h | 6 +- 9 files changed, 574 insertions(+), 48 deletions(-) create mode 100644 drivers/ata/acard-ahci.c Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Merge made by recursive. Documentation/ABI/stable/thermal-notification | 4 + Documentation/IPMI.txt | 27 + Documentation/acpi/apei/output_format.txt | 122 +++++ Documentation/thermal/sysfs-api.txt | 12 + arch/ia64/include/asm/io.h | 5 + drivers/acpi/Kconfig | 11 + drivers/acpi/Makefile | 1 + drivers/acpi/acpi_ipmi.c | 525 +++++++++++++++++++ drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/acpica/acevents.h | 21 +- drivers/acpi/acpica/acglobal.h | 7 +- drivers/acpi/acpica/achware.h | 2 +- drivers/acpi/acpica/aclocal.h | 13 +- drivers/acpi/acpica/evevent.c | 12 +- drivers/acpi/acpica/evgpe.c | 265 +++++++---- drivers/acpi/acpica/evgpeblk.c | 33 +- drivers/acpi/acpica/evgpeinit.c | 25 +- drivers/acpi/acpica/evgpeutil.c | 39 ++ drivers/acpi/acpica/evxface.c | 77 +++- drivers/acpi/acpica/evxfevnt.c | 600 ---------------------- drivers/acpi/acpica/evxfgpe.c | 669 +++++++++++++++++++++++++ drivers/acpi/acpica/hwgpe.c | 32 +- drivers/acpi/acpica/utglobal.c | 3 +- drivers/acpi/apei/apei-internal.h | 2 + drivers/acpi/apei/cper.c | 311 ++++++++++++ drivers/acpi/apei/ghes.c | 25 +- drivers/acpi/bus.c | 153 +++--- drivers/acpi/dock.c | 2 +- drivers/acpi/ec.c | 3 +- drivers/acpi/fan.c | 27 +- drivers/acpi/internal.h | 5 +- drivers/acpi/osl.c | 6 +- drivers/acpi/power.c | 90 ++-- drivers/acpi/scan.c | 33 +- drivers/acpi/sysfs.c | 19 +- drivers/acpi/thermal.c | 5 +- drivers/acpi/wakeup.c | 4 +- drivers/char/ipmi/ipmi_msghandler.c | 27 + drivers/char/ipmi/ipmi_si_intf.c | 23 +- drivers/platform/x86/fujitsu-laptop.c | 4 +- drivers/pnp/Makefile | 6 +- drivers/pnp/core.c | 7 +- drivers/pnp/isapnp/Makefile | 6 +- drivers/pnp/pnpacpi/Makefile | 3 +- drivers/pnp/pnpbios/Makefile | 5 +- drivers/thermal/thermal_sys.c | 120 ++++- include/acpi/acpi_bus.h | 5 +- include/acpi/acpixf.h | 20 +- include/acpi/actypes.h | 54 ++- include/linux/cper.h | 86 +++- include/linux/ipmi.h | 38 ++ include/linux/ipmi_smi.h | 8 + include/linux/thermal.h | 47 ++- 53 files changed, 2660 insertions(+), 991 deletions(-) create mode 100644 Documentation/ABI/stable/thermal-notification create mode 100644 Documentation/acpi/apei/output_format.txt create mode 100644 drivers/acpi/acpi_ipmi.c create mode 100644 drivers/acpi/acpica/evxfgpe.c Merging idle-test/idle-test $ git merge idle-test/idle-test Auto-merging drivers/idle/intel_idle.c Merge made by recursive. drivers/idle/intel_idle.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/Kconfig | 2 +- drivers/firewire/core-card.c | 6 +- drivers/firewire/core-cdev.c | 9 +- drivers/firewire/core-device.c | 30 +- drivers/firewire/core-transaction.c | 25 +- drivers/firewire/core.h | 6 +- drivers/firewire/net.c | 47 +++- drivers/firewire/nosy.c | 3 +- drivers/firewire/ohci.c | 614 +++++++++++++++++++++++------------ 9 files changed, 504 insertions(+), 238 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Auto-merging Documentation/kernel-parameters.txt Auto-merging mm/filemap.c Auto-merging mm/shmem.c Merge made by recursive. Documentation/kernel-parameters.txt | 3 + Documentation/kvm/api.txt | 178 ++++++++ Documentation/kvm/cpuid.txt | 3 + Documentation/kvm/msr.txt | 36 ++- arch/ia64/include/asm/kvm_host.h | 4 + arch/ia64/kvm/kvm-ia64.c | 30 +- arch/powerpc/kvm/book3s.c | 4 +- arch/powerpc/kvm/powerpc.c | 20 +- arch/s390/kvm/kvm-s390.c | 23 +- arch/x86/include/asm/kvm_emulate.h | 35 +- arch/x86/include/asm/kvm_host.h | 93 +++-- arch/x86/include/asm/kvm_para.h | 24 + arch/x86/include/asm/svm.h | 57 ++- arch/x86/include/asm/traps.h | 1 + arch/x86/include/asm/vmx.h | 15 + arch/x86/kernel/entry_32.S | 10 + arch/x86/kernel/entry_64.S | 3 + arch/x86/kernel/kvm.c | 317 +++++++++++++ arch/x86/kernel/kvmclock.c | 13 +- arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/emulate.c | 367 +++++++--------- arch/x86/kvm/kvm_cache_regs.h | 15 + arch/x86/kvm/lapic.c | 3 +- arch/x86/kvm/mmu.c | 219 ++++++--- arch/x86/kvm/paging_tmpl.h | 146 ++++--- arch/x86/kvm/svm.c | 852 ++++++++++++++++++++++------------- arch/x86/kvm/trace.h | 17 +- arch/x86/kvm/vmx.c | 125 ++++-- arch/x86/kvm/x86.c | 450 ++++++++++++++----- fs/ncpfs/mmap.c | 2 + include/linux/kvm.h | 1 + include/linux/kvm_host.h | 101 ++++- include/linux/kvm_types.h | 7 + include/linux/mm.h | 5 + include/trace/events/kvm.h | 121 +++++ mm/filemap.c | 3 + mm/memory.c | 31 ++- mm/shmem.c | 8 +- virt/kvm/Kconfig | 3 + virt/kvm/assigned-dev.c | 125 ++---- virt/kvm/async_pf.c | 216 +++++++++ virt/kvm/async_pf.h | 36 ++ virt/kvm/eventfd.c | 91 ++++- virt/kvm/irq_comm.c | 7 +- virt/kvm/kvm_main.c | 342 +++++++++++---- 46 files changed, 3037 insertions(+), 1129 deletions(-) create mode 100644 virt/kvm/async_pf.c create mode 100644 virt/kvm/async_pf.h Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/lowcomms.c | 63 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 50 insertions(+), 13 deletions(-) Merging swiotlb/master $ git merge swiotlb/master Already up-to-date. Merging ibft/master $ git merge ibft/master Already up-to-date. Merging scsi/master $ git merge scsi/master Auto-merging drivers/s390/scsi/zfcp_qdio.c Removing drivers/scsi/bfa/bfa_cb_ioim.h Removing drivers/scsi/bfa/bfa_drv.c Removing drivers/scsi/bfa/bfa_os_inc.h Auto-merging drivers/scsi/ipr.c Auto-merging drivers/scsi/scsi_lib.c Merge made by recursive. Documentation/scsi/ChangeLog.megaraid_sas | 22 + drivers/s390/scsi/zfcp_aux.c | 9 +- drivers/s390/scsi/zfcp_ccw.c | 14 +- drivers/s390/scsi/zfcp_cfdc.c | 8 +- drivers/s390/scsi/zfcp_dbf.c | 1177 +++-------- drivers/s390/scsi/zfcp_dbf.h | 497 +++--- drivers/s390/scsi/zfcp_erp.c | 141 +- drivers/s390/scsi/zfcp_ext.h | 52 +- drivers/s390/scsi/zfcp_fc.c | 20 +- drivers/s390/scsi/zfcp_fsf.c | 113 +- drivers/s390/scsi/zfcp_qdio.c | 10 +- drivers/s390/scsi/zfcp_scsi.c | 43 +- drivers/s390/scsi/zfcp_sysfs.c | 9 +- drivers/scsi/bfa/Makefile | 2 +- drivers/scsi/bfa/bfa.h | 30 +- drivers/scsi/bfa/bfa_cb_ioim.h | 169 -- drivers/scsi/bfa/bfa_core.c | 341 +--- drivers/scsi/bfa/bfa_cs.h | 51 +- drivers/scsi/bfa/bfa_defs.h | 6 +- drivers/scsi/bfa/bfa_defs_svc.h | 8 +- drivers/scsi/bfa/bfa_drv.c | 107 - drivers/scsi/bfa/bfa_fc.h | 85 +- drivers/scsi/bfa/bfa_fcbuild.c | 109 +- drivers/scsi/bfa/bfa_fcbuild.h | 30 +- drivers/scsi/bfa/bfa_fcpim.c | 635 ++----- drivers/scsi/bfa/bfa_fcpim.h | 188 +- drivers/scsi/bfa/bfa_fcs.c | 200 +-- drivers/scsi/bfa/bfa_fcs.h | 124 +- drivers/scsi/bfa/bfa_fcs_fcpim.c | 20 +- drivers/scsi/bfa/bfa_fcs_lport.c | 370 ++-- drivers/scsi/bfa/bfa_fcs_rport.c | 226 +-- drivers/scsi/bfa/bfa_hw_cb.c | 1 + drivers/scsi/bfa/bfa_hw_ct.c | 1 + drivers/scsi/bfa/bfa_ioc.c | 711 +++---- drivers/scsi/bfa/bfa_ioc.h | 53 +- drivers/scsi/bfa/bfa_ioc_cb.c | 100 +- drivers/scsi/bfa/bfa_ioc_ct.c | 116 +- drivers/scsi/bfa/bfa_modules.h | 3 - drivers/scsi/bfa/bfa_os_inc.h | 143 -- drivers/scsi/bfa/bfa_plog.h | 4 - drivers/scsi/bfa/bfa_port.c | 33 +- drivers/scsi/bfa/bfa_port.h | 1 - drivers/scsi/bfa/bfa_svc.c | 636 ++----- drivers/scsi/bfa/bfa_svc.h | 63 +- drivers/scsi/bfa/bfad.c | 35 +- drivers/scsi/bfa/bfad_attr.c | 18 +- drivers/scsi/bfa/bfad_debugfs.c | 46 +- drivers/scsi/bfa/bfad_drv.h | 45 +- drivers/scsi/bfa/bfad_im.c | 52 +- drivers/scsi/bfa/bfad_im.h | 16 +- drivers/scsi/bfa/bfi.h | 8 +- drivers/scsi/bfa/bfi_cbreg.h | 1 + drivers/scsi/bfa/bfi_ctreg.h | 41 +- drivers/scsi/bfa/bfi_ms.h | 66 +- drivers/scsi/bnx2i/57xx_iscsi_constants.h | 3 +- drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 3 +- drivers/scsi/bnx2i/bnx2i.h | 15 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 96 +- drivers/scsi/bnx2i/bnx2i_init.c | 108 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 148 +- drivers/scsi/bnx2i/bnx2i_sysfs.c | 3 +- drivers/scsi/device_handler/scsi_dh.c | 11 +- drivers/scsi/fcoe/fcoe.c | 4 +- drivers/scsi/fcoe/libfcoe.c | 300 +++- drivers/scsi/hpsa.c | 11 - drivers/scsi/hpsa.h | 1 - drivers/scsi/ibmvscsi/ibmvfc.c | 28 +- drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- drivers/scsi/ipr.c | 54 +- drivers/scsi/ipr.h | 2 + drivers/scsi/libfc/fc_exch.c | 48 +- drivers/scsi/libfc/fc_fcp.c | 147 +- drivers/scsi/libfc/fc_libfc.h | 16 +- drivers/scsi/libfc/fc_lport.c | 16 +- drivers/scsi/libfc/fc_rport.c | 3 +- drivers/scsi/libiscsi.c | 3 +- drivers/scsi/libsas/sas_port.c | 18 +- drivers/scsi/lpfc/lpfc.h | 26 +- drivers/scsi/lpfc/lpfc_attr.c | 104 +- drivers/scsi/lpfc/lpfc_bsg.c | 65 +- drivers/scsi/lpfc/lpfc_crtn.h | 19 +- drivers/scsi/lpfc/lpfc_ct.c | 48 +- drivers/scsi/lpfc/lpfc_disc.h | 19 +- drivers/scsi/lpfc/lpfc_els.c | 327 +++- drivers/scsi/lpfc/lpfc_hbadisc.c | 239 ++- drivers/scsi/lpfc/lpfc_hw.h | 222 +- drivers/scsi/lpfc/lpfc_hw4.h | 292 ++- drivers/scsi/lpfc/lpfc_init.c | 1062 +++++++--- drivers/scsi/lpfc/lpfc_logmsg.h | 2 +- drivers/scsi/lpfc/lpfc_mbox.c | 76 +- drivers/scsi/lpfc/lpfc_mem.c | 10 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 16 +- drivers/scsi/lpfc/lpfc_scsi.c | 82 +- drivers/scsi/lpfc/lpfc_sli.c | 660 +++++- drivers/scsi/lpfc/lpfc_sli.h | 5 +- drivers/scsi/lpfc/lpfc_sli4.h | 58 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 10 +- drivers/scsi/megaraid/Makefile | 2 + drivers/scsi/megaraid/megaraid_sas.h | 78 +- .../{megaraid_sas.c => megaraid_sas_base.c} | 777 +++++--- drivers/scsi/megaraid/megaraid_sas_fp.c | 516 +++++ drivers/scsi/megaraid/megaraid_sas_fusion.c | 2248 ++++++++++++++++++++ drivers/scsi/megaraid/megaraid_sas_fusion.h | 695 ++++++ drivers/scsi/mpt2sas/mpi/mpi2.h | 9 +- drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 20 +- drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 3 + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 9 +- drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +- drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 6 +- drivers/scsi/mpt2sas/mpi/mpi2_sas.h | 9 +- drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 49 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 199 ++- drivers/scsi/mpt2sas/mpt2sas_base.h | 27 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 2 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 343 ++-- drivers/scsi/mpt2sas/mpt2sas_transport.c | 185 ++- drivers/scsi/qla2xxx/qla_attr.c | 27 + drivers/scsi/qla2xxx/qla_bsg.c | 6 +- drivers/scsi/qla2xxx/qla_def.h | 4 + drivers/scsi/qla2xxx/qla_gbl.h | 8 +- drivers/scsi/qla2xxx/qla_init.c | 89 +- drivers/scsi/qla2xxx/qla_isr.c | 2 + drivers/scsi/qla2xxx/qla_mbx.c | 67 +- drivers/scsi/qla2xxx/qla_nx.c | 217 ++- drivers/scsi/qla2xxx/qla_nx.h | 2 - drivers/scsi/qla2xxx/qla_os.c | 63 +- drivers/scsi/qla2xxx/qla_sup.c | 11 +- drivers/scsi/qla4xxx/ql4_dbg.c | 2 +- drivers/scsi/qla4xxx/ql4_dbg.h | 2 +- drivers/scsi/qla4xxx/ql4_def.h | 5 +- drivers/scsi/qla4xxx/ql4_fw.h | 2 +- drivers/scsi/qla4xxx/ql4_glbl.h | 2 +- drivers/scsi/qla4xxx/ql4_init.c | 2 +- drivers/scsi/qla4xxx/ql4_inline.h | 2 +- drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- drivers/scsi/qla4xxx/ql4_isr.c | 9 +- drivers/scsi/qla4xxx/ql4_mbx.c | 22 +- drivers/scsi/qla4xxx/ql4_nvram.c | 2 +- drivers/scsi/qla4xxx/ql4_nvram.h | 2 +- drivers/scsi/qla4xxx/ql4_nx.c | 62 +- drivers/scsi/qla4xxx/ql4_nx.h | 6 +- drivers/scsi/qla4xxx/ql4_os.c | 30 +- drivers/scsi/qla4xxx/ql4_version.h | 4 +- drivers/scsi/scsi_debug.c | 1 + drivers/scsi/scsi_error.c | 61 +- drivers/scsi/scsi_lib.c | 5 +- drivers/scsi/scsi_transport_iscsi.c | 1 + drivers/scsi/sd.c | 99 +- drivers/scsi/st.c | 7 +- include/scsi/libfc.h | 10 +- include/scsi/libfcoe.h | 8 + include/scsi/libiscsi.h | 1 + include/scsi/libsas.h | 2 + include/scsi/scsi.h | 28 + 155 files changed, 10860 insertions(+), 6593 deletions(-) delete mode 100644 drivers/scsi/bfa/bfa_cb_ioim.h delete mode 100644 drivers/scsi/bfa/bfa_drv.c delete mode 100644 drivers/scsi/bfa/bfa_os_inc.h rename drivers/scsi/megaraid/{megaraid_sas.c => megaraid_sas_base.c} (90%) create mode 100644 drivers/scsi/megaraid/megaraid_sas_fp.c create mode 100644 drivers/scsi/megaraid/megaraid_sas_fusion.c create mode 100644 drivers/scsi/megaraid/megaraid_sas_fusion.h Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/fsldma.c Merge made by recursive. drivers/dma/fsldma.c | 4 +++- drivers/dma/intel_mid_dma.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 10 deletions(-) Merging net/master $ git merge net/master Resolved 'net/9p/protocol.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/mach-omap2/board-omap3pandora.c Auto-merging drivers/net/myri10ge/myri10ge.c Auto-merging drivers/net/sfc/falcon.c Auto-merging drivers/net/skge.c Removing drivers/net/wireless/ath/debug.h Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c Removing drivers/net/wireless/wl12xx/wl1271_debugfs.c Auto-merging drivers/s390/net/lcs.c Auto-merging drivers/s390/net/qeth_core_main.c Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c Removing firmware/bnx2x/bnx2x-e1-6.0.34.0.fw.ihex Removing firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw.ihex Removing firmware/bnx2x/bnx2x-e2-6.0.34.0.fw.ihex Removing include/net/tipc/tipc.h Removing include/net/tipc/tipc_bearer.h Removing include/net/tipc/tipc_msg.h Removing include/net/tipc/tipc_port.h Auto-merging net/9p/protocol.c CONFLICT (content): Merge conflict in net/9p/protocol.c Auto-merging net/socket.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 517be10] Merge remote branch 'net/master' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-class-net-batman-adv | 14 + Documentation/ABI/testing/sysfs-class-net-mesh | 69 + Documentation/DocBook/80211.tmpl | 70 +- Documentation/networking/LICENSE.qlcnic | 327 + Documentation/networking/batman-adv.txt | 240 + Documentation/networking/dccp.txt | 20 + Documentation/networking/e100.txt | 19 +- Documentation/networking/e1000.txt | 16 +- Documentation/networking/e1000e.txt | 52 +- Documentation/networking/igb.txt | 35 +- Documentation/networking/igbvf.txt | 6 +- Documentation/networking/ip-sysctl.txt | 28 +- Documentation/networking/ixgb.txt | 10 +- Documentation/networking/ixgbe.txt | 213 +- Documentation/networking/ixgbevf.txt | 4 - Documentation/networking/stmmac.txt | 48 +- MAINTAINERS | 27 + arch/arm/mach-omap2/board-omap3pandora.c | 32 +- arch/s390/include/asm/qeth.h | 51 +- drivers/atm/fore200e.c | 2 +- drivers/atm/lanai.c | 7 +- drivers/block/aoe/aoecmd.c | 6 +- drivers/infiniband/core/addr.c | 14 +- drivers/infiniband/hw/mlx4/main.c | 6 +- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 +- drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- drivers/isdn/hisax/avm_pci.c | 2 +- drivers/isdn/hisax/callc.c | 4 +- drivers/isdn/hisax/config.c | 2 +- drivers/isdn/hisax/hfc_2bds0.c | 4 +- drivers/isdn/hisax/hfc_2bs0.c | 2 +- drivers/isdn/hisax/hfc_pci.c | 4 +- drivers/isdn/hisax/hfc_sx.c | 6 +- drivers/isdn/hisax/hisax.h | 2 + drivers/isdn/hisax/ipacx.c | 2 +- drivers/isdn/hisax/isar.c | 15 +- drivers/isdn/hisax/isdnl1.h | 1 + drivers/isdn/hisax/isdnl3.c | 2 +- drivers/isdn/hisax/netjet.c | 10 +- drivers/isdn/hisax/st5481_d.c | 6 +- drivers/isdn/i4l/isdn_concap.c | 2 +- drivers/isdn/i4l/isdn_net.c | 20 +- drivers/isdn/i4l/isdn_ppp.c | 26 +- drivers/isdn/mISDN/layer1.c | 10 +- drivers/isdn/mISDN/layer2.c | 12 +- drivers/isdn/mISDN/tei.c | 23 +- drivers/net/3c501.c | 4 +- drivers/net/3c503.c | 4 +- drivers/net/3c507.c | 6 +- drivers/net/3c515.c | 2 +- drivers/net/3c527.c | 6 +- drivers/net/8139too.c | 3 +- drivers/net/82596.c | 2 +- drivers/net/Kconfig | 255 +- drivers/net/arm/am79c961a.c | 9 - drivers/net/arm/w90p910_ether.c | 2 +- drivers/net/at1700.c | 8 +- drivers/net/atarilance.c | 2 +- drivers/net/atl1c/atl1c_main.c | 2 +- drivers/net/atl1e/atl1e_main.c | 2 +- drivers/net/atlx/atl1.c | 2 +- drivers/net/atlx/atl2.c | 4 +- drivers/net/au1000_eth.c | 2 - drivers/net/ax88796.c | 8 +- drivers/net/bcm63xx_enet.c | 2 +- drivers/net/benet/be.h | 39 +- drivers/net/benet/be_cmds.c | 69 +- drivers/net/benet/be_cmds.h | 42 +- drivers/net/benet/be_ethtool.c | 4 +- drivers/net/benet/be_hw.h | 39 +- drivers/net/benet/be_main.c | 252 +- drivers/net/bna/bfa_defs.h | 22 +- drivers/net/bna/bfa_defs_mfg_comm.h | 22 - drivers/net/bna/bfa_ioc.c | 1237 ++- drivers/net/bna/bfa_ioc.h | 49 +- drivers/net/bna/bfa_ioc_ct.c | 102 +- drivers/net/bna/bfi_ctreg.h | 41 +- drivers/net/bna/bna.h | 6 +- drivers/net/bna/bna_ctrl.c | 377 +- drivers/net/bna/bna_txrx.c | 44 +- drivers/net/bna/bna_types.h | 11 +- drivers/net/bna/bnad.c | 427 +- drivers/net/bna/bnad.h | 31 +- drivers/net/bna/bnad_ethtool.c | 8 +- drivers/net/bnx2.c | 104 +- drivers/net/bnx2.h | 2 + drivers/net/bnx2x/Makefile | 2 +- drivers/net/bnx2x/bnx2x.h | 148 +- drivers/net/bnx2x/bnx2x_cmn.c | 155 +- drivers/net/bnx2x/bnx2x_cmn.h | 73 +- drivers/net/bnx2x/bnx2x_dcb.c | 1491 ++ drivers/net/bnx2x/bnx2x_dcb.h | 193 + drivers/net/bnx2x/bnx2x_ethtool.c | 357 +- drivers/net/bnx2x/bnx2x_hsi.h | 327 +- drivers/net/bnx2x/bnx2x_link.c | 666 +- drivers/net/bnx2x/bnx2x_link.h | 56 + drivers/net/bnx2x/bnx2x_main.c | 694 +- drivers/net/bnx2x/bnx2x_reg.h | 52 + drivers/net/bnx2x/bnx2x_stats.c | 13 +- drivers/net/bnx2x/bnx2x_stats.h | 2 - drivers/net/bonding/Makefile | 2 +- drivers/net/bonding/bond_3ad.c | 3 +- drivers/net/bonding/bond_alb.c | 36 - drivers/net/bonding/bond_alb.h | 38 + drivers/net/bonding/bond_debugfs.c | 146 + drivers/net/bonding/bond_main.c | 28 +- drivers/net/bonding/bonding.h | 11 +- drivers/net/can/Kconfig | 21 + drivers/net/can/Makefile | 1 + drivers/net/can/janz-ican3.c | 9 - drivers/net/can/mscan/mscan.c | 2 +- drivers/net/can/pch_can.c | 1350 +- drivers/net/can/sja1000/plx_pci.c | 2 +- drivers/net/can/sja1000/sja1000_of_platform.c | 8 +- drivers/net/can/slcan.c | 756 + drivers/net/cassini.c | 6 +- drivers/net/chelsio/sge.c | 10 +- drivers/net/cnic.c | 722 +- drivers/net/cnic.h | 27 +- drivers/net/cnic_defs.h | 2103 +++- drivers/net/cnic_if.h | 24 +- drivers/net/cris/eth_v10.c | 34 +- drivers/net/cxgb3/ael1002.c | 24 +- drivers/net/cxgb3/cxgb3_main.c | 6 +- drivers/net/cxgb3/cxgb3_offload.c | 6 +- drivers/net/cxgb3/t3_hw.c | 2 +- drivers/net/cxgb4/cxgb4.h | 4 +- drivers/net/cxgb4/cxgb4_main.c | 140 +- drivers/net/cxgb4/sge.c | 22 +- drivers/net/cxgb4/t4_hw.c | 93 +- drivers/net/cxgb4/t4fw_api.h | 1 + drivers/net/cxgb4vf/adapter.h | 2 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 32 +- drivers/net/cxgb4vf/sge.c | 9 +- drivers/net/cxgb4vf/t4vf_hw.c | 7 +- drivers/net/dm9000.c | 2 +- drivers/net/e1000/e1000_hw.c | 20 +- drivers/net/e1000/e1000_main.c | 18 +- drivers/net/e1000/e1000_param.c | 13 +- drivers/net/e1000e/82571.c | 189 +- drivers/net/e1000e/defines.h | 9 +- drivers/net/e1000e/e1000.h | 4 +- drivers/net/e1000e/es2lan.c | 8 +- drivers/net/e1000e/ethtool.c | 147 +- drivers/net/e1000e/ich8lan.c | 23 +- drivers/net/e1000e/lib.c | 141 +- drivers/net/e1000e/netdev.c | 107 +- drivers/net/e1000e/param.c | 2 +- drivers/net/e1000e/phy.c | 50 +- drivers/net/e2100.c | 2 +- drivers/net/eepro.c | 11 +- drivers/net/eexpress.c | 2 +- drivers/net/ehea/ehea.h | 15 - drivers/net/ehea/ehea_ethtool.c | 18 +- drivers/net/ehea/ehea_main.c | 433 +- drivers/net/ehea/ehea_phyp.c | 40 +- drivers/net/ehea/ehea_qmr.c | 89 +- drivers/net/enic/enic.h | 6 +- drivers/net/enic/enic_main.c | 247 +- drivers/net/enic/enic_res.h | 1 + drivers/net/enic/vnic_vic.h | 31 +- drivers/net/ethoc.c | 160 +- drivers/net/fec_mpc52xx.c | 19 +- drivers/net/forcedeth.c | 1134 +- drivers/net/gianfar.c | 10 +- drivers/net/hp.c | 6 +- drivers/net/ibm_newemac/core.c | 2 +- drivers/net/ibmveth.c | 7 +- drivers/net/ifb.c | 39 +- drivers/net/igb/e1000_82575.c | 37 +- drivers/net/igb/e1000_82575.h | 5 + drivers/net/igb/e1000_defines.h | 7 + drivers/net/igb/e1000_hw.h | 6 +- drivers/net/igb/e1000_nvm.c | 93 +- drivers/net/igb/e1000_nvm.h | 2 + drivers/net/igb/e1000_phy.c | 11 +- drivers/net/igb/e1000_regs.h | 1 + drivers/net/igb/igb.h | 1 + drivers/net/igb/igb_main.c | 100 +- drivers/net/igbvf/Makefile | 2 +- drivers/net/igbvf/defines.h | 2 +- drivers/net/igbvf/ethtool.c | 9 +- drivers/net/igbvf/igbvf.h | 4 +- drivers/net/igbvf/mbx.c | 2 +- drivers/net/igbvf/mbx.h | 2 +- drivers/net/igbvf/netdev.c | 33 +- drivers/net/igbvf/regs.h | 2 +- drivers/net/igbvf/vf.c | 6 +- drivers/net/igbvf/vf.h | 4 +- drivers/net/irda/act200l-sir.c | 2 +- drivers/net/irda/donauboe.c | 4 +- drivers/net/irda/mcs7780.c | 2 +- drivers/net/iseries_veth.c | 27 +- drivers/net/ixgb/ixgb_main.c | 61 +- drivers/net/ixgb/ixgb_param.c | 21 +- drivers/net/ixgbe/Makefile | 2 +- drivers/net/ixgbe/ixgbe.h | 122 +- drivers/net/ixgbe/ixgbe_82598.c | 58 +- drivers/net/ixgbe/ixgbe_82599.c | 138 +- drivers/net/ixgbe/ixgbe_common.c | 256 +- drivers/net/ixgbe/ixgbe_common.h | 10 +- drivers/net/ixgbe/ixgbe_dcb.c | 17 +- drivers/net/ixgbe/ixgbe_dcb.h | 3 +- drivers/net/ixgbe/ixgbe_dcb_82598.c | 12 +- drivers/net/ixgbe/ixgbe_dcb_82599.c | 12 +- drivers/net/ixgbe/ixgbe_dcb_nl.c | 55 +- drivers/net/ixgbe/ixgbe_ethtool.c | 297 +- drivers/net/ixgbe/ixgbe_fcoe.c | 15 +- drivers/net/ixgbe/ixgbe_main.c | 2085 ++-- drivers/net/ixgbe/ixgbe_mbx.c | 42 +- drivers/net/ixgbe/ixgbe_mbx.h | 2 +- drivers/net/ixgbe/ixgbe_phy.c | 52 + drivers/net/ixgbe/ixgbe_phy.h | 5 + drivers/net/ixgbe/ixgbe_sriov.c | 57 +- drivers/net/ixgbe/ixgbe_type.h | 45 +- drivers/net/ixgbe/ixgbe_x540.c | 724 + drivers/net/ixgbevf/Makefile | 2 +- drivers/net/ixgbevf/defines.h | 3 +- drivers/net/ixgbevf/ethtool.c | 18 +- drivers/net/ixgbevf/ixgbevf.h | 6 +- drivers/net/ixgbevf/ixgbevf_main.c | 27 +- drivers/net/ixgbevf/mbx.c | 2 +- drivers/net/ixgbevf/mbx.h | 2 +- drivers/net/ixgbevf/regs.h | 2 +- drivers/net/ixgbevf/vf.c | 8 +- drivers/net/ixgbevf/vf.h | 3 +- drivers/net/jme.c | 20 +- drivers/net/ks8851.c | 33 + drivers/net/ksz884x.c | 20 +- drivers/net/lance.c | 2 +- drivers/net/lib82596.c | 2 +- drivers/net/lib8390.c | 24 +- drivers/net/ll_temac_main.c | 2 +- drivers/net/macvlan.c | 113 +- drivers/net/macvtap.c | 3 +- drivers/net/mv643xx_eth.c | 9 +- drivers/net/myri10ge/myri10ge.c | 4 +- drivers/net/ne-h8300.c | 12 +- drivers/net/netxen/netxen_nic_hw.c | 16 +- drivers/net/netxen/netxen_nic_init.c | 7 +- drivers/net/netxen/netxen_nic_main.c | 6 +- drivers/net/ni52.c | 4 +- drivers/net/ni65.c | 4 +- drivers/net/niu.c | 4 +- drivers/net/pch_gbe/pch_gbe_ethtool.c | 19 +- drivers/net/pch_gbe/pch_gbe_main.c | 12 +- drivers/net/pcmcia/axnet_cs.c | 18 +- drivers/net/pcmcia/nmclan_cs.c | 2 +- drivers/net/phy/phy.c | 4 +- drivers/net/ppp_generic.c | 12 +- drivers/net/pptp.c | 5 +- drivers/net/pxa168_eth.c | 9 +- drivers/net/qla3xxx.c | 8 +- drivers/net/qlcnic/qlcnic.h | 43 +- drivers/net/qlcnic/qlcnic_ctx.c | 28 +- drivers/net/qlcnic/qlcnic_ethtool.c | 157 +- drivers/net/qlcnic/qlcnic_hdr.h | 27 +- drivers/net/qlcnic/qlcnic_hw.c | 91 +- drivers/net/qlcnic/qlcnic_init.c | 123 +- drivers/net/qlcnic/qlcnic_main.c | 89 +- drivers/net/qlge/qlge.h | 4 +- drivers/net/qlge/qlge_dbg.c | 21 +- drivers/net/qlge/qlge_ethtool.c | 19 +- drivers/net/qlge/qlge_main.c | 21 +- drivers/net/qlge/qlge_mpi.c | 2 +- drivers/net/r8169.c | 4 +- drivers/net/s2io.c | 79 +- drivers/net/s2io.h | 9 +- drivers/net/sc92031.c | 3 +- drivers/net/sfc/efx.c | 38 +- drivers/net/sfc/efx.h | 7 +- drivers/net/sfc/ethtool.c | 168 +- drivers/net/sfc/falcon.c | 183 +- drivers/net/sfc/falcon_boards.c | 120 +- drivers/net/sfc/falcon_xmac.c | 14 +- drivers/net/sfc/filter.c | 255 +- drivers/net/sfc/filter.h | 149 +- drivers/net/sfc/io.h | 153 +- drivers/net/sfc/mcdi.c | 3 +- drivers/net/sfc/mcdi_phy.c | 1 - drivers/net/sfc/mdio_10g.c | 1 - drivers/net/sfc/mtd.c | 98 +- drivers/net/sfc/net_driver.h | 87 +- drivers/net/sfc/nic.c | 90 +- drivers/net/sfc/nic.h | 12 +- drivers/net/sfc/qt202x_phy.c | 6 + drivers/net/sfc/rx.c | 30 +- drivers/net/sfc/siena.c | 10 +- drivers/net/sfc/spi.h | 5 + drivers/net/sfc/tenxpress.c | 2 - drivers/net/sfc/tx.c | 122 +- drivers/net/sh_eth.c | 245 +- drivers/net/sh_eth.h | 1 - drivers/net/sis190.c | 3 +- drivers/net/skfp/smt.c | 4 +- drivers/net/skge.c | 8 +- drivers/net/smc-ultra.c | 8 +- drivers/net/stmmac/stmmac.h | 40 +- drivers/net/stmmac/stmmac_ethtool.c | 16 +- drivers/net/stmmac/stmmac_main.c | 267 +- drivers/net/stmmac/stmmac_mdio.c | 8 +- drivers/net/sundance.c | 23 +- drivers/net/sungem.c | 14 +- drivers/net/sunhme.c | 2 +- drivers/net/sunlance.c | 10 +- drivers/net/tg3.c | 313 +- drivers/net/tg3.h | 42 +- drivers/net/tokenring/ibmtr.c | 5 +- drivers/net/tulip/de2104x.c | 18 +- drivers/net/tulip/tulip_core.c | 15 +- drivers/net/tun.c | 2 +- drivers/net/usb/Kconfig | 19 + drivers/net/usb/Makefile | 1 + drivers/net/usb/cdc_ncm.c | 1213 ++ drivers/net/usb/hso.c | 40 +- drivers/net/usb/ipheth.c | 2 +- drivers/net/usb/pegasus.c | 4 +- drivers/net/usb/sierra_net.c | 5 +- drivers/net/usb/smsc95xx.c | 7 +- drivers/net/usb/usbnet.c | 48 +- drivers/net/via-rhine.c | 326 +- drivers/net/virtio_net.c | 2 +- drivers/net/vmxnet3/vmxnet3_drv.c | 965 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 174 +- drivers/net/vmxnet3/vmxnet3_int.h | 73 +- drivers/net/vxge/vxge-config.c | 4360 +++--- drivers/net/vxge/vxge-config.h | 169 +- drivers/net/vxge/vxge-ethtool.c | 112 +- drivers/net/vxge/vxge-main.c | 1172 +- drivers/net/vxge/vxge-main.h | 86 +- drivers/net/vxge/vxge-reg.h | 33 +- drivers/net/vxge/vxge-traffic.c | 1451 +- drivers/net/vxge/vxge-traffic.h | 49 +- drivers/net/vxge/vxge-version.h | 33 +- drivers/net/wan/dscc4.c | 6 +- drivers/net/wd.c | 2 +- drivers/net/wimax/i2400m/driver.c | 96 +- drivers/net/wimax/i2400m/i2400m.h | 19 +- drivers/net/wimax/i2400m/sdio.c | 1 - drivers/net/wimax/i2400m/usb.c | 1 - drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/Makefile | 1 + drivers/net/wireless/ath/ar9170/cmd.c | 2 +- drivers/net/wireless/ath/ar9170/usb.c | 6 +- drivers/net/wireless/ath/ath.h | 111 + drivers/net/wireless/ath/ath5k/Kconfig | 18 +- drivers/net/wireless/ath/ath5k/Makefile | 2 + drivers/net/wireless/ath/ath5k/ahb.c | 219 + drivers/net/wireless/ath/ath5k/ani.c | 40 +- drivers/net/wireless/ath/ath5k/ath5k.h | 286 +- drivers/net/wireless/ath/ath5k/attach.c | 28 +- drivers/net/wireless/ath/ath5k/base.c | 926 +- drivers/net/wireless/ath/ath5k/base.h | 7 +- drivers/net/wireless/ath/ath5k/caps.c | 6 - drivers/net/wireless/ath/ath5k/debug.c | 34 +- drivers/net/wireless/ath/ath5k/debug.h | 2 + drivers/net/wireless/ath/ath5k/desc.c | 24 +- drivers/net/wireless/ath/ath5k/desc.h | 18 +- drivers/net/wireless/ath/ath5k/dma.c | 180 +- drivers/net/wireless/ath/ath5k/eeprom.c | 127 +- drivers/net/wireless/ath/ath5k/eeprom.h | 2 +- drivers/net/wireless/ath/ath5k/initvals.c | 409 +- drivers/net/wireless/ath/ath5k/led.c | 11 +- drivers/net/wireless/ath/ath5k/pci.c | 327 + drivers/net/wireless/ath/ath5k/pcu.c | 571 +- drivers/net/wireless/ath/ath5k/phy.c | 676 +- drivers/net/wireless/ath/ath5k/qcu.c | 696 +- drivers/net/wireless/ath/ath5k/reg.h | 31 +- drivers/net/wireless/ath/ath5k/reset.c | 1221 +- drivers/net/wireless/ath/ath5k/rfbuffer.h | 1169 +- drivers/net/wireless/ath/ath5k/sysfs.c | 4 +- drivers/net/wireless/ath/ath9k/ahb.c | 7 +- drivers/net/wireless/ath/ath9k/ani.c | 107 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 305 +- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 220 +- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 25 +- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 144 +- drivers/net/wireless/ath/ath9k/ar9002_phy.c | 20 +- .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 104 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 605 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3250 ++++- drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 73 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 289 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 112 +- drivers/net/wireless/ath/ath9k/ar9003_mac.h | 6 +- drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 166 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 344 +- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 78 +- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 943 ++ drivers/net/wireless/ath/ath9k/ath9k.h | 64 +- drivers/net/wireless/ath/ath9k/beacon.c | 107 +- drivers/net/wireless/ath/ath9k/btcoex.c | 23 - drivers/net/wireless/ath/ath9k/btcoex.h | 1 - drivers/net/wireless/ath/ath9k/calib.c | 59 +- drivers/net/wireless/ath/ath9k/common.c | 19 +- drivers/net/wireless/ath/ath9k/common.h | 15 +- drivers/net/wireless/ath/ath9k/debug.c | 83 +- drivers/net/wireless/ath/ath9k/debug.h | 21 +- drivers/net/wireless/ath/ath9k/eeprom.c | 219 +- drivers/net/wireless/ath/ath9k/eeprom.h | 61 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 302 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 295 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 353 +- drivers/net/wireless/ath/ath9k/gpio.c | 30 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 183 +- drivers/net/wireless/ath/ath9k/hif_usb.h | 2 + drivers/net/wireless/ath/ath9k/htc.h | 4 +- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 24 +- drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 15 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 104 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 208 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 44 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +- drivers/net/wireless/ath/ath9k/htc_hst.h | 22 +- drivers/net/wireless/ath/ath9k/hw-ops.h | 5 - drivers/net/wireless/ath/ath9k/hw.c | 296 +- drivers/net/wireless/ath/ath9k/hw.h | 77 +- drivers/net/wireless/ath/ath9k/init.c | 162 +- drivers/net/wireless/ath/ath9k/mac.c | 201 +- drivers/net/wireless/ath/ath9k/mac.h | 14 +- drivers/net/wireless/ath/ath9k/main.c | 588 +- drivers/net/wireless/ath/ath9k/pci.c | 97 +- drivers/net/wireless/ath/ath9k/phy.h | 1 + drivers/net/wireless/ath/ath9k/rc.c | 80 +- drivers/net/wireless/ath/ath9k/rc.h | 6 - drivers/net/wireless/ath/ath9k/recv.c | 110 +- drivers/net/wireless/ath/ath9k/reg.h | 30 +- drivers/net/wireless/ath/ath9k/virtual.c | 16 +- drivers/net/wireless/ath/ath9k/wmi.c | 12 +- drivers/net/wireless/ath/ath9k/xmit.c | 836 +- drivers/net/wireless/ath/carl9170/carl9170.h | 5 +- drivers/net/wireless/ath/carl9170/cmd.c | 2 +- drivers/net/wireless/ath/carl9170/fwcmd.h | 13 +- drivers/net/wireless/ath/carl9170/hw.h | 7 +- drivers/net/wireless/ath/carl9170/mac.c | 56 +- drivers/net/wireless/ath/carl9170/main.c | 19 +- drivers/net/wireless/ath/carl9170/phy.c | 17 +- drivers/net/wireless/ath/carl9170/phy.h | 24 +- drivers/net/wireless/ath/carl9170/tx.c | 80 +- drivers/net/wireless/ath/carl9170/usb.c | 5 +- drivers/net/wireless/ath/carl9170/version.h | 6 +- drivers/net/wireless/ath/debug.c | 15 - drivers/net/wireless/ath/debug.h | 90 - drivers/net/wireless/ath/key.c | 39 +- drivers/net/wireless/ath/main.c | 20 + drivers/net/wireless/ath/regd.c | 8 + drivers/net/wireless/atmel.c | 6 +- drivers/net/wireless/b43/Kconfig | 13 +- drivers/net/wireless/b43/Makefile | 8 +- drivers/net/wireless/b43/b43.h | 21 +- drivers/net/wireless/b43/dma.c | 5 - drivers/net/wireless/b43/main.c | 56 +- drivers/net/wireless/b43/phy_common.c | 22 +- drivers/net/wireless/b43/phy_common.h | 8 + drivers/net/wireless/b43/phy_n.c | 464 +- drivers/net/wireless/b43/phy_n.h | 2 +- drivers/net/wireless/b43/radio_2055.c | 502 +- drivers/net/wireless/b43/radio_2056.c | 6019 ++++++++ drivers/net/wireless/b43/radio_2056.h | 1081 ++- drivers/net/wireless/b43/rfkill.c | 19 +- drivers/net/wireless/b43/tables_nphy.c | 228 +- drivers/net/wireless/b43legacy/main.c | 47 +- drivers/net/wireless/b43legacy/rfkill.c | 2 +- drivers/net/wireless/hostap/hostap_ap.c | 3 + drivers/net/wireless/hostap/hostap_hw.c | 8 +- drivers/net/wireless/iwlwifi/Kconfig | 3 + drivers/net/wireless/iwlwifi/Makefile | 11 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 99 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 35 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 8 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 369 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 140 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 482 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 230 +- drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 3 + drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 345 +- drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 5 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 116 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 38 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 642 + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 32 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 160 +- drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 69 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 594 +- drivers/net/wireless/iwlwifi/iwl-agn.h | 61 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 26 +- drivers/net/wireless/iwlwifi/iwl-core.c | 971 +- drivers/net/wireless/iwlwifi/iwl-core.h | 96 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 2 + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 40 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 23 +- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 25 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 66 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 45 +- drivers/net/wireless/iwlwifi/iwl-led.c | 12 +- drivers/net/wireless/iwlwifi/iwl-led.h | 6 +- drivers/net/wireless/iwlwifi/iwl-legacy.c | 662 + drivers/net/wireless/iwlwifi/iwl-legacy.h | 79 + drivers/net/wireless/iwlwifi/iwl-power.c | 190 +- drivers/net/wireless/iwlwifi/iwl-power.h | 3 + drivers/net/wireless/iwlwifi/iwl-prph.h | 2 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 47 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 14 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 64 +- drivers/net/wireless/iwlwifi/iwl-sta.h | 1 + drivers/net/wireless/iwlwifi/iwl-tx.c | 64 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 88 +- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 3 +- drivers/net/wireless/iwmc3200wifi/commands.c | 2 +- drivers/net/wireless/libertas/cfg.c | 7 +- drivers/net/wireless/libertas/cmd.c | 8 + drivers/net/wireless/libertas/dev.h | 1 + drivers/net/wireless/libertas/if_usb.c | 13 +- drivers/net/wireless/libertas/main.c | 3 +- drivers/net/wireless/libertas/rx.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 5 +- drivers/net/wireless/mwl8k.c | 670 +- drivers/net/wireless/orinoco/wext.c | 8 + drivers/net/wireless/p54/p54usb.c | 2 +- drivers/net/wireless/ray_cs.c | 18 +- drivers/net/wireless/rndis_wlan.c | 210 +- drivers/net/wireless/rt2x00/Kconfig | 72 +- drivers/net/wireless/rt2x00/rt2400pci.c | 144 +- drivers/net/wireless/rt2x00/rt2400pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500pci.c | 150 +- drivers/net/wireless/rt2x00/rt2500pci.h | 4 +- drivers/net/wireless/rt2x00/rt2500usb.c | 98 +- drivers/net/wireless/rt2x00/rt2800.h | 218 +- drivers/net/wireless/rt2x00/rt2800lib.c | 223 +- drivers/net/wireless/rt2x00/rt2800lib.h | 2 + drivers/net/wireless/rt2x00/rt2800pci.c | 196 +- drivers/net/wireless/rt2x00/rt2800pci.h | 12 +- drivers/net/wireless/rt2x00/rt2800usb.c | 355 +- drivers/net/wireless/rt2x00/rt2800usb.h | 4 +- drivers/net/wireless/rt2x00/rt2x00.h | 88 +- drivers/net/wireless/rt2x00/rt2x00config.c | 6 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 15 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 70 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 12 +- drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 28 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 9 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 270 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 74 +- drivers/net/wireless/rt2x00/rt2x00reg.h | 4 - drivers/net/wireless/rt2x00/rt2x00soc.c | 6 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 305 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 12 +- drivers/net/wireless/rt2x00/rt61pci.c | 185 +- drivers/net/wireless/rt2x00/rt61pci.h | 64 +- drivers/net/wireless/rt2x00/rt73usb.c | 107 +- drivers/net/wireless/rt2x00/rt73usb.h | 38 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 140 +- drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 22 - drivers/net/wireless/rtlwifi/Kconfig | 15 + drivers/net/wireless/rtlwifi/Makefile | 13 + drivers/net/wireless/rtlwifi/base.c | 958 ++ drivers/net/wireless/rtlwifi/base.h | 120 + drivers/net/wireless/rtlwifi/cam.c | 291 + drivers/net/wireless/rtlwifi/cam.h | 53 + drivers/net/wireless/rtlwifi/core.c | 1029 ++ drivers/net/wireless/rtlwifi/core.h | 42 + drivers/net/wireless/rtlwifi/debug.c | 50 + drivers/net/wireless/rtlwifi/debug.h | 212 + drivers/net/wireless/rtlwifi/efuse.c | 1189 ++ drivers/net/wireless/rtlwifi/efuse.h | 124 + drivers/net/wireless/rtlwifi/pci.c | 1933 +++ drivers/net/wireless/rtlwifi/pci.h | 302 + drivers/net/wireless/rtlwifi/ps.c | 493 + drivers/net/wireless/rtlwifi/ps.h | 43 + drivers/net/wireless/rtlwifi/rc.c | 329 + drivers/net/wireless/rtlwifi/rc.h | 40 + drivers/net/wireless/rtlwifi/regd.c | 400 + drivers/net/wireless/rtlwifi/regd.h | 61 + drivers/net/wireless/rtlwifi/rtl8192ce/Makefile | 12 + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 257 + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 1473 ++ drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 196 + drivers/net/wireless/rtlwifi/rtl8192ce/fw.c | 804 + drivers/net/wireless/rtlwifi/rtl8192ce/fw.h | 98 + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2173 +++ drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 57 + drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 144 + drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 41 + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2676 ++++ drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 237 + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 2065 +++ drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 523 + drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 44 + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 282 + drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 37 + drivers/net/wireless/rtlwifi/rtl8192ce/table.c | 1224 ++ drivers/net/wireless/rtlwifi/rtl8192ce/table.h | 58 + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 1031 ++ drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 714 + drivers/net/wireless/rtlwifi/wifi.h | 1532 ++ drivers/net/wireless/wl1251/main.c | 15 +- drivers/net/wireless/wl1251/sdio.c | 103 +- drivers/net/wireless/wl1251/spi.c | 9 + drivers/net/wireless/wl1251/wl1251.h | 1 + drivers/net/wireless/wl12xx/Kconfig | 64 +- drivers/net/wireless/wl12xx/Makefile | 22 +- .../net/wireless/wl12xx/{wl1271_acx.c => acx.c} | 99 +- .../net/wireless/wl12xx/{wl1271_acx.h => acx.h} | 108 +- .../net/wireless/wl12xx/{wl1271_boot.c => boot.c} | 37 +- .../net/wireless/wl12xx/{wl1271_boot.h => boot.h} | 3 +- .../net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} | 81 +- .../net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} | 58 +- .../net/wireless/wl12xx/{wl1271_conf.h => conf.h} | 4 +- drivers/net/wireless/wl12xx/debugfs.c | 480 + .../wl12xx/{wl1271_debugfs.h => debugfs.h} | 6 +- .../wireless/wl12xx/{wl1271_event.c => event.c} | 14 +- .../wireless/wl12xx/{wl1271_event.h => event.h} | 4 +- .../net/wireless/wl12xx/{wl1271_ini.h => ini.h} | 4 +- .../net/wireless/wl12xx/{wl1271_init.c => init.c} | 23 +- .../net/wireless/wl12xx/{wl1271_init.h => init.h} | 6 +- drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} | 5 +- drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} | 6 +- .../net/wireless/wl12xx/{wl1271_main.c => main.c} | 494 +- drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} | 6 +- drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} | 8 +- .../net/wireless/wl12xx/{wl1271_reg.h => reg.h} | 0 drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} | 38 +- drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} | 6 +- .../net/wireless/wl12xx/{wl1271_scan.c => scan.c} | 17 +- .../net/wireless/wl12xx/{wl1271_scan.h => scan.h} | 6 +- .../net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} | 4 +- drivers/net/wireless/wl12xx/sdio_test.c | 520 + .../net/wireless/wl12xx/{wl1271_spi.c => spi.c} | 6 +- .../wl12xx/{wl1271_testmode.c => testmode.c} | 18 +- .../wl12xx/{wl1271_testmode.h => testmode.h} | 4 +- drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} | 196 +- drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} | 7 +- drivers/net/wireless/wl12xx/wl1271_debugfs.c | 583 - drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} | 150 +- drivers/net/wireless/wl12xx/wl12xx_80211.h | 17 +- drivers/net/wireless/zd1201.c | 3 +- drivers/net/wireless/zd1211rw/zd_chip.c | 5 +- drivers/net/wireless/zd1211rw/zd_usb.c | 2 + drivers/net/xilinx_emaclite.c | 36 +- drivers/net/znet.c | 2 +- drivers/s390/net/lcs.c | 10 +- drivers/s390/net/qeth_core_mpc.h | 2 +- drivers/s390/net/qeth_core_sys.c | 2 +- drivers/s390/net/qeth_l2_main.c | 11 +- drivers/s390/net/qeth_l3_main.c | 245 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 14 +- drivers/scsi/cxgbi/libcxgbi.c | 2 +- drivers/ssb/main.c | 30 + drivers/ssb/pci.c | 96 +- drivers/ssb/pcihost_wrapper.c | 7 + drivers/vhost/net.c | 9 +- drivers/vhost/test.c | 320 + drivers/vhost/test.h | 7 + drivers/vhost/vhost.c | 43 +- drivers/vhost/vhost.h | 2 +- firmware/Makefile | 6 +- firmware/bnx2x/bnx2x-e1-6.0.34.0.fw.ihex | 9476 ------------ firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex | 9483 ++++++++++++ firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw.ihex |13178 ----------------- firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex |13181 +++++++++++++++++ firmware/bnx2x/bnx2x-e2-6.0.34.0.fw.ihex |15442 ------------------- firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex |15456 ++++++++++++++++++++ include/linux/average.h | 30 + include/linux/bitops.h | 11 + include/linux/dccp.h | 23 + include/linux/ethtool.h | 4 +- include/linux/filter.h | 56 +- include/linux/ieee80211.h | 30 +- include/linux/if_bridge.h | 4 +- include/linux/if_link.h | 28 + include/linux/if_macvlan.h | 34 +- include/linux/igmp.h | 14 +- include/linux/inetdevice.h | 15 +- include/linux/ipv6.h | 2 +- include/linux/jhash.h | 183 +- include/linux/mdio.h | 5 + include/linux/netdevice.h | 87 +- include/linux/netfilter.h | 2 + include/linux/nl80211.h | 188 +- include/linux/rfkill.h | 31 - include/linux/skbuff.h | 13 +- include/linux/ssb/ssb.h | 4 + include/linux/ssb/ssb_regs.h | 40 + include/linux/stmmac.h | 6 +- include/linux/usb/usbnet.h | 6 + include/linux/wl12xx.h | 8 + include/linux/xfrm.h | 1 + include/net/addrconf.h | 2 - include/net/bluetooth/hci.h | 16 +- include/net/bluetooth/hci_core.h | 14 +- include/net/bluetooth/l2cap.h | 22 +- include/net/bluetooth/rfcomm.h | 18 +- include/net/bluetooth/sco.h | 20 +- include/net/caif/cfctrl.h | 2 +- include/net/cfg80211.h | 171 +- include/net/dn_dev.h | 27 +- include/net/dn_route.h | 10 + include/net/dst.h | 68 +- include/net/dst_ops.h | 2 + include/net/flow.h | 2 + include/net/if_inet6.h | 3 +- include/net/inet6_connection_sock.h | 3 + include/net/inet_connection_sock.h | 3 +- include/net/inet_sock.h | 7 +- include/net/inet_timewait_sock.h | 20 +- include/net/inetpeer.h | 32 +- include/net/ip.h | 10 - include/net/ip6_fib.h | 2 + include/net/ip6_route.h | 13 +- include/net/mac80211.h | 106 +- include/net/ndisc.h | 3 - include/net/neighbour.h | 10 +- include/net/netlink.h | 21 +- include/net/netns/generic.h | 2 +- include/net/regulatory.h | 7 + include/net/route.h | 37 +- include/net/rtnetlink.h | 35 + include/net/sch_generic.h | 1 + include/net/scm.h | 5 +- include/net/sctp/command.h | 3 - include/net/sctp/constants.h | 14 - include/net/sctp/structs.h | 2 - include/net/snmp.h | 4 +- include/net/sock.h | 97 +- include/net/tcp.h | 22 +- include/net/timewait_sock.h | 8 + include/net/tipc/tipc.h | 186 - include/net/tipc/tipc_bearer.h | 138 - include/net/tipc/tipc_msg.h | 207 - include/net/tipc/tipc_port.h | 101 - include/net/x25.h | 2 + include/net/xfrm.h | 7 + lib/Kconfig | 3 + lib/Makefile | 2 + lib/average.c | 61 + lib/nlattr.c | 22 +- net/8021q/vlan.c | 13 +- net/8021q/vlan.h | 22 +- net/8021q/vlan_core.c | 4 +- net/8021q/vlan_dev.c | 197 +- net/8021q/vlan_netlink.c | 20 - net/8021q/vlanproc.c | 5 - net/9p/protocol.c | 3 +- net/Kconfig | 6 + net/Makefile | 1 + net/atm/br2684.c | 2 +- net/atm/clip.c | 3 +- net/atm/lec.c | 3 +- net/atm/mpc.c | 2 - net/batman-adv/Kconfig | 25 + net/batman-adv/Makefile | 39 + net/batman-adv/aggregation.c | 273 + net/batman-adv/aggregation.h | 43 + net/batman-adv/bat_debugfs.c | 360 + net/batman-adv/bat_debugfs.h | 33 + net/batman-adv/bat_sysfs.c | 593 + net/batman-adv/bat_sysfs.h | 42 + net/batman-adv/bitarray.c | 201 + net/batman-adv/bitarray.h | 44 + net/batman-adv/gateway_client.c | 477 + net/batman-adv/gateway_client.h | 36 + net/batman-adv/gateway_common.c | 177 + net/batman-adv/gateway_common.h | 38 + net/batman-adv/hard-interface.c | 651 + net/batman-adv/hard-interface.h | 53 + net/batman-adv/hash.c | 62 + net/batman-adv/hash.h | 176 + net/batman-adv/icmp_socket.c | 356 + net/batman-adv/icmp_socket.h | 34 + net/batman-adv/main.c | 187 + net/batman-adv/main.h | 183 + net/batman-adv/originator.c | 564 + net/batman-adv/originator.h | 64 + net/batman-adv/packet.h | 136 + net/batman-adv/ring_buffer.c | 52 + net/batman-adv/ring_buffer.h | 28 + net/batman-adv/routing.c | 1397 ++ net/batman-adv/routing.h | 48 + net/batman-adv/send.c | 585 + net/batman-adv/send.h | 41 + net/batman-adv/soft-interface.c | 697 + net/batman-adv/soft-interface.h | 35 + net/batman-adv/translation-table.c | 534 + net/batman-adv/translation-table.h | 45 + net/batman-adv/types.h | 271 + net/batman-adv/unicast.c | 343 + net/batman-adv/unicast.h | 35 + net/batman-adv/vis.c | 949 ++ net/batman-adv/vis.h | 37 + net/bluetooth/Makefile | 2 +- net/bluetooth/bnep/core.c | 1 + net/bluetooth/cmtp/core.c | 1 + net/bluetooth/hci_conn.c | 23 +- net/bluetooth/hci_core.c | 66 +- net/bluetooth/hci_event.c | 177 +- net/bluetooth/hci_sock.c | 17 +- net/bluetooth/hidp/core.c | 2 +- net/bluetooth/l2cap.c | 94 +- net/bluetooth/rfcomm/core.c | 8 +- net/bluetooth/rfcomm/sock.c | 24 +- net/bluetooth/rfcomm/tty.c | 28 +- net/bluetooth/sco.c | 22 +- net/bridge/br.c | 4 - net/bridge/br_device.c | 2 +- net/bridge/br_fdb.c | 15 +- net/bridge/br_forward.c | 4 +- net/bridge/br_if.c | 7 +- net/bridge/br_input.c | 10 +- net/bridge/br_multicast.c | 88 +- net/bridge/br_netfilter.c | 49 +- net/bridge/br_netlink.c | 10 +- net/bridge/br_notify.c | 6 +- net/bridge/br_private.h | 21 +- net/bridge/br_stp_bpdu.c | 8 +- net/bridge/netfilter/ebtable_broute.c | 3 +- net/bridge/netfilter/ebtables.c | 11 +- net/caif/Makefile | 8 +- net/can/Makefile | 6 +- net/ceph/Makefile | 2 +- net/core/datagram.c | 2 +- net/core/dev.c | 383 +- net/core/ethtool.c | 21 +- net/core/filter.c | 514 +- net/core/neighbour.c | 1 - net/core/net-sysfs.c | 430 +- net/core/net-sysfs.h | 4 +- net/core/netpoll.c | 4 +- net/core/pktgen.c | 44 +- net/core/request_sock.c | 1 + net/core/rtnetlink.c | 166 +- net/core/scm.c | 10 +- net/core/skbuff.c | 36 +- net/core/sock.c | 11 +- net/core/timestamping.c | 4 +- net/dccp/Makefile | 4 +- net/dccp/ackvec.c | 616 +- net/dccp/ackvec.h | 151 +- net/dccp/ccids/ccid2.c | 143 +- net/dccp/ccids/ccid2.h | 2 + net/dccp/dccp.h | 32 +- net/dccp/input.c | 33 +- net/dccp/ipv4.c | 13 +- net/dccp/options.c | 100 +- net/dccp/output.c | 22 +- net/dccp/proto.c | 71 +- net/dccp/qpolicy.c | 137 + net/decnet/af_decnet.c | 6 +- net/decnet/dn_dev.c | 100 +- net/decnet/dn_fib.c | 6 +- net/decnet/dn_neigh.c | 2 +- net/decnet/dn_route.c | 137 +- net/decnet/dn_rules.c | 2 +- net/dns_resolver/Makefile | 2 +- net/econet/Makefile | 2 +- net/ieee802154/af_ieee802154.c | 6 +- net/ipv4/af_inet.c | 18 +- net/ipv4/arp.c | 31 +- net/ipv4/devinet.c | 97 +- net/ipv4/esp4.c | 32 +- net/ipv4/fib_frontend.c | 34 +- net/ipv4/fib_semantics.c | 8 +- net/ipv4/icmp.c | 32 +- net/ipv4/igmp.c | 282 +- net/ipv4/inet_connection_sock.c | 22 +- net/ipv4/inetpeer.c | 167 +- net/ipv4/ip_fragment.c | 2 +- net/ipv4/ip_gre.c | 52 +- net/ipv4/ip_output.c | 28 +- net/ipv4/ipconfig.c | 32 +- net/ipv4/ipip.c | 21 +- net/ipv4/ipmr.c | 20 +- net/ipv4/netfilter.c | 8 +- net/ipv4/netfilter/Makefile | 6 +- net/ipv4/netfilter/ipt_REJECT.c | 2 +- net/ipv4/raw.c | 7 +- net/ipv4/route.c | 252 +- net/ipv4/syncookies.c | 15 +- net/ipv4/sysctl_net_ipv4.c | 7 +- net/ipv4/tcp.c | 16 +- net/ipv4/tcp_input.c | 51 +- net/ipv4/tcp_ipv4.c | 74 +- net/ipv4/tcp_minisocks.c | 63 +- net/ipv4/tcp_output.c | 37 +- net/ipv4/tcp_probe.c | 4 +- net/ipv4/udp.c | 18 +- net/ipv4/xfrm4_mode_tunnel.c | 2 +- net/ipv4/xfrm4_policy.c | 47 +- net/ipv6/addrconf.c | 115 +- net/ipv6/af_inet6.c | 2 +- net/ipv6/esp6.c | 32 +- net/ipv6/inet6_connection_sock.c | 54 +- net/ipv6/ip6_tunnel.c | 2 - net/ipv6/ip6mr.c | 4 +- net/ipv6/mcast.c | 77 +- net/ipv6/ndisc.c | 29 +- net/ipv6/netfilter.c | 6 +- net/ipv6/netfilter/Makefile | 4 +- net/ipv6/netfilter/ip6t_REJECT.c | 2 +- net/ipv6/reassembly.c | 36 +- net/ipv6/route.c | 156 +- net/ipv6/sit.c | 14 +- net/ipv6/tcp_ipv6.c | 151 +- net/ipv6/udp.c | 10 +- net/ipv6/xfrm6_mode_tunnel.c | 3 +- net/irda/ircomm/Makefile | 4 +- net/irda/irlan/Makefile | 2 +- net/irda/irnet/Makefile | 2 +- net/l2tp/l2tp_ip.c | 12 +- net/lapb/Makefile | 2 +- net/llc/af_llc.c | 6 +- net/mac80211/Kconfig | 1 + net/mac80211/aes_ccm.c | 3 +- net/mac80211/aes_cmac.c | 3 +- net/mac80211/agg-rx.c | 8 +- net/mac80211/agg-tx.c | 7 +- net/mac80211/cfg.c | 231 +- net/mac80211/debugfs.c | 60 +- net/mac80211/debugfs.h | 2 + net/mac80211/debugfs_key.c | 56 +- net/mac80211/debugfs_key.h | 8 +- net/mac80211/debugfs_netdev.c | 2 + net/mac80211/debugfs_sta.c | 57 +- net/mac80211/driver-ops.h | 39 +- net/mac80211/driver-trace.h | 71 + net/mac80211/ibss.c | 2 + net/mac80211/ieee80211_i.h | 54 +- net/mac80211/iface.c | 45 +- net/mac80211/key.c | 54 +- net/mac80211/key.h | 3 +- net/mac80211/led.c | 186 +- net/mac80211/led.h | 45 +- net/mac80211/main.c | 22 +- net/mac80211/mesh.c | 88 +- net/mac80211/mesh.h | 45 +- net/mac80211/mesh_hwmp.c | 9 +- net/mac80211/mesh_pathtbl.c | 7 +- net/mac80211/mesh_plink.c | 3 +- net/mac80211/mlme.c | 227 +- net/mac80211/rate.c | 18 +- net/mac80211/rc80211_minstrel_ht.c | 21 +- net/mac80211/rx.c | 78 +- net/mac80211/sta_info.c | 19 +- net/mac80211/sta_info.h | 37 +- net/mac80211/status.c | 51 +- net/mac80211/tx.c | 48 +- net/mac80211/util.c | 43 +- net/mac80211/wme.c | 11 +- net/mac80211/work.c | 27 +- net/netfilter/core.c | 6 +- net/netfilter/ipvs/ip_vs_ctl.c | 6 +- net/netfilter/ipvs/ip_vs_xmit.c | 42 +- net/netfilter/xt_TEE.c | 12 +- net/netlabel/netlabel_cipso_v4.h | 1 - net/netlabel/netlabel_mgmt.h | 1 - net/netlabel/netlabel_unlabeled.h | 1 - net/packet/af_packet.c | 156 +- net/phonet/Makefile | 4 +- net/rds/Makefile | 8 +- net/rfkill/core.c | 14 - net/rxrpc/Makefile | 4 +- net/rxrpc/ar-peer.c | 10 +- net/sched/sch_generic.c | 41 +- net/sched/sch_sfq.c | 267 +- net/sched/sch_teql.c | 3 +- net/sctp/socket.c | 2 +- net/socket.c | 11 +- net/sunrpc/auth_gss/Makefile | 4 +- net/tipc/addr.c | 2 - net/tipc/bcast.c | 8 - net/tipc/bearer.c | 12 +- net/tipc/bearer.h | 71 +- net/tipc/cluster.c | 7 - net/tipc/config.c | 16 +- net/tipc/config.h | 1 - net/tipc/core.c | 41 - net/tipc/core.h | 14 +- net/tipc/discover.c | 2 - net/tipc/discover.h | 2 - net/tipc/eth_media.c | 6 +- net/tipc/link.c | 14 - net/tipc/link.h | 1 - net/tipc/msg.c | 2 - net/tipc/msg.h | 168 +- net/tipc/name_distr.c | 2 - net/tipc/name_table.c | 5 - net/tipc/net.c | 5 - net/tipc/node.c | 7 - net/tipc/node_subscr.c | 2 - net/tipc/port.c | 115 +- net/tipc/port.h | 130 +- net/tipc/socket.c | 7 +- net/tipc/subscr.c | 8 +- net/tipc/user_reg.c | 50 +- net/tipc/user_reg.h | 3 + net/tipc/zone.c | 3 - net/unix/af_unix.c | 34 +- net/wanrouter/Makefile | 2 +- net/wireless/Makefile | 2 +- net/wireless/core.c | 33 +- net/wireless/core.h | 18 +- net/wireless/lib80211.c | 8 +- net/wireless/lib80211_crypt_tkip.c | 16 +- net/wireless/mesh.c | 142 + net/wireless/mlme.c | 43 +- net/wireless/nl80211.c | 612 +- net/wireless/nl80211.h | 10 + net/wireless/reg.c | 262 +- net/wireless/scan.c | 11 + net/wireless/util.c | 15 +- net/wireless/wext-compat.c | 8 +- net/wireless/wext-core.c | 10 +- net/x25/af_x25.c | 95 +- net/x25/x25_link.c | 8 +- net/xfrm/xfrm_policy.c | 20 +- net/xfrm/xfrm_user.c | 19 +- security/selinux/hooks.c | 12 +- tools/virtio/Makefile | 12 + tools/virtio/linux/device.h | 2 + tools/virtio/linux/slab.h | 2 + tools/virtio/linux/virtio.h | 223 + tools/virtio/vhost_test/Makefile | 2 + tools/virtio/vhost_test/vhost_test.c | 1 + tools/virtio/virtio_test.c | 248 + 1026 files changed, 133315 insertions(+), 67866 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-net-batman-adv create mode 100644 Documentation/ABI/testing/sysfs-class-net-mesh create mode 100644 Documentation/networking/LICENSE.qlcnic create mode 100644 Documentation/networking/batman-adv.txt create mode 100644 drivers/net/bnx2x/bnx2x_dcb.c create mode 100644 drivers/net/bnx2x/bnx2x_dcb.h create mode 100644 drivers/net/bonding/bond_debugfs.c create mode 100644 drivers/net/can/slcan.c create mode 100644 drivers/net/ixgbe/ixgbe_x540.c create mode 100644 drivers/net/usb/cdc_ncm.c create mode 100644 drivers/net/wireless/ath/ath5k/ahb.c create mode 100644 drivers/net/wireless/ath/ath5k/pci.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9485_initvals.h delete mode 100644 drivers/net/wireless/ath/debug.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.h create mode 100644 drivers/net/wireless/rtlwifi/Kconfig create mode 100644 drivers/net/wireless/rtlwifi/Makefile create mode 100644 drivers/net/wireless/rtlwifi/base.c create mode 100644 drivers/net/wireless/rtlwifi/base.h create mode 100644 drivers/net/wireless/rtlwifi/cam.c create mode 100644 drivers/net/wireless/rtlwifi/cam.h create mode 100644 drivers/net/wireless/rtlwifi/core.c create mode 100644 drivers/net/wireless/rtlwifi/core.h create mode 100644 drivers/net/wireless/rtlwifi/debug.c create mode 100644 drivers/net/wireless/rtlwifi/debug.h create mode 100644 drivers/net/wireless/rtlwifi/efuse.c create mode 100644 drivers/net/wireless/rtlwifi/efuse.h create mode 100644 drivers/net/wireless/rtlwifi/pci.c create mode 100644 drivers/net/wireless/rtlwifi/pci.h create mode 100644 drivers/net/wireless/rtlwifi/ps.c create mode 100644 drivers/net/wireless/rtlwifi/ps.h create mode 100644 drivers/net/wireless/rtlwifi/rc.c create mode 100644 drivers/net/wireless/rtlwifi/rc.h create mode 100644 drivers/net/wireless/rtlwifi/regd.c create mode 100644 drivers/net/wireless/rtlwifi/regd.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/Makefile create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/def.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/dm.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/dm.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/fw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/fw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/hw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/led.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/led.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/phy.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/reg.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/rf.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/sw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/table.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/table.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h create mode 100644 drivers/net/wireless/rtlwifi/wifi.h rename drivers/net/wireless/wl12xx/{wl1271_acx.c => acx.c} (91%) rename drivers/net/wireless/wl12xx/{wl1271_acx.h => acx.h} (89%) rename drivers/net/wireless/wl12xx/{wl1271_boot.c => boot.c} (96%) rename drivers/net/wireless/wl12xx/{wl1271_boot.h => boot.h} (96%) rename drivers/net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} (90%) rename drivers/net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} (91%) rename drivers/net/wireless/wl12xx/{wl1271_conf.h => conf.h} (99%) create mode 100644 drivers/net/wireless/wl12xx/debugfs.c rename drivers/net/wireless/wl12xx/{wl1271_debugfs.h => debugfs.h} (93%) rename drivers/net/wireless/wl12xx/{wl1271_event.c => event.c} (97%) rename drivers/net/wireless/wl12xx/{wl1271_event.h => event.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_ini.h => ini.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_init.c => init.c} (95%) rename drivers/net/wireless/wl12xx/{wl1271_init.h => init.h} (93%) rename drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_main.c => main.c} (87%) rename drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} (92%) rename drivers/net/wireless/wl12xx/{wl1271_reg.h => reg.h} (100%) rename drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} (87%) rename drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} (96%) rename drivers/net/wireless/wl12xx/{wl1271_scan.c => scan.c} (96%) rename drivers/net/wireless/wl12xx/{wl1271_scan.h => scan.h} (97%) rename drivers/net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} (99%) create mode 100644 drivers/net/wireless/wl12xx/sdio_test.c rename drivers/net/wireless/wl12xx/{wl1271_spi.c => spi.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_testmode.c => testmode.c} (94%) rename drivers/net/wireless/wl12xx/{wl1271_testmode.h => testmode.h} (93%) rename drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} (77%) rename drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} (97%) delete mode 100644 drivers/net/wireless/wl12xx/wl1271_debugfs.c rename drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} (71%) create mode 100644 drivers/vhost/test.c create mode 100644 drivers/vhost/test.h delete mode 100644 firmware/bnx2x/bnx2x-e1-6.0.34.0.fw.ihex create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw.ihex create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex delete mode 100644 firmware/bnx2x/bnx2x-e2-6.0.34.0.fw.ihex create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex create mode 100644 include/linux/average.h delete mode 100644 include/net/tipc/tipc.h delete mode 100644 include/net/tipc/tipc_bearer.h delete mode 100644 include/net/tipc/tipc_msg.h delete mode 100644 include/net/tipc/tipc_port.h create mode 100644 lib/average.c create mode 100644 net/batman-adv/Kconfig create mode 100644 net/batman-adv/Makefile create mode 100644 net/batman-adv/aggregation.c create mode 100644 net/batman-adv/aggregation.h create mode 100644 net/batman-adv/bat_debugfs.c create mode 100644 net/batman-adv/bat_debugfs.h create mode 100644 net/batman-adv/bat_sysfs.c create mode 100644 net/batman-adv/bat_sysfs.h create mode 100644 net/batman-adv/bitarray.c create mode 100644 net/batman-adv/bitarray.h create mode 100644 net/batman-adv/gateway_client.c create mode 100644 net/batman-adv/gateway_client.h create mode 100644 net/batman-adv/gateway_common.c create mode 100644 net/batman-adv/gateway_common.h create mode 100644 net/batman-adv/hard-interface.c create mode 100644 net/batman-adv/hard-interface.h create mode 100644 net/batman-adv/hash.c create mode 100644 net/batman-adv/hash.h create mode 100644 net/batman-adv/icmp_socket.c create mode 100644 net/batman-adv/icmp_socket.h create mode 100644 net/batman-adv/main.c create mode 100644 net/batman-adv/main.h create mode 100644 net/batman-adv/originator.c create mode 100644 net/batman-adv/originator.h create mode 100644 net/batman-adv/packet.h create mode 100644 net/batman-adv/ring_buffer.c create mode 100644 net/batman-adv/ring_buffer.h create mode 100644 net/batman-adv/routing.c create mode 100644 net/batman-adv/routing.h create mode 100644 net/batman-adv/send.c create mode 100644 net/batman-adv/send.h create mode 100644 net/batman-adv/soft-interface.c create mode 100644 net/batman-adv/soft-interface.h create mode 100644 net/batman-adv/translation-table.c create mode 100644 net/batman-adv/translation-table.h create mode 100644 net/batman-adv/types.h create mode 100644 net/batman-adv/unicast.c create mode 100644 net/batman-adv/unicast.h create mode 100644 net/batman-adv/vis.c create mode 100644 net/batman-adv/vis.h create mode 100644 net/dccp/qpolicy.c create mode 100644 net/wireless/mesh.c create mode 100644 tools/virtio/Makefile create mode 100644 tools/virtio/linux/device.h create mode 100644 tools/virtio/linux/slab.h create mode 100644 tools/virtio/linux/virtio.h create mode 100644 tools/virtio/vhost_test/Makefile create mode 100644 tools/virtio/vhost_test/vhost_test.c create mode 100644 tools/virtio/virtio_test.c Merging wireless/master $ git merge wireless/master Auto-merging MAINTAINERS Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c Merge made by recursive. MAINTAINERS | 4 +- drivers/net/wireless/ath/ath5k/ath5k.h | 8 +- drivers/net/wireless/ath/ath5k/attach.c | 2 +- drivers/net/wireless/ath/ath5k/eeprom.c | 16 + drivers/net/wireless/ath/ath5k/eeprom.h | 2 + drivers/net/wireless/ath/ath5k/phy.c | 150 +- drivers/net/wireless/ath/ath5k/reset.c | 28 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +- drivers/net/wireless/ath/ath9k/ath9k.h | 2 + drivers/net/wireless/ath/ath9k/eeprom.h | 2 - drivers/net/wireless/ath/ath9k/hif_usb.c | 6 +- drivers/net/wireless/ath/ath9k/htc.h | 5 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 5 +- drivers/net/wireless/ath/ath9k/hw.c | 4 +- drivers/net/wireless/ath/ath9k/hw.h | 4 + drivers/net/wireless/ath/ath9k/init.c | 4 +- drivers/net/wireless/ath/ath9k/main.c | 12 +- drivers/net/wireless/ath/ath9k/pci.c | 13 +- drivers/net/wireless/ath/ath9k/recv.c | 3 +- drivers/net/wireless/ath/ath9k/wmi.c | 2 +- drivers/net/wireless/b43/main.c | 14 +- drivers/net/wireless/b43/phy_n.c | 130 +- drivers/net/wireless/b43/radio_2056.c | 3045 +++++++++++++++++++- drivers/net/wireless/b43/radio_2056.h | 3 + drivers/net/wireless/rndis_wlan.c | 192 ++- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- drivers/net/wireless/rtl818x/Makefile | 9 +- drivers/net/wireless/rtl818x/rtl8180/Makefile | 5 + .../rtl818x/{rtl8180_dev.c => rtl8180/dev.c} | 8 +- .../{rtl8180_grf5101.c => rtl8180/grf5101.c} | 2 +- .../{rtl8180_grf5101.h => rtl8180/grf5101.h} | 0 .../{rtl8180_max2820.c => rtl8180/max2820.c} | 2 +- .../{rtl8180_max2820.h => rtl8180/max2820.h} | 0 .../net/wireless/rtl818x/{ => rtl8180}/rtl8180.h | 0 .../{rtl8180_rtl8225.c => rtl8180/rtl8225.c} | 2 +- .../{rtl8180_rtl8225.h => rtl8180/rtl8225.h} | 0 .../rtl818x/{rtl8180_sa2400.c => rtl8180/sa2400.c} | 2 +- .../rtl818x/{rtl8180_sa2400.h => rtl8180/sa2400.h} | 0 drivers/net/wireless/rtl818x/rtl8187/Makefile | 5 + .../rtl818x/{rtl8187_dev.c => rtl8187/dev.c} | 6 +- .../rtl818x/{rtl8187_leds.c => rtl8187/leds.c} | 2 +- .../rtl818x/{rtl8187_leds.h => rtl8187/leds.h} | 0 .../rtl818x/{rtl8187_rfkill.c => rtl8187/rfkill.c} | 2 +- .../rtl818x/{rtl8187_rfkill.h => rtl8187/rfkill.h} | 0 .../net/wireless/rtl818x/{ => rtl8187}/rtl8187.h | 2 +- .../{rtl8187_rtl8225.c => rtl8187/rtl8225.c} | 2 +- .../{rtl8187_rtl8225.h => rtl8187/rtl8225.h} | 0 drivers/net/wireless/rtlwifi/base.c | 12 +- drivers/net/wireless/rtlwifi/pci.c | 20 +- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 11 - drivers/net/wireless/wl1251/boot.c | 1 - drivers/net/wireless/wl12xx/boot.c | 1 - drivers/ssb/scan.c | 4 +- net/mac80211/wme.c | 20 +- 54 files changed, 3529 insertions(+), 251 deletions(-) create mode 100644 drivers/net/wireless/rtl818x/rtl8180/Makefile rename drivers/net/wireless/rtl818x/{rtl8180_dev.c => rtl8180/dev.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8180_grf5101.c => rtl8180/grf5101.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8180_grf5101.h => rtl8180/grf5101.h} (100%) rename drivers/net/wireless/rtl818x/{rtl8180_max2820.c => rtl8180/max2820.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8180_max2820.h => rtl8180/max2820.h} (100%) rename drivers/net/wireless/rtl818x/{ => rtl8180}/rtl8180.h (100%) rename drivers/net/wireless/rtl818x/{rtl8180_rtl8225.c => rtl8180/rtl8225.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8180_rtl8225.h => rtl8180/rtl8225.h} (100%) rename drivers/net/wireless/rtl818x/{rtl8180_sa2400.c => rtl8180/sa2400.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8180_sa2400.h => rtl8180/sa2400.h} (100%) create mode 100644 drivers/net/wireless/rtl818x/rtl8187/Makefile rename drivers/net/wireless/rtl818x/{rtl8187_dev.c => rtl8187/dev.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8187_leds.c => rtl8187/leds.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8187_leds.h => rtl8187/leds.h} (100%) rename drivers/net/wireless/rtl818x/{rtl8187_rfkill.c => rtl8187/rfkill.c} (98%) rename drivers/net/wireless/rtl818x/{rtl8187_rfkill.h => rtl8187/rfkill.h} (100%) rename drivers/net/wireless/rtl818x/{ => rtl8187}/rtl8187.h (99%) rename drivers/net/wireless/rtl818x/{rtl8187_rtl8225.c => rtl8187/rtl8225.c} (99%) rename drivers/net/wireless/rtl818x/{rtl8187_rtl8225.h => rtl8187/rtl8225.h} (100%) Merging bluetooth/master $ git merge bluetooth/master Resolved 'net/bluetooth/Makefile' using previous resolution. Auto-merging net/bluetooth/Makefile CONFLICT (content): Merge conflict in net/bluetooth/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c72c649] Merge remote branch 'bluetooth/master' $ git diff -M --stat --summary HEAD^.. include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 4 + include/net/bluetooth/hci_core.h | 9 +- include/net/bluetooth/mgmt.h | 87 +++++++++++ net/bluetooth/Makefile | 2 +- net/bluetooth/hci_core.c | 17 ++- net/bluetooth/hci_event.c | 33 +++-- net/bluetooth/hci_sock.c | 52 ++++++- net/bluetooth/l2cap.c | 8 +- net/bluetooth/mgmt.c | 308 +++++++++++++++++++++++++++++++++++++ 10 files changed, 498 insertions(+), 23 deletions(-) create mode 100644 include/net/bluetooth/mgmt.h create mode 100644 net/bluetooth/mgmt.c Merging mtd/master $ git merge mtd/master Auto-merging drivers/mtd/mtdchar.c Auto-merging drivers/mtd/onenand/omap2.c Merge made by recursive. drivers/mtd/Kconfig | 19 ++++--- drivers/mtd/Makefile | 2 +- drivers/mtd/chips/cfi_cmdset_0001.c | 54 ++++++++++---------- drivers/mtd/chips/cfi_cmdset_0002.c | 94 +++++++++++++++++----------------- drivers/mtd/chips/cfi_util.c | 2 +- drivers/mtd/chips/fwh_lock.h | 2 +- drivers/mtd/devices/m25p80.c | 33 +++++++++++- drivers/mtd/devices/sst25l.c | 4 +- drivers/mtd/maps/amd76xrom.c | 7 +-- drivers/mtd/maps/bcm963xx-flash.c | 5 ++ drivers/mtd/maps/ck804xrom.c | 7 +-- drivers/mtd/maps/esb2rom.c | 9 +-- drivers/mtd/maps/ichxrom.c | 9 +-- drivers/mtd/maps/physmap_of.c | 4 +- drivers/mtd/maps/scx200_docflash.c | 5 +- drivers/mtd/maps/tqm8xxl.c | 2 +- drivers/mtd/mtdchar.c | 10 ++-- drivers/mtd/mtdpart.c | 10 ++-- drivers/mtd/nand/fsl_elbc_nand.c | 2 + drivers/mtd/nand/fsmc_nand.c | 89 +++++++++++++++++++++++++-------- drivers/mtd/nand/jz4740_nand.c | 57 +--------------------- drivers/mtd/nand/mxc_nand.c | 2 +- drivers/mtd/nand/nand_base.c | 11 +++- drivers/mtd/nand/nand_bbt.c | 3 +- drivers/mtd/nand/nandsim.c | 39 +++++++------- drivers/mtd/nand/pasemi_nand.c | 2 +- drivers/mtd/onenand/omap2.c | 12 +++- drivers/mtd/onenand/onenand_base.c | 51 +++++++++++++------ drivers/mtd/onenand/onenand_bbt.c | 6 ++- drivers/mtd/onenand/samsung.c | 7 ++- drivers/mtd/ubi/vtbl.c | 6 +-- fs/jffs2/build.c | 5 +- fs/jffs2/jffs2_fs_sb.h | 2 +- fs/jffs2/xattr.c | 12 ++-- include/linux/mtd/cfi.h | 3 +- include/linux/mtd/fsmc.h | 26 ++-------- include/linux/mtd/nand.h | 2 + include/linux/mtd/onenand.h | 12 +++++ include/linux/mtd/partitions.h | 2 +- 39 files changed, 336 insertions(+), 293 deletions(-) Merging crypto/master $ git merge crypto/master Auto-merging include/linux/Kbuild Auto-merging include/linux/socket.h Auto-merging net/core/sock.c Merge made by recursive. arch/x86/crypto/aesni-intel_asm.S | 1832 +++++++++++++++++++++++++++++++++++- arch/x86/crypto/aesni-intel_glue.c | 540 +++++++++++- crypto/Kconfig | 33 +- crypto/Makefile | 17 +- crypto/af_alg.c | 483 ++++++++++ crypto/algif_hash.c | 319 +++++++ crypto/algif_skcipher.c | 632 +++++++++++++ crypto/authenc.c | 22 +- crypto/cast5.c | 74 +- crypto/deflate.c | 3 +- crypto/eseqiv.c | 18 +- crypto/gcm.c | 19 +- crypto/shash.c | 8 +- crypto/tcrypt.c | 11 + crypto/testmgr.c | 24 + crypto/testmgr.h | 361 +++++++ crypto/zlib.c | 3 +- drivers/crypto/omap-aes.c | 260 +++--- drivers/crypto/omap-sham.c | 379 +++++---- include/crypto/if_alg.h | 92 ++ include/crypto/scatterwalk.h | 15 + include/linux/Kbuild | 1 + include/linux/if_alg.h | 40 + include/linux/socket.h | 5 +- net/core/sock.c | 6 +- 25 files changed, 4753 insertions(+), 444 deletions(-) create mode 100644 crypto/af_alg.c create mode 100644 crypto/algif_hash.c create mode 100644 crypto/algif_skcipher.c create mode 100644 include/crypto/if_alg.h create mode 100644 include/linux/if_alg.h Merging sound-asoc/for-next $ git merge sound-asoc/for-next Resolved 'sound/soc/samsung/smdk_wm8580.c' using previous resolution. Resolved 'sound/soc/samsung/smdk_wm9713.c' using previous resolution. Renaming sound/soc/s3c24xx/smdk64xx_wm8580.c => sound/soc/samsung/smdk_wm8580.c Auto-merging sound/soc/samsung/smdk_wm8580.c CONFLICT (rename/modify): Merge conflict in sound/soc/samsung/smdk_wm8580.c Renaming sound/soc/s3c24xx/smdk_wm9713.c => sound/soc/samsung/smdk_wm9713.c Auto-merging sound/soc/samsung/smdk_wm9713.c CONFLICT (rename/modify): Merge conflict in sound/soc/samsung/smdk_wm9713.c Auto-merging MAINTAINERS Auto-merging arch/arm/mach-s3c64xx/dev-audio.c Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging arch/arm/plat-s3c24xx/devs.c Auto-merging arch/arm/plat-samsung/Makefile Auto-merging arch/arm/plat-samsung/dev-asocdma.c CONFLICT (add/add): Merge conflict in arch/arm/plat-samsung/dev-asocdma.c Auto-merging arch/arm/plat-samsung/include/plat/devs.h Removing sound/soc/s3c24xx/Kconfig Removing sound/soc/s3c24xx/Makefile Removing sound/soc/s3c24xx/aquila_wm8994.c Removing sound/soc/s3c24xx/s3c64xx-i2s-v4.c Removing sound/soc/s3c24xx/s3c64xx-i2s.c Removing sound/soc/s3c24xx/s3c64xx-i2s.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/plat-samsung/dev-asocdma.c'. [master b13d1dd] Merge remote branch 'sound-asoc/for-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 2 +- arch/arm/mach-kirkwood/openrd-setup.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/mach-s5pc100/dev-audio.c | 2 +- arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + arch/arm/mach-s5pv210/dev-audio.c | 2 +- arch/arm/mach-shmobile/board-ap4evb.c | 5 + arch/arm/plat-s3c24xx/devs.c | 2 +- arch/arm/plat-samsung/dev-asocdma.c | 1 + arch/sh/boards/mach-se/7724/setup.c | 5 + drivers/gpio/wm8994-gpio.c | 24 + drivers/mfd/wm8994-core.c | 93 +- drivers/regulator/wm8994-regulator.c | 23 +- include/linux/mfd/wm8994/core.h | 8 + include/linux/mfd/wm8994/pdata.h | 17 + include/linux/mfd/wm8994/registers.h | 302 ++ include/sound/alc5623.h | 15 + include/sound/soc-dai.h | 4 +- include/sound/soc-dapm.h | 99 +- include/sound/soc.h | 116 +- include/trace/events/asoc.h | 235 ++ sound/aoa/core/gpio-feature.c | 7 +- sound/aoa/core/gpio-pmf.c | 7 +- sound/i2c/other/ak4113.c | 5 +- sound/i2c/other/ak4114.c | 5 +- sound/pci/ac97/ac97_codec.c | 6 +- sound/pci/hda/patch_via.c | 3 +- sound/pci/oxygen/oxygen_lib.c | 6 +- sound/soc/Kconfig | 17 +- sound/soc/Makefile | 2 +- sound/soc/atmel/playpaq_wm8510.c | 12 +- sound/soc/atmel/sam9g20_wm8731.c | 18 +- sound/soc/atmel/snd-soc-afeb9260.c | 14 +- sound/soc/au1x/db1200.c | 1 - sound/soc/blackfin/bf5xx-ad1836.c | 1 - sound/soc/blackfin/bf5xx-ad193x.c | 1 - sound/soc/blackfin/bf5xx-ad73311.c | 1 - sound/soc/blackfin/bf5xx-ssm2602.c | 1 - sound/soc/codecs/88pm860x-codec.c | 29 +- sound/soc/codecs/Kconfig | 17 + sound/soc/codecs/Makefile | 10 +- sound/soc/codecs/ad1836.c | 7 +- sound/soc/codecs/ad193x.c | 7 +- sound/soc/codecs/ad1980.c | 1 - sound/soc/codecs/ak4535.c | 20 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 10 +- sound/soc/codecs/alc5623.c | 1117 +++++ sound/soc/codecs/alc5623.h | 161 + sound/soc/codecs/cq93vc.c | 4 +- sound/soc/codecs/cs42l51.c | 6 +- sound/soc/codecs/cx20442.c | 15 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/jz4740.c | 11 +- sound/soc/codecs/max98088.c | 13 +- sound/soc/codecs/ssm2602.c | 10 +- sound/soc/codecs/stac9766.c | 2 +- sound/soc/codecs/tlv320aic23.c | 10 +- sound/soc/codecs/tlv320aic26.c | 1 - sound/soc/codecs/tlv320aic3x.c | 71 +- sound/soc/codecs/tlv320dac33.c | 73 +- sound/soc/codecs/tpa6130a2.c | 100 +- sound/soc/codecs/tpa6130a2.h | 1 + sound/soc/codecs/twl4030.c | 56 +- sound/soc/codecs/twl6040.c | 855 ++++- sound/soc/codecs/twl6040.h | 8 + sound/soc/codecs/uda134x.c | 3 +- sound/soc/codecs/uda1380.c | 14 +- sound/soc/codecs/wl1273.c | 3 +- sound/soc/codecs/wm2000.c | 6 +- sound/soc/codecs/wm8350.c | 103 +- sound/soc/codecs/wm8400.c | 12 +- sound/soc/codecs/wm8510.c | 12 +- sound/soc/codecs/wm8523.c | 12 +- sound/soc/codecs/wm8580.c | 22 +- sound/soc/codecs/wm8711.c | 10 +- sound/soc/codecs/wm8728.c | 12 +- sound/soc/codecs/wm8731.c | 101 +- sound/soc/codecs/wm8737.c | 754 ++++ sound/soc/codecs/wm8737.h | 322 ++ sound/soc/codecs/wm8741.c | 10 +- sound/soc/codecs/wm8750.c | 12 +- sound/soc/codecs/wm8753.c | 49 +- sound/soc/codecs/wm8770.c | 749 ++++ sound/soc/codecs/wm8770.h | 51 + sound/soc/codecs/wm8776.c | 10 +- sound/soc/codecs/wm8804.c | 7 +- sound/soc/codecs/wm8900.c | 12 +- sound/soc/codecs/wm8903.c | 220 +- sound/soc/codecs/wm8903.h | 25 - sound/soc/codecs/wm8904.c | 36 +- sound/soc/codecs/wm8940.c | 7 +- sound/soc/codecs/wm8955.c | 12 +- sound/soc/codecs/wm8960.c | 28 +- sound/soc/codecs/wm8961.c | 12 +- sound/soc/codecs/wm8962.c | 41 +- sound/soc/codecs/wm8971.c | 30 +- sound/soc/codecs/wm8974.c | 12 +- sound/soc/codecs/wm8978.c | 12 +- sound/soc/codecs/wm8985.c | 12 +- sound/soc/codecs/wm8988.c | 10 +- sound/soc/codecs/wm8990.c | 12 +- sound/soc/codecs/wm8993.c | 20 +- sound/soc/codecs/wm8994-tables.c | 3147 +++++++++++++++ sound/soc/codecs/wm8994.c | 2540 ++++-------- sound/soc/codecs/wm8994.h | 14 + sound/soc/codecs/wm8995.c | 1818 +++++++++ sound/soc/codecs/wm8995.h | 4269 ++++++++++++++++++++ sound/soc/codecs/wm9081.c | 14 +- sound/soc/codecs/wm9090.c | 18 +- sound/soc/codecs/wm9705.c | 7 +- sound/soc/codecs/wm9712.c | 10 +- sound/soc/codecs/wm9713.c | 9 +- sound/soc/codecs/wm_hubs.c | 108 +- sound/soc/codecs/wm_hubs.h | 3 + sound/soc/davinci/davinci-evm.c | 22 +- sound/soc/davinci/davinci-sffsdr.c | 1 - sound/soc/ep93xx/ep93xx-i2s.c | 4 +- sound/soc/ep93xx/ep93xx-pcm.c | 4 +- sound/soc/ep93xx/snappercl15.c | 6 +- sound/soc/imx/eukrea-tlv320.c | 1 - sound/soc/imx/imx-ssi.c | 4 +- sound/soc/imx/phycore-ac97.c | 1 - sound/soc/imx/wm1133-ev1.c | 8 +- sound/soc/jz4740/jz4740-i2s.c | 1 - sound/soc/jz4740/qi_lb60.c | 14 +- sound/soc/kirkwood/Kconfig | 11 +- sound/soc/kirkwood/Makefile | 2 + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/kirkwood/kirkwood-t5325.c | 141 + sound/soc/nuc900/nuc900-audio.c | 1 - sound/soc/omap/am3517evm.c | 14 +- sound/soc/omap/ams-delta.c | 82 +- sound/soc/omap/igep0020.c | 1 - sound/soc/omap/n810.c | 43 +- sound/soc/omap/omap2evm.c | 1 - sound/soc/omap/omap3beagle.c | 1 - sound/soc/omap/omap3evm.c | 1 - sound/soc/omap/omap3pandora.c | 45 +- sound/soc/omap/osk5912.c | 14 +- sound/soc/omap/overo.c | 1 - sound/soc/omap/rx51.c | 26 +- sound/soc/omap/sdp3430.c | 44 +- sound/soc/omap/sdp4430.c | 57 +- sound/soc/omap/zoom2.c | 36 +- sound/soc/pxa/corgi.c | 52 +- sound/soc/pxa/e740_wm9705.c | 30 +- sound/soc/pxa/e750_wm9705.c | 30 +- sound/soc/pxa/e800_wm9712.c | 8 +- sound/soc/pxa/em-x270.c | 1 - sound/soc/pxa/magician.c | 36 +- sound/soc/pxa/mioa701_wm9713.c | 18 +- sound/soc/pxa/palm27x.c | 34 +- sound/soc/pxa/poodle.c | 26 +- sound/soc/pxa/raumfeld.c | 1 - sound/soc/pxa/saarb.c | 18 +- sound/soc/pxa/spitz.c | 70 +- sound/soc/pxa/tavorevb3.c | 18 +- sound/soc/pxa/tosa.c | 38 +- sound/soc/pxa/z2.c | 16 +- sound/soc/pxa/zylonite.c | 12 +- sound/soc/s3c24xx/Kconfig | 171 - sound/soc/s3c24xx/Makefile | 55 - sound/soc/s3c24xx/aquila_wm8994.c | 295 -- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 -- sound/soc/s3c24xx/s3c64xx-i2s.c | 242 -- sound/soc/s3c24xx/s3c64xx-i2s.h | 41 - sound/soc/s6000/s6105-ipcam.c | 41 +- sound/soc/samsung/Kconfig | 171 + sound/soc/samsung/Makefile | 55 + sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} | 22 +- sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} | 8 +- sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} | 130 +- sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} | 2 +- sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 62 +- .../rx1950_uda1380.c => samsung/h1940_uda1380.c} | 249 +- sound/soc/samsung/i2s.c | 1258 ++++++ sound/soc/samsung/i2s.h | 29 + sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 24 +- sound/soc/{s3c24xx => samsung}/lm4857.h | 0 sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 7 +- .../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 68 +- sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 126 +- sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} | 6 +- sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} | 2 +- sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0 sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 14 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0 sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 5 +- sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +- .../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 20 +- .../s3c24xx_simtec_tlv320aic23.c | 20 +- sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 3 +- sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 62 +- sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 7 +- sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 19 +- .../smdk64xx_wm8580.c => samsung/smdk_wm8580.c} | 174 +- sound/soc/samsung/smdk_wm8994.c | 176 + sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 24 +- sound/soc/{s3c24xx => samsung}/spdif.c | 4 +- sound/soc/{s3c24xx => samsung}/spdif.h | 2 +- sound/soc/sh/Kconfig | 4 +- sound/soc/sh/fsi-ak4642.c | 140 +- sound/soc/sh/fsi.c | 273 +- sound/soc/sh/migor.c | 6 +- sound/soc/sh/sh7760-ac97.c | 3 +- sound/soc/sh/siu.h | 2 +- sound/soc/sh/siu_dai.c | 2 +- sound/soc/sh/siu_pcm.c | 2 +- sound/soc/soc-cache.c | 1065 +++++- sound/soc/soc-core.c | 561 ++- sound/soc/soc-dapm.c | 860 +++-- sound/soc/soc-jack.c | 31 +- 218 files changed, 20845 insertions(+), 5360 deletions(-) create mode 100644 include/sound/alc5623.h create mode 100644 include/trace/events/asoc.h create mode 100644 sound/soc/codecs/alc5623.c create mode 100644 sound/soc/codecs/alc5623.h create mode 100644 sound/soc/codecs/wm8737.c create mode 100644 sound/soc/codecs/wm8737.h create mode 100644 sound/soc/codecs/wm8770.c create mode 100644 sound/soc/codecs/wm8770.h create mode 100644 sound/soc/codecs/wm8994-tables.c create mode 100644 sound/soc/codecs/wm8995.c create mode 100644 sound/soc/codecs/wm8995.h create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c delete mode 100644 sound/soc/s3c24xx/Kconfig delete mode 100644 sound/soc/s3c24xx/Makefile delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h create mode 100644 sound/soc/samsung/Kconfig create mode 100644 sound/soc/samsung/Makefile rename sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} (96%) rename sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} (73%) rename sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} (75%) rename sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} (97%) rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (84%) copy sound/soc/{s3c24xx/rx1950_uda1380.c => samsung/h1940_uda1380.c} (57%) create mode 100644 sound/soc/samsung/i2s.c create mode 100644 sound/soc/samsung/i2s.h rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (89%) rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%) rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (94%) rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (89%) rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (84%) rename sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} (99%) rename sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} (99%) rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%) rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (96%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (88%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (87%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (99%) rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (83%) rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (94%) rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (95%) rename sound/soc/{s3c24xx/smdk64xx_wm8580.c => samsung/smdk_wm8580.c} (55%) create mode 100644 sound/soc/samsung/smdk_wm8994.c rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (89%) rename sound/soc/{s3c24xx => samsung}/spdif.c (99%) rename sound/soc/{s3c24xx => samsung}/spdif.h (94%) $ git reset --hard HEAD^ HEAD is now at b1951f3 Merge remote branch 'crypto/master' Merging refs/next/20101221/sound-asoc $ git merge refs/next/20101221/sound-asoc Resolved 'sound/soc/samsung/smdk_wm8580.c' using previous resolution. Resolved 'sound/soc/samsung/smdk_wm9713.c' using previous resolution. Renaming sound/soc/s3c24xx/smdk64xx_wm8580.c => sound/soc/samsung/smdk_wm8580.c Auto-merging sound/soc/samsung/smdk_wm8580.c CONFLICT (rename/modify): Merge conflict in sound/soc/samsung/smdk_wm8580.c Renaming sound/soc/s3c24xx/smdk_wm9713.c => sound/soc/samsung/smdk_wm9713.c Auto-merging sound/soc/samsung/smdk_wm9713.c CONFLICT (rename/modify): Merge conflict in sound/soc/samsung/smdk_wm9713.c Auto-merging MAINTAINERS Auto-merging arch/arm/mach-s3c64xx/dev-audio.c Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging arch/arm/plat-s3c24xx/devs.c Auto-merging arch/arm/plat-samsung/Makefile Auto-merging arch/arm/plat-samsung/dev-asocdma.c CONFLICT (add/add): Merge conflict in arch/arm/plat-samsung/dev-asocdma.c Auto-merging arch/arm/plat-samsung/include/plat/devs.h Removing sound/soc/s3c24xx/Kconfig Removing sound/soc/s3c24xx/Makefile Removing sound/soc/s3c24xx/aquila_wm8994.c Removing sound/soc/s3c24xx/s3c64xx-i2s-v4.c Removing sound/soc/s3c24xx/s3c64xx-i2s.c Removing sound/soc/s3c24xx/s3c64xx-i2s.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/plat-samsung/dev-asocdma.c'. [master c491f55] Merge commit 'refs/next/20101221/sound-asoc' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 2 +- arch/arm/mach-kirkwood/openrd-setup.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 2 +- arch/arm/mach-s5pc100/dev-audio.c | 2 +- arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + arch/arm/mach-s5pv210/dev-audio.c | 2 +- arch/arm/mach-shmobile/board-ap4evb.c | 5 + arch/arm/plat-s3c24xx/devs.c | 2 +- arch/arm/plat-samsung/dev-asocdma.c | 1 + arch/sh/boards/mach-se/7724/setup.c | 5 + drivers/gpio/wm8994-gpio.c | 24 + drivers/mfd/wm8994-core.c | 93 +- drivers/regulator/wm8994-regulator.c | 23 +- include/linux/mfd/wm8994/core.h | 8 + include/linux/mfd/wm8994/pdata.h | 17 + include/linux/mfd/wm8994/registers.h | 302 ++ include/sound/alc5623.h | 15 + include/sound/soc-dai.h | 4 +- include/sound/soc-dapm.h | 99 +- include/sound/soc.h | 116 +- include/trace/events/asoc.h | 235 ++ sound/aoa/core/gpio-feature.c | 7 +- sound/aoa/core/gpio-pmf.c | 7 +- sound/i2c/other/ak4113.c | 5 +- sound/i2c/other/ak4114.c | 5 +- sound/pci/ac97/ac97_codec.c | 6 +- sound/pci/hda/patch_via.c | 3 +- sound/pci/oxygen/oxygen_lib.c | 6 +- sound/soc/Kconfig | 4 +- sound/soc/Makefile | 2 +- sound/soc/atmel/playpaq_wm8510.c | 12 +- sound/soc/atmel/sam9g20_wm8731.c | 18 +- sound/soc/atmel/snd-soc-afeb9260.c | 14 +- sound/soc/au1x/db1200.c | 1 - sound/soc/blackfin/bf5xx-ad1836.c | 1 - sound/soc/blackfin/bf5xx-ad193x.c | 1 - sound/soc/blackfin/bf5xx-ad73311.c | 1 - sound/soc/blackfin/bf5xx-ssm2602.c | 1 - sound/soc/codecs/88pm860x-codec.c | 22 +- sound/soc/codecs/Kconfig | 13 + sound/soc/codecs/Makefile | 8 +- sound/soc/codecs/ad1836.c | 7 +- sound/soc/codecs/ad193x.c | 7 +- sound/soc/codecs/ad1980.c | 1 - sound/soc/codecs/ak4535.c | 20 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 10 +- sound/soc/codecs/alc5623.c | 1117 +++++++ sound/soc/codecs/alc5623.h | 161 + sound/soc/codecs/cq93vc.c | 4 +- sound/soc/codecs/cs42l51.c | 6 +- sound/soc/codecs/cx20442.c | 15 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/jz4740.c | 11 +- sound/soc/codecs/max98088.c | 13 +- sound/soc/codecs/ssm2602.c | 10 +- sound/soc/codecs/stac9766.c | 2 +- sound/soc/codecs/tlv320aic23.c | 10 +- sound/soc/codecs/tlv320aic26.c | 1 - sound/soc/codecs/tlv320aic3x.c | 71 +- sound/soc/codecs/tlv320dac33.c | 73 +- sound/soc/codecs/tpa6130a2.c | 100 +- sound/soc/codecs/tpa6130a2.h | 1 + sound/soc/codecs/twl4030.c | 56 +- sound/soc/codecs/twl6040.c | 855 +++++- sound/soc/codecs/twl6040.h | 8 + sound/soc/codecs/uda134x.c | 3 +- sound/soc/codecs/uda1380.c | 14 +- sound/soc/codecs/wl1273.c | 3 +- sound/soc/codecs/wm2000.c | 6 +- sound/soc/codecs/wm8350.c | 34 +- sound/soc/codecs/wm8400.c | 12 +- sound/soc/codecs/wm8510.c | 12 +- sound/soc/codecs/wm8523.c | 12 +- sound/soc/codecs/wm8580.c | 22 +- sound/soc/codecs/wm8711.c | 10 +- sound/soc/codecs/wm8728.c | 12 +- sound/soc/codecs/wm8731.c | 101 +- sound/soc/codecs/wm8737.c | 754 +++++ sound/soc/codecs/wm8737.h | 322 ++ sound/soc/codecs/wm8741.c | 10 +- sound/soc/codecs/wm8750.c | 12 +- sound/soc/codecs/wm8753.c | 49 +- sound/soc/codecs/wm8770.c | 749 +++++ sound/soc/codecs/wm8770.h | 51 + sound/soc/codecs/wm8776.c | 10 +- sound/soc/codecs/wm8804.c | 7 +- sound/soc/codecs/wm8900.c | 12 +- sound/soc/codecs/wm8903.c | 194 +- sound/soc/codecs/wm8904.c | 36 +- sound/soc/codecs/wm8940.c | 7 +- sound/soc/codecs/wm8955.c | 12 +- sound/soc/codecs/wm8960.c | 28 +- sound/soc/codecs/wm8961.c | 12 +- sound/soc/codecs/wm8962.c | 36 +- sound/soc/codecs/wm8971.c | 30 +- sound/soc/codecs/wm8974.c | 12 +- sound/soc/codecs/wm8978.c | 12 +- sound/soc/codecs/wm8985.c | 12 +- sound/soc/codecs/wm8988.c | 10 +- sound/soc/codecs/wm8990.c | 12 +- sound/soc/codecs/wm8993.c | 20 +- sound/soc/codecs/wm8994-tables.c | 3147 ++++++++++++++++++++ sound/soc/codecs/wm8994.c | 2529 +++++----------- sound/soc/codecs/wm8994.h | 14 + sound/soc/codecs/wm9081.c | 14 +- sound/soc/codecs/wm9090.c | 18 +- sound/soc/codecs/wm9705.c | 7 +- sound/soc/codecs/wm9712.c | 10 +- sound/soc/codecs/wm9713.c | 9 +- sound/soc/codecs/wm_hubs.c | 108 +- sound/soc/codecs/wm_hubs.h | 3 + sound/soc/davinci/davinci-evm.c | 22 +- sound/soc/davinci/davinci-sffsdr.c | 1 - sound/soc/ep93xx/ep93xx-i2s.c | 4 +- sound/soc/ep93xx/ep93xx-pcm.c | 4 +- sound/soc/ep93xx/snappercl15.c | 6 +- sound/soc/imx/eukrea-tlv320.c | 1 - sound/soc/imx/imx-ssi.c | 4 +- sound/soc/imx/phycore-ac97.c | 1 - sound/soc/imx/wm1133-ev1.c | 8 +- sound/soc/jz4740/jz4740-i2s.c | 1 - sound/soc/jz4740/qi_lb60.c | 14 +- sound/soc/kirkwood/Kconfig | 11 +- sound/soc/kirkwood/Makefile | 2 + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/kirkwood/kirkwood-t5325.c | 141 + sound/soc/nuc900/nuc900-audio.c | 1 - sound/soc/omap/am3517evm.c | 14 +- sound/soc/omap/ams-delta.c | 82 +- sound/soc/omap/igep0020.c | 1 - sound/soc/omap/n810.c | 43 +- sound/soc/omap/omap2evm.c | 1 - sound/soc/omap/omap3beagle.c | 1 - sound/soc/omap/omap3evm.c | 1 - sound/soc/omap/omap3pandora.c | 45 +- sound/soc/omap/osk5912.c | 14 +- sound/soc/omap/overo.c | 1 - sound/soc/omap/rx51.c | 26 +- sound/soc/omap/sdp3430.c | 44 +- sound/soc/omap/sdp4430.c | 57 +- sound/soc/omap/zoom2.c | 36 +- sound/soc/pxa/corgi.c | 52 +- sound/soc/pxa/e740_wm9705.c | 30 +- sound/soc/pxa/e750_wm9705.c | 30 +- sound/soc/pxa/e800_wm9712.c | 8 +- sound/soc/pxa/em-x270.c | 1 - sound/soc/pxa/magician.c | 36 +- sound/soc/pxa/mioa701_wm9713.c | 18 +- sound/soc/pxa/palm27x.c | 34 +- sound/soc/pxa/poodle.c | 26 +- sound/soc/pxa/raumfeld.c | 1 - sound/soc/pxa/saarb.c | 18 +- sound/soc/pxa/spitz.c | 70 +- sound/soc/pxa/tavorevb3.c | 18 +- sound/soc/pxa/tosa.c | 38 +- sound/soc/pxa/z2.c | 16 +- sound/soc/pxa/zylonite.c | 12 +- sound/soc/s3c24xx/Kconfig | 171 -- sound/soc/s3c24xx/Makefile | 55 - sound/soc/s3c24xx/aquila_wm8994.c | 295 -- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 -- sound/soc/s3c24xx/s3c64xx-i2s.c | 242 -- sound/soc/s3c24xx/s3c64xx-i2s.h | 41 - sound/soc/s6000/s6105-ipcam.c | 41 +- sound/soc/samsung/Kconfig | 171 ++ sound/soc/samsung/Makefile | 55 + sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} | 22 +- sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} | 8 +- sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} | 130 +- sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} | 2 +- sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 60 +- .../rx1950_uda1380.c => samsung/h1940_uda1380.c} | 249 +- sound/soc/samsung/i2s.c | 1258 ++++++++ sound/soc/samsung/i2s.h | 29 + sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 24 +- sound/soc/{s3c24xx => samsung}/lm4857.h | 0 sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 7 +- .../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 68 +- sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 126 +- sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} | 6 +- sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} | 2 +- sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0 sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 14 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0 sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 5 +- sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +- .../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 20 +- .../s3c24xx_simtec_tlv320aic23.c | 20 +- sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 3 +- sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 62 +- sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 7 +- sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 19 +- .../smdk64xx_wm8580.c => samsung/smdk_wm8580.c} | 174 +- sound/soc/samsung/smdk_wm8994.c | 176 ++ sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 24 +- sound/soc/{s3c24xx => samsung}/spdif.c | 4 +- sound/soc/{s3c24xx => samsung}/spdif.h | 2 +- sound/soc/sh/fsi-ak4642.c | 140 +- sound/soc/sh/fsi.c | 273 +- sound/soc/sh/migor.c | 6 +- sound/soc/sh/sh7760-ac97.c | 3 +- sound/soc/sh/siu.h | 2 +- sound/soc/sh/siu_dai.c | 2 +- sound/soc/sh/siu_pcm.c | 2 +- sound/soc/soc-cache.c | 1058 +++++++- sound/soc/soc-core.c | 561 +++- sound/soc/soc-dapm.c | 860 ++++--- sound/soc/soc-jack.c | 31 +- 214 files changed, 14646 insertions(+), 5297 deletions(-) create mode 100644 include/sound/alc5623.h create mode 100644 include/trace/events/asoc.h create mode 100644 sound/soc/codecs/alc5623.c create mode 100644 sound/soc/codecs/alc5623.h create mode 100644 sound/soc/codecs/wm8737.c create mode 100644 sound/soc/codecs/wm8737.h create mode 100644 sound/soc/codecs/wm8770.c create mode 100644 sound/soc/codecs/wm8770.h create mode 100644 sound/soc/codecs/wm8994-tables.c create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c delete mode 100644 sound/soc/s3c24xx/Kconfig delete mode 100644 sound/soc/s3c24xx/Makefile delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h create mode 100644 sound/soc/samsung/Kconfig create mode 100644 sound/soc/samsung/Makefile rename sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} (96%) rename sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} (73%) rename sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} (75%) rename sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} (97%) rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (85%) copy sound/soc/{s3c24xx/rx1950_uda1380.c => samsung/h1940_uda1380.c} (57%) create mode 100644 sound/soc/samsung/i2s.c create mode 100644 sound/soc/samsung/i2s.h rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (89%) rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%) rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (94%) rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (89%) rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (84%) rename sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} (99%) rename sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} (99%) rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%) rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (96%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (88%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (87%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (99%) rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (83%) rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (94%) rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (95%) rename sound/soc/{s3c24xx/smdk64xx_wm8580.c => samsung/smdk_wm8580.c} (55%) create mode 100644 sound/soc/samsung/smdk_wm8994.c rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (89%) rename sound/soc/{s3c24xx => samsung}/spdif.c (99%) rename sound/soc/{s3c24xx => samsung}/spdif.h (94%) Merging sound/for-next $ git merge sound/for-next Removing sound/pci/oxygen/hifier.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 - include/sound/asound.h | 3 + include/sound/hdsp.h | 1 + include/sound/minors.h | 4 +- include/sound/pcm.h | 1 + sound/ac97_bus.c | 4 +- sound/aoa/codecs/onyx.c | 1 - sound/core/pcm_lib.c | 22 + sound/core/pcm_native.c | 3 + sound/core/seq/seq.c | 4 + sound/core/sound.c | 18 +- sound/core/timer.c | 7 +- sound/drivers/ml403-ac97cr.c | 4 +- sound/pci/Kconfig | 19 +- sound/pci/hda/hda_intel.c | 9 +- sound/pci/hda/patch_conexant.c | 96 +- sound/pci/hda/patch_hdmi.c | 43 +- sound/pci/hda/patch_realtek.c | 305 +- sound/pci/hda/patch_sigmatel.c | 3 +- sound/pci/ice1712/delta.c | 49 +- sound/pci/ice1712/delta.h | 11 + sound/pci/oxygen/Makefile | 2 - sound/pci/oxygen/hifier.c | 239 - sound/pci/oxygen/oxygen.c | 133 +- sound/pci/oxygen/oxygen.h | 4 + sound/pci/oxygen/oxygen_lib.c | 18 +- sound/pci/oxygen/oxygen_mixer.c | 55 + sound/pci/oxygen/oxygen_pcm.c | 14 +- sound/pci/oxygen/xonar.h | 2 + sound/pci/oxygen/xonar_cs43xx.c | 70 +- sound/pci/oxygen/xonar_lib.c | 6 +- sound/pci/oxygen/xonar_pcm179x.c | 234 +- sound/pci/oxygen/xonar_wm87x6.c | 73 +- sound/pci/rme9652/hdsp.c | 538 ++- sound/soc/Kconfig | 17 +- sound/soc/codecs/88pm860x-codec.c | 7 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wm8350.c | 71 +- sound/soc/codecs/wm8903.c | 6 + sound/soc/codecs/wm8903.h | 4 - sound/soc/codecs/wm8962.c | 5 + sound/soc/codecs/wm8994.c | 11 +- sound/soc/codecs/wm8995.c | 1818 +++++ sound/soc/codecs/wm8995.h | 8749 +++++++++++++++++++++++ sound/soc/samsung/goni_wm8994.c | 2 +- sound/soc/sh/Kconfig | 4 +- sound/soc/soc-cache.c | 13 +- sound/soc/soc-dapm.c | 2 +- 50 files changed, 12006 insertions(+), 717 deletions(-) delete mode 100644 sound/pci/oxygen/hifier.c create mode 100644 sound/soc/codecs/wm8995.c create mode 100644 sound/soc/codecs/wm8995.h $ git reset --hard HEAD^ HEAD is now at c491f55 Merge commit 'refs/next/20101221/sound-asoc' Merging refs/next/20101223/sound $ git merge refs/next/20101223/sound Auto-merging sound/pci/hda/patch_realtek.c Auto-merging sound/pci/hda/patch_sigmatel.c Removing sound/pci/oxygen/hifier.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 - include/sound/asound.h | 3 + include/sound/hdsp.h | 1 + include/sound/minors.h | 4 +- include/sound/pcm.h | 1 + sound/ac97_bus.c | 4 +- sound/aoa/codecs/onyx.c | 1 - sound/core/pcm_lib.c | 22 + sound/core/pcm_native.c | 3 + sound/core/seq/seq.c | 4 + sound/core/sound.c | 18 +- sound/core/timer.c | 7 +- sound/drivers/ml403-ac97cr.c | 4 +- sound/pci/Kconfig | 19 +- sound/pci/hda/hda_intel.c | 9 +- sound/pci/hda/patch_conexant.c | 96 +++-- sound/pci/hda/patch_hdmi.c | 43 ++- sound/pci/hda/patch_realtek.c | 305 +++++++------- sound/pci/hda/patch_sigmatel.c | 3 +- sound/pci/ice1712/delta.c | 49 ++- sound/pci/ice1712/delta.h | 11 + sound/pci/oxygen/Makefile | 2 - sound/pci/oxygen/hifier.c | 239 ---------- sound/pci/oxygen/oxygen.c | 133 +++++- sound/pci/oxygen/oxygen.h | 4 + sound/pci/oxygen/oxygen_lib.c | 18 +- sound/pci/oxygen/oxygen_mixer.c | 55 +++ sound/pci/oxygen/oxygen_pcm.c | 14 +- sound/pci/oxygen/xonar.h | 2 + sound/pci/oxygen/xonar_cs43xx.c | 70 ++- sound/pci/oxygen/xonar_lib.c | 6 +- sound/pci/oxygen/xonar_pcm179x.c | 234 +++++++--- sound/pci/oxygen/xonar_wm87x6.c | 73 +++- sound/pci/rme9652/hdsp.c | 538 ++++++++++++++++++++--- sound/soc/Kconfig | 17 +- sound/soc/codecs/wm8903.h | 4 - sound/soc/codecs/wm8994.c | 6 +- sound/soc/sh/Kconfig | 4 +- sound/soc/soc-cache.c | 13 +- sound/soc/soc-dapm.c | 2 +- 41 files changed, 1357 insertions(+), 697 deletions(-) delete mode 100644 sound/pci/oxygen/hifier.c Merging cpufreq/next $ git merge cpufreq/next Merge made by recursive. drivers/cpufreq/cpufreq_conservative.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging quilt/rr $ git merge quilt/rr Auto-merging arch/x86/kernel/head_32.S Auto-merging arch/x86/lguest/boot.c Merge made by recursive. Documentation/lguest/lguest.c | 73 ++++++++++++++++++++++++++++++++++---- Documentation/lguest/lguest.txt | 5 +++ arch/x86/lguest/boot.c | 2 +- drivers/lguest/page_tables.c | 2 +- drivers/lguest/x86/core.c | 4 +- 5 files changed, 74 insertions(+), 12 deletions(-) Merging input/next $ git merge input/next Resolved 'drivers/input/keyboard/Kconfig' using previous resolution. Resolved 'include/linux/input.h' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/hid/Kconfig Auto-merging drivers/hid/hid-3m-pct.c Auto-merging drivers/hid/hid-core.c Auto-merging drivers/hid/hid-egalax.c Auto-merging drivers/hid/hid-ids.h Auto-merging drivers/input/evdev.c Auto-merging drivers/input/input.c Auto-merging drivers/input/keyboard/Kconfig CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig Auto-merging drivers/input/keyboard/Makefile Auto-merging drivers/input/misc/Kconfig Auto-merging drivers/input/misc/Makefile Auto-merging drivers/input/tablet/wacom_wac.c Auto-merging include/linux/input.h CONFLICT (content): Merge conflict in include/linux/input.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5fa6f7b] Merge remote branch 'input/next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/device-drivers.tmpl | 4 + Documentation/input/cma3000_d0x.txt | 115 +++++ Documentation/input/multi-touch-protocol.txt | 9 +- MAINTAINERS | 2 + arch/arm/plat-spear/include/plat/keyboard.h | 141 ++++++ drivers/hid/Kconfig | 3 +- drivers/hid/hid-3m-pct.c | 36 +-- drivers/hid/hid-core.c | 2 + drivers/hid/hid-egalax.c | 129 ++--- drivers/hid/hid-ids.h | 2 + drivers/input/Makefile | 2 +- drivers/input/apm-power.c | 14 +- drivers/input/evbug.c | 18 +- drivers/input/evdev.c | 15 +- drivers/input/ff-core.c | 11 +- drivers/input/ff-memless.c | 31 +- drivers/input/gameport/gameport.c | 152 +++--- drivers/input/input-mt.c | 170 +++++++ drivers/input/input-polldev.c | 5 +- drivers/input/input.c | 70 +--- drivers/input/joydev.c | 4 +- drivers/input/joystick/iforce/Makefile | 15 +- drivers/input/joystick/xpad.c | 123 +++-- drivers/input/keyboard/Kconfig | 19 +- drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/spear-keyboard.c | 344 +++++++++++++ drivers/input/keyboard/tca6416-keypad.c | 13 +- drivers/input/misc/Kconfig | 24 + drivers/input/misc/Makefile | 2 + drivers/input/misc/cma3000_d0x.c | 398 +++++++++++++++ drivers/input/misc/cma3000_d0x.h | 42 ++ drivers/input/misc/cma3000_d0x_i2c.c | 143 ++++++ drivers/input/misc/pcf8574_keypad.c | 19 +- drivers/input/misc/uinput.c | 4 +- drivers/input/mouse/hgpk.c | 695 +++++++++++++++++++++++--- drivers/input/mouse/hgpk.h | 31 ++- drivers/input/mouse/psmouse-base.c | 1 + drivers/input/mousedev.c | 10 +- drivers/input/serio/ams_delta_serio.c | 1 - drivers/input/serio/ct82c710.c | 8 +- drivers/input/serio/hil_mlc.c | 5 + drivers/input/serio/hp_sdc_mlc.c | 18 +- drivers/input/serio/i8042-x86ia64io.h | 30 +- drivers/input/serio/i8042.c | 92 ++-- drivers/input/serio/i8042.h | 14 +- drivers/input/serio/ps2mult.c | 2 +- drivers/input/serio/serio.c | 155 +++---- drivers/input/tablet/wacom_wac.c | 26 +- drivers/input/tablet/wacom_wac.h | 4 - drivers/input/touchscreen/Kconfig | 22 +- drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/qt602240_ts.c | 21 +- drivers/input/touchscreen/st1232.c | 274 ++++++++++ drivers/input/touchscreen/wacom_w8001.c | 25 +- drivers/input/xen-kbdfront.c | 10 +- drivers/macintosh/mac_hid.c | 8 + include/linux/input.h | 22 +- include/linux/input/cma3000.h | 59 +++ include/linux/input/mt.h | 57 +++ 59 files changed, 2960 insertions(+), 713 deletions(-) create mode 100644 Documentation/input/cma3000_d0x.txt create mode 100644 arch/arm/plat-spear/include/plat/keyboard.h create mode 100644 drivers/input/input-mt.c create mode 100644 drivers/input/keyboard/spear-keyboard.c create mode 100644 drivers/input/misc/cma3000_d0x.c create mode 100644 drivers/input/misc/cma3000_d0x.h create mode 100644 drivers/input/misc/cma3000_d0x_i2c.c create mode 100644 drivers/input/touchscreen/st1232.c create mode 100644 include/linux/input/cma3000.h create mode 100644 include/linux/input/mt.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 block/ioctl.c Auto-merging drivers/md/dm-table.c Auto-merging drivers/md/md.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/sd.c Auto-merging fs/block_dev.c Auto-merging fs/btrfs/volumes.c Auto-merging fs/btrfs/volumes.h Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c Auto-merging fs/gfs2/ops_fstype.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/nilfs2/super.c Auto-merging fs/ocfs2/cluster/heartbeat.c Auto-merging fs/reiserfs/journal.c Auto-merging fs/splice.c Auto-merging fs/super.c Auto-merging include/linux/blkdev.h Auto-merging include/linux/fs.h Auto-merging include/scsi/scsi.h Auto-merging kernel/power/swap.c Merge made by recursive. Documentation/cgroups/blkio-controller.txt | 27 + block/blk-cgroup.c | 4 - block/blk-core.c | 10 +- block/cfq-iosched.c | 62 ++-- block/genhd.c | 548 +++++++++++++++++++-- block/ioctl.c | 5 +- drivers/block/drbd/drbd_int.h | 2 - drivers/block/drbd/drbd_main.c | 7 +- drivers/block/drbd/drbd_nl.c | 105 ++--- drivers/block/loop.c | 6 +- drivers/block/pktcdvd.c | 22 +- drivers/cdrom/cdrom.c | 56 ++- drivers/char/raw.c | 14 +- drivers/md/dm-table.c | 20 +- drivers/md/dm.c | 4 +- drivers/md/md.c | 16 +- drivers/mtd/devices/block2mtd.c | 10 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/scsi/scsi_lib.c | 13 +- drivers/scsi/sd.c | 10 +- drivers/scsi/sr.c | 174 ++++--- drivers/scsi/sr.h | 3 +- drivers/scsi/sr_ioctl.c | 2 +- drivers/usb/gadget/storage_common.c | 7 +- fs/block_dev.c | 741 ++++++++++------------------ fs/btrfs/volumes.c | 28 +- fs/btrfs/volumes.h | 2 +- fs/char_dev.c | 2 +- fs/ext3/super.c | 12 +- fs/ext4/super.c | 12 +- fs/gfs2/ops_fstype.c | 8 +- fs/jfs/jfs_logmgr.c | 17 +- fs/logfs/dev_bdev.c | 7 +- fs/nfsd/vfs.c | 5 - fs/nilfs2/super.c | 8 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/partitions/check.c | 98 +---- fs/reiserfs/journal.c | 21 +- fs/splice.c | 43 +-- fs/super.c | 19 +- fs/xfs/linux-2.6/xfs_super.c | 5 +- include/linux/blkdev.h | 4 +- include/linux/cdrom.h | 6 + include/linux/fs.h | 26 +- include/linux/genhd.h | 20 +- include/scsi/scsi.h | 1 + include/trace/events/block.h | 6 +- kernel/power/swap.c | 5 +- kernel/trace/blktrace.c | 12 +- mm/swapfile.c | 7 +- 50 files changed, 1207 insertions(+), 1039 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Auto-merging drivers/md/dm.c Merge made by recursive. drivers/md/dm-crypt.c | 13 +++-- drivers/md/dm-ioctl.c | 103 +++++++++++++++++++++++++++--------- drivers/md/dm-kcopyd.c | 2 +- drivers/md/dm-log-userspace-base.c | 10 ++-- drivers/md/dm-mpath.c | 12 ---- drivers/md/dm-raid1.c | 12 ++++- drivers/md/dm.c | 14 +++--- include/linux/dm-ioctl.h | 12 +++- 8 files changed, 118 insertions(+), 60 deletions(-) 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. drivers/power/Kconfig | 10 ++ drivers/power/Makefile | 1 + drivers/power/collie_battery.c | 13 +-- drivers/power/ds2760_battery.c | 2 +- drivers/power/gpio-charger.c | 188 +++++++++++++++++++++++++++++++++ drivers/power/intel_mid_battery.c | 2 +- drivers/power/isp1704_charger.c | 201 +++++++++++++++++++++++++++++------- drivers/power/jz4740-battery.c | 13 +++ drivers/power/power_supply_core.c | 6 +- drivers/power/s3c_adc_battery.c | 12 ++- drivers/power/tosa_battery.c | 13 +-- drivers/power/wm97xx_battery.c | 4 +- drivers/power/z2_battery.c | 6 +- include/linux/power/gpio-charger.h | 41 ++++++++ include/linux/s3c_adc_battery.h | 1 + 15 files changed, 447 insertions(+), 66 deletions(-) create mode 100644 drivers/power/gpio-charger.c create mode 100644 include/linux/power/gpio-charger.h Merging leds/for-mm $ git merge leds/for-mm Resolved 'drivers/leds/Kconfig' using previous resolution. Auto-merging drivers/leds/Kconfig CONFLICT (content): Merge conflict in drivers/leds/Kconfig Auto-merging drivers/leds/leds-gpio.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 50122a5] Merge remote branch 'leds/for-mm' $ git diff -M --stat --summary HEAD^.. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging mmc/mmc-next $ git merge mmc/mmc-next Auto-merging drivers/mmc/host/Kconfig Auto-merging include/linux/pci_ids.h Merge made by recursive. arch/arm/mach-at91/include/mach/at91_mci.h | 2 + arch/arm/mach-dove/common.c | 4 +- drivers/mmc/core/Kconfig | 11 ++ drivers/mmc/core/core.c | 89 ++++++++++++- drivers/mmc/core/core.h | 3 + drivers/mmc/core/debugfs.c | 5 + drivers/mmc/core/host.c | 206 +++++++++++++++++++++++++++- drivers/mmc/core/host.h | 21 +++ drivers/mmc/core/mmc.c | 78 +++++++---- drivers/mmc/core/mmc_ops.c | 101 ++++++++++++++ drivers/mmc/core/mmc_ops.h | 1 + drivers/mmc/core/sd.c | 5 +- drivers/mmc/core/sdio.c | 18 ++- drivers/mmc/core/sdio_bus.c | 32 ----- drivers/mmc/host/Kconfig | 11 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/at91_mci.c | 13 ++- drivers/mmc/host/atmel-mci.c | 18 ++- drivers/mmc/host/davinci_mmc.c | 2 +- drivers/mmc/host/mxcmmc.c | 53 ++++++- drivers/mmc/host/sdhci-dove.c | 70 ++++++++++ drivers/mmc/host/sdhci-pci.c | 161 +++++++++++++++++++++- drivers/mmc/host/sdhci-pltfm.c | 3 + drivers/mmc/host/sdhci-pltfm.h | 1 + drivers/mmc/host/sdhci-s3c.c | 66 +++++++++ drivers/mmc/host/sdhci.c | 35 ++++- drivers/mmc/host/sdhci.h | 3 +- include/linux/mmc/host.h | 19 +++ include/linux/mmc/mmc.h | 2 + include/linux/mmc/sdhci.h | 4 + include/linux/pci_ids.h | 7 + 31 files changed, 943 insertions(+), 102 deletions(-) create mode 100644 drivers/mmc/host/sdhci-dove.c Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging drivers/serial/kgdboc.c Merge made by recursive. arch/x86/kernel/kgdb.c | 4 ++-- drivers/misc/kgdbts.c | 2 +- drivers/serial/kgdboc.c | 2 +- kernel/debug/kdb/kdb_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging mm/slab.c Auto-merging mm/slub.c Merge made by recursive. Documentation/vm/Makefile | 2 +- include/linux/slab_def.h | 33 ++++++---------- include/linux/slub_def.h | 55 +++++++++++++-------------- mm/slab.c | 38 +++++++++++------- mm/slub.c | 30 +++++++++++--- {Documentation/vm => tools/slub}/slabinfo.c | 6 +- 6 files changed, 89 insertions(+), 75 deletions(-) rename {Documentation/vm => tools/slub}/slabinfo.c (99%) 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/mfd/Makefile' using previous resolution. Resolved 'drivers/mfd/wm8994-core.c' using previous resolution. Auto-merging drivers/gpio/cs5535-gpio.c Auto-merging drivers/mfd/Kconfig Auto-merging drivers/mfd/Makefile CONFLICT (content): Merge conflict in drivers/mfd/Makefile Auto-merging drivers/mfd/ab8500-core.c Removing drivers/mfd/ab8500-spi.c Auto-merging drivers/mfd/wm831x-core.c Auto-merging drivers/mfd/wm8994-core.c CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 829e5ef] Merge remote branch 'mfd/for-next' $ git diff -M --stat --summary HEAD^.. drivers/gpio/cs5535-gpio.c | 93 ++--- drivers/mfd/88pm860x-core.c | 36 +- drivers/mfd/Kconfig | 16 +- drivers/mfd/Makefile | 3 +- drivers/mfd/ab3550-core.c | 28 +- drivers/mfd/ab8500-core.c | 270 +++++++++- drivers/mfd/ab8500-debugfs.c | 1016 +++++++++++++++++----------------- drivers/mfd/ab8500-spi.c | 143 ----- drivers/mfd/asic3.c | 62 ++-- drivers/mfd/cs5535-mfd.c | 151 ++++++ drivers/mfd/ezx-pcap.c | 25 +- drivers/mfd/htc-egpio.c | 27 +- drivers/mfd/htc-i2cpld.c | 40 +- drivers/mfd/jz4740-adc.c | 25 +- drivers/mfd/max8925-core.c | 30 +- drivers/mfd/max8998-irq.c | 37 +- drivers/mfd/max8998.c | 108 ++++ drivers/mfd/mc13xxx-core.c | 2 +- drivers/mfd/mfd-core.c | 4 + drivers/mfd/sh_mobile_sdhi.c | 5 + drivers/mfd/sm501.c | 9 +- drivers/mfd/stmpe.c | 28 +- drivers/mfd/t7l66xb.c | 20 +- drivers/mfd/tc6393xb.c | 22 +- drivers/mfd/tps65010.c | 2 +- drivers/mfd/tps6586x.c | 36 +- drivers/mfd/twl-core.c | 2 +- drivers/mfd/twl4030-irq.c | 28 +- drivers/mfd/twl6030-irq.c | 2 +- drivers/mfd/vx855.c | 2 +- drivers/mfd/wm831x-core.c | 17 +- drivers/mfd/wm831x-i2c.c | 1 + drivers/mfd/wm831x-irq.c | 42 +- drivers/mfd/wm831x-spi.c | 18 + drivers/mfd/wm8350-irq.c | 32 +- drivers/mfd/wm8994-core.c | 48 +- drivers/mfd/wm8994-irq.c | 32 +- drivers/misc/Kconfig | 2 +- drivers/misc/cs5535-mfgpt.c | 73 +-- include/linux/mfd/ab8500.h | 4 +- include/linux/mfd/core.h | 6 + include/linux/mfd/max8998-private.h | 2 + include/linux/mfd/max8998.h | 1 + include/linux/mfd/wm831x/core.h | 1 + 44 files changed, 1434 insertions(+), 1117 deletions(-) delete mode 100644 drivers/mfd/ab8500-spi.c create mode 100644 drivers/mfd/cs5535-mfd.c 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_crtc_helper.c Auto-merging drivers/gpu/drm/drm_irq.c Auto-merging drivers/gpu/drm/radeon/evergreen.c Auto-merging drivers/gpu/drm/radeon/evergreend.h Auto-merging drivers/gpu/drm/radeon/r600.c Auto-merging drivers/gpu/drm/radeon/radeon_device.c Auto-merging drivers/gpu/drm/radeon/radeon_drv.c Auto-merging drivers/gpu/drm/radeon/radeon_fb.c Removing include/linux/intel-gtt.h Merge made by recursive. drivers/char/agp/agp.h | 1 - drivers/char/agp/compat_ioctl.c | 1 - drivers/char/agp/compat_ioctl.h | 1 - drivers/char/agp/frontend.c | 8 - drivers/char/agp/generic.c | 27 - drivers/char/agp/intel-agp.c | 5 - drivers/char/agp/intel-agp.h | 14 +- drivers/char/agp/intel-gtt.c | 778 +++--- drivers/gpu/drm/drm_agpsupport.c | 6 - drivers/gpu/drm/drm_crtc_helper.c | 13 +- drivers/gpu/drm/drm_fb_helper.c | 24 + drivers/gpu/drm/drm_irq.c | 566 ++++- drivers/gpu/drm/drm_mm.c | 40 +- drivers/gpu/drm/drm_stub.c | 10 + drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/i915_debugfs.c | 471 +++- drivers/gpu/drm/i915/i915_dma.c | 789 +++--- drivers/gpu/drm/i915/i915_drv.c | 68 +- drivers/gpu/drm/i915/i915_drv.h | 605 +++-- drivers/gpu/drm/i915/i915_gem.c | 3974 +++++++++----------------- drivers/gpu/drm/i915/i915_gem_debug.c | 23 +- drivers/gpu/drm/i915/i915_gem_evict.c | 125 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1343 +++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 99 + drivers/gpu/drm/i915/i915_gem_tiling.c | 139 +- drivers/gpu/drm/i915/i915_irq.c | 724 +++-- drivers/gpu/drm/i915/i915_reg.h | 193 ++- drivers/gpu/drm/i915/i915_suspend.c | 104 +- drivers/gpu/drm/i915/i915_trace.h | 91 +- drivers/gpu/drm/i915/intel_display.c | 999 +++++-- drivers/gpu/drm/i915/intel_dp.c | 3 +- drivers/gpu/drm/i915/intel_drv.h | 22 +- drivers/gpu/drm/i915/intel_fb.c | 31 +- drivers/gpu/drm/i915/intel_i2c.c | 21 +- drivers/gpu/drm/i915/intel_lvds.c | 43 +- drivers/gpu/drm/i915/intel_opregion.c | 8 +- drivers/gpu/drm/i915/intel_overlay.c | 116 +- drivers/gpu/drm/i915/intel_panel.c | 52 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 1007 ++++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 136 +- drivers/gpu/drm/i915/intel_sdvo.c | 7 +- drivers/gpu/drm/i915/intel_tv.c | 14 +- drivers/gpu/drm/nouveau/Makefile | 17 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 102 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 319 ++- drivers/gpu/drm/nouveau/nouveau_channel.c | 360 ++- drivers/gpu/drm/nouveau/nouveau_connector.c | 54 +- drivers/gpu/drm/nouveau/nouveau_display.c | 207 ++ drivers/gpu/drm/nouveau/nouveau_dma.c | 32 +- drivers/gpu/drm/nouveau/nouveau_dma.h | 9 +- drivers/gpu/drm/nouveau/nouveau_dp.c | 6 +- drivers/gpu/drm/nouveau/nouveau_drv.c | 52 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 422 ++- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 188 +- drivers/gpu/drm/nouveau/nouveau_fbcon.h | 18 +- drivers/gpu/drm/nouveau/nouveau_fence.c | 117 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 171 +- drivers/gpu/drm/nouveau/nouveau_hw.c | 11 +- drivers/gpu/drm/nouveau/nouveau_irq.c | 1210 +-------- drivers/gpu/drm/nouveau/nouveau_mem.c | 426 ++-- drivers/gpu/drm/nouveau/nouveau_mm.c | 271 ++ drivers/gpu/drm/nouveau/nouveau_mm.h | 67 + drivers/gpu/drm/nouveau/nouveau_notifier.c | 44 +- drivers/gpu/drm/nouveau/nouveau_object.c | 753 +++--- drivers/gpu/drm/nouveau/nouveau_pm.c | 30 + drivers/gpu/drm/nouveau/nouveau_ramht.c | 11 +- drivers/gpu/drm/nouveau/nouveau_ramht.h | 2 +- drivers/gpu/drm/nouveau/nouveau_reg.h | 75 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 212 +- drivers/gpu/drm/nouveau/nouveau_state.c | 288 ++- drivers/gpu/drm/nouveau/nouveau_util.c | 69 + drivers/gpu/drm/nouveau/nouveau_util.h | 45 + drivers/gpu/drm/nouveau/nouveau_vm.c | 439 +++ drivers/gpu/drm/nouveau/nouveau_vm.h | 113 + drivers/gpu/drm/nouveau/nv04_crtc.c | 8 +- drivers/gpu/drm/nouveau/nv04_dac.c | 12 +- drivers/gpu/drm/nouveau/nv04_display.c | 21 + drivers/gpu/drm/nouveau/nv04_fbcon.c | 102 +- drivers/gpu/drm/nouveau/nv04_fifo.c | 240 ++- drivers/gpu/drm/nouveau/nv04_graph.c | 645 +++-- drivers/gpu/drm/nouveau/nv04_instmem.c | 50 +- drivers/gpu/drm/nouveau/nv10_fb.c | 124 +- drivers/gpu/drm/nouveau/nv10_fifo.c | 19 +- drivers/gpu/drm/nouveau/nv10_graph.c | 203 +- drivers/gpu/drm/nouveau/nv20_graph.c | 244 ++- drivers/gpu/drm/nouveau/nv30_fb.c | 23 +- drivers/gpu/drm/nouveau/nv40_fb.c | 22 +- drivers/gpu/drm/nouveau/nv40_fifo.c | 19 +- drivers/gpu/drm/nouveau/nv40_graph.c | 193 +- drivers/gpu/drm/nouveau/nv50_crtc.c | 27 +- drivers/gpu/drm/nouveau/nv50_display.c | 422 +--- drivers/gpu/drm/nouveau/nv50_display.h | 2 - drivers/gpu/drm/nouveau/nv50_evo.c | 345 +++ drivers/gpu/drm/nouveau/nv50_evo.h | 10 + drivers/gpu/drm/nouveau/nv50_fb.c | 71 +- drivers/gpu/drm/nouveau/nv50_fbcon.c | 114 +- drivers/gpu/drm/nouveau/nv50_fifo.c | 42 +- drivers/gpu/drm/nouveau/nv50_gpio.c | 198 ++- drivers/gpu/drm/nouveau/nv50_graph.c | 642 ++++- drivers/gpu/drm/nouveau/nv50_instmem.c | 375 ++-- drivers/gpu/drm/nouveau/nv50_vm.c | 180 ++ drivers/gpu/drm/nouveau/nv50_vram.c | 190 ++ drivers/gpu/drm/nouveau/nv84_crypt.c | 140 + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 271 ++ drivers/gpu/drm/nouveau/nvc0_fifo.c | 359 +++ drivers/gpu/drm/nouveau/nvc0_graph.c | 709 +++++- drivers/gpu/drm/nouveau/nvc0_graph.h | 66 + drivers/gpu/drm/nouveau/nvc0_grctx.c | 2854 ++++++++++++++++++ drivers/gpu/drm/nouveau/nvc0_instmem.c | 317 +- drivers/gpu/drm/nouveau/nvc0_vm.c | 123 + drivers/gpu/drm/nouveau/nvc0_vram.c | 99 + drivers/gpu/drm/nouveau/nvreg.h | 3 +- drivers/gpu/drm/radeon/Makefile | 5 +- drivers/gpu/drm/radeon/ObjectID.h | 48 + drivers/gpu/drm/radeon/atom.c | 14 +- drivers/gpu/drm/radeon/atombios.h | 997 ++++++- drivers/gpu/drm/radeon/evergreen.c | 609 +++-- drivers/gpu/drm/radeon/evergreen_blit_kms.c | 27 +- drivers/gpu/drm/radeon/evergreen_reg.h | 6 + drivers/gpu/drm/radeon/evergreend.h | 9 +- drivers/gpu/drm/radeon/r100.c | 76 +- drivers/gpu/drm/radeon/r100d.h | 2 +- drivers/gpu/drm/radeon/r300.c | 7 + drivers/gpu/drm/radeon/r500_reg.h | 4 + drivers/gpu/drm/radeon/r600.c | 135 +- drivers/gpu/drm/radeon/r600d.h | 9 + drivers/gpu/drm/radeon/radeon.h | 66 +- drivers/gpu/drm/radeon/radeon_asic.c | 92 +- drivers/gpu/drm/radeon/radeon_asic.h | 10 + drivers/gpu/drm/radeon/radeon_atombios.c | 1134 +++++--- drivers/gpu/drm/radeon/radeon_combios.c | 3 +- drivers/gpu/drm/radeon/radeon_connectors.c | 3 + drivers/gpu/drm/radeon/radeon_cs.c | 17 +- drivers/gpu/drm/radeon/radeon_device.c | 8 +- drivers/gpu/drm/radeon/radeon_display.c | 318 ++- drivers/gpu/drm/radeon/radeon_drv.c | 11 +- drivers/gpu/drm/radeon/radeon_encoders.c | 99 +- drivers/gpu/drm/radeon/radeon_family.h | 1 + drivers/gpu/drm/radeon/radeon_fb.c | 2 - drivers/gpu/drm/radeon/radeon_fence.c | 4 + drivers/gpu/drm/radeon/radeon_irq_kms.c | 41 +- drivers/gpu/drm/radeon/radeon_kms.c | 21 + drivers/gpu/drm/radeon/radeon_mode.h | 15 +- drivers/gpu/drm/radeon/radeon_object.c | 57 +- drivers/gpu/drm/radeon/radeon_object.h | 7 +- drivers/gpu/drm/radeon/radeon_pm.c | 10 +- drivers/gpu/drm/radeon/radeon_reg.h | 3 + drivers/gpu/drm/radeon/radeon_trace.h | 82 + drivers/gpu/drm/radeon/radeon_trace_points.c | 9 + drivers/gpu/drm/radeon/reg_srcs/rv515 | 16 + drivers/gpu/drm/radeon/rs600.c | 116 +- drivers/gpu/drm/radeon/rv770.c | 120 +- drivers/gpu/drm/radeon/rv770d.h | 9 + drivers/gpu/drm/ttm/ttm_bo.c | 156 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 138 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 29 +- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 169 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 3 - include/drm/drmP.h | 96 +- include/drm/drm_crtc.h | 9 + include/drm/drm_mm.h | 7 + include/drm/drm_pciids.h | 4 + include/drm/i915_drm.h | 12 + include/drm/intel-gtt.h | 35 +- include/drm/nouveau_drm.h | 5 +- include/drm/ttm/ttm_bo_api.h | 50 +- include/drm/ttm/ttm_bo_driver.h | 152 +- include/drm/ttm/ttm_execbuf_util.h | 11 +- include/linux/agp_backend.h | 2 - include/linux/intel-gtt.h | 20 - include/linux/kref.h | 2 + lib/kref.c | 30 + 174 files changed, 22935 insertions(+), 10548 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_execbuffer.c create mode 100644 drivers/gpu/drm/i915/i915_gem_gtt.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_mm.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_mm.h create mode 100644 drivers/gpu/drm/nouveau/nouveau_util.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_util.h create mode 100644 drivers/gpu/drm/nouveau/nouveau_vm.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_vm.h create mode 100644 drivers/gpu/drm/nouveau/nv50_evo.c create mode 100644 drivers/gpu/drm/nouveau/nv50_vm.c create mode 100644 drivers/gpu/drm/nouveau/nv50_vram.c create mode 100644 drivers/gpu/drm/nouveau/nv84_crypt.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_fbcon.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_graph.h create mode 100644 drivers/gpu/drm/nouveau/nvc0_grctx.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_vm.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_vram.c create mode 100644 drivers/gpu/drm/radeon/radeon_trace.h create mode 100644 drivers/gpu/drm/radeon/radeon_trace_points.c delete mode 100644 include/linux/intel-gtt.h Merging fbdev/master $ git merge fbdev/master Recorded preimage for 'drivers/video/sh_mobile_lcdcfb.c' Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging drivers/video/Kconfig Auto-merging drivers/video/Makefile Auto-merging drivers/video/sh_mobile_hdmi.c Auto-merging drivers/video/sh_mobile_lcdcfb.c CONFLICT (content): Merge conflict in drivers/video/sh_mobile_lcdcfb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/video/sh_mobile_lcdcfb.c'. [master 85b427a] Merge remote branch 'fbdev/master' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-shmobile/board-ap4evb.c | 31 +- drivers/video/Kconfig | 92 +++ drivers/video/Makefile | 5 + drivers/video/bf537-lq035.c | 914 +++++++++++++++++++++++++ drivers/video/bfin_adv7393fb.c | 832 +++++++++++++++++++++++ drivers/video/bfin_adv7393fb.h | 321 +++++++++ drivers/video/fbmon.c | 88 +++ drivers/video/modedb.c | 47 ++ drivers/video/mx3fb.c | 3 +- drivers/video/s1d13xxxfb.c | 50 -- drivers/video/s3c-fb.c | 111 +++- drivers/video/sh_mipi_dsi.c | 103 +++- drivers/video/sh_mobile_hdmi.c | 219 ++++-- drivers/video/sh_mobile_lcdcfb.c | 2 +- drivers/video/sis/init.c | 46 +- drivers/video/sis/init.h | 13 - drivers/video/sis/init301.c | 8 +- drivers/video/sis/init301.h | 11 - drivers/video/sis/sis.h | 65 +-- drivers/video/sis/sis_main.c | 1196 +++++++++++++++++---------------- drivers/video/via/via-core.c | 96 +++- drivers/video/via/via-gpio.c | 29 + drivers/video/via/viafbdev.c | 34 +- drivers/video/via/viafbdev.h | 2 - drivers/video/vt8500lcdfb.c | 447 ++++++++++++ drivers/video/vt8500lcdfb.h | 34 + drivers/video/wm8505fb.c | 422 ++++++++++++ drivers/video/wm8505fb_regs.h | 76 +++ drivers/video/wmt_ge_rops.c | 186 +++++ drivers/video/wmt_ge_rops.h | 5 + include/linux/fb.h | 3 + include/linux/via-core.h | 15 + include/video/s1d13xxxfb.h | 6 - include/video/sh_mobile_hdmi.h | 3 + 34 files changed, 4630 insertions(+), 885 deletions(-) create mode 100644 drivers/video/bf537-lq035.c create mode 100644 drivers/video/bfin_adv7393fb.c create mode 100644 drivers/video/bfin_adv7393fb.h create mode 100644 drivers/video/vt8500lcdfb.c create mode 100644 drivers/video/vt8500lcdfb.h create mode 100644 drivers/video/wm8505fb.c create mode 100644 drivers/video/wm8505fb_regs.h create mode 100644 drivers/video/wmt_ge_rops.c create mode 100644 drivers/video/wmt_ge_rops.h Merging viafb/viafb-next $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next $ git merge omap_dss2/for-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Resolved 'drivers/regulator/core.c' using previous resolution. Resolved 'drivers/regulator/mc13783-regulator.c' using previous resolution. Auto-merging arch/arm/mach-imx/mach-pcm038.c Auto-merging arch/arm/mach-mx3/mach-mx31_3ds.c Auto-merging arch/arm/mach-mx3/mach-mx31moboard.c Auto-merging arch/arm/mach-ux500/board-mop500.c Auto-merging drivers/regulator/core.c CONFLICT (content): Merge conflict in drivers/regulator/core.c Auto-merging drivers/regulator/mc13783-regulator.c CONFLICT (content): Merge conflict in drivers/regulator/mc13783-regulator.c Auto-merging drivers/regulator/tps6586x-regulator.c Auto-merging drivers/regulator/twl-regulator.c Auto-merging drivers/regulator/wm8994-regulator.c Auto-merging include/linux/mfd/ab8500.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a2c3abc] Merge remote branch 'voltage/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-imx/mach-pcm038.c | 4 +- arch/arm/mach-mx3/mach-mx31_3ds.c | 4 +- arch/arm/mach-mx3/mach-mx31moboard.c | 4 +- arch/arm/mach-ux500/board-mop500-regulators.c | 153 +++--- arch/arm/mach-ux500/board-mop500-regulators.h | 19 + arch/arm/mach-ux500/board-mop500.c | 3 + drivers/regulator/88pm8607.c | 3 +- drivers/regulator/Kconfig | 22 + drivers/regulator/Makefile | 3 + drivers/regulator/ab3100.c | 5 +- drivers/regulator/ab8500.c | 453 ++++++++++++----- drivers/regulator/core.c | 462 +++++++++++----- drivers/regulator/da903x.c | 17 +- drivers/regulator/isl6271a-regulator.c | 6 +- drivers/regulator/lp3971.c | 10 +- drivers/regulator/lp3972.c | 10 +- drivers/regulator/max1586.c | 30 +- drivers/regulator/max8649.c | 3 +- drivers/regulator/max8660.c | 14 +- drivers/regulator/max8925-regulator.c | 3 +- drivers/regulator/max8952.c | 3 +- drivers/regulator/max8998.c | 8 +- drivers/regulator/mc13783-regulator.c | 385 +++----------- drivers/regulator/mc13892-regulator.c | 635 ++++++++++++++++++++++ drivers/regulator/mc13xxx-regulator-core.c | 241 +++++++++ drivers/regulator/mc13xxx.h | 101 ++++ drivers/regulator/pcap-regulator.c | 7 +- drivers/regulator/pcf50633-regulator.c | 5 +- drivers/regulator/tps65023-regulator.c | 9 +- drivers/regulator/tps6507x-regulator.c | 10 +- drivers/regulator/tps6524x-regulator.c | 693 +++++++++++++++++++++++++ drivers/regulator/tps6586x-regulator.c | 15 +- drivers/regulator/twl-regulator.c | 11 +- drivers/regulator/wm831x-dcdc.c | 31 +- drivers/regulator/wm831x-ldo.c | 59 ++- drivers/regulator/wm8350-regulator.c | 24 +- drivers/regulator/wm8400-regulator.c | 8 +- drivers/regulator/wm8994-regulator.c | 22 +- include/linux/mfd/ab8500.h | 5 +- include/linux/mfd/mc13783.h | 67 ++-- include/linux/mfd/mc13892.h | 39 ++ include/linux/regulator/ab8500.h | 24 +- include/linux/regulator/consumer.h | 1 + include/linux/regulator/driver.h | 19 +- include/trace/events/regulator.h | 141 +++++ 45 files changed, 2959 insertions(+), 832 deletions(-) create mode 100644 arch/arm/mach-ux500/board-mop500-regulators.h create mode 100644 drivers/regulator/mc13892-regulator.c create mode 100644 drivers/regulator/mc13xxx-regulator-core.c create mode 100644 drivers/regulator/mc13xxx.h create mode 100644 drivers/regulator/tps6524x-regulator.c create mode 100644 include/linux/mfd/mc13892.h create mode 100644 include/trace/events/regulator.h Merging security-testing/next $ git merge security-testing/next Auto-merging MAINTAINERS Auto-merging include/linux/security.h Auto-merging kernel/printk.c Merge made by recursive. Documentation/keys-trusted-encrypted.txt | 145 ++++ Documentation/sysctl/kernel.txt | 2 +- MAINTAINERS | 3 +- drivers/char/tpm/tpm.c | 20 +- drivers/char/tpm/tpm.h | 5 + include/keys/encrypted-type.h | 29 + include/keys/trusted-type.h | 31 + include/linux/capability.h | 7 +- include/linux/kernel.h | 3 + include/linux/security.h | 3 +- include/linux/tpm.h | 4 + include/linux/tpm_command.h | 28 + include/linux/xattr.h | 4 + kernel/printk.c | 14 +- lib/hexdump.c | 16 + security/Kconfig | 31 + security/keys/Makefile | 2 + security/keys/encrypted_defined.c | 903 +++++++++++++++++++++++ security/keys/encrypted_defined.h | 54 ++ security/keys/trusted_defined.c | 1175 ++++++++++++++++++++++++++++++ security/keys/trusted_defined.h | 134 ++++ security/selinux/include/classmap.h | 2 +- security/smack/smack.h | 45 ++ security/smack/smack_access.c | 58 ++- security/smack/smack_lsm.c | 354 +++++++--- security/smack/smackfs.c | 41 +- 26 files changed, 2970 insertions(+), 143 deletions(-) create mode 100644 Documentation/keys-trusted-encrypted.txt create mode 100644 include/keys/encrypted-type.h create mode 100644 include/keys/trusted-type.h create mode 100644 include/linux/tpm_command.h create mode 100644 security/keys/encrypted_defined.c create mode 100644 security/keys/encrypted_defined.h create mode 100644 security/keys/trusted_defined.c create mode 100644 security/keys/trusted_defined.h Merging selinux/master $ git merge selinux/master Auto-merging security/selinux/hooks.c Auto-merging security/selinux/selinuxfs.c Merge made by recursive. include/linux/flex_array.h | 2 +- security/selinux/hooks.c | 5 +- security/selinux/selinuxfs.c | 649 ++++++++++++++++------------------ security/selinux/ss/conditional.c | 6 +- security/selinux/ss/mls.c | 25 +- security/selinux/ss/policydb.c | 701 +++++++++++++++++++------------------ security/selinux/ss/policydb.h | 19 +- security/selinux/ss/services.c | 425 +++++++++++------------ security/selinux/ss/sidtab.c | 39 ++- security/selinux/ss/sidtab.h | 2 + 10 files changed, 942 insertions(+), 931 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Auto-merging drivers/char/agp/backend.c Auto-merging drivers/char/agp/hp-agp.c Merge made by recursive. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/Kconfig | 9 ++-- drivers/watchdog/alim1535_wdt.c | 2 +- drivers/watchdog/alim7101_wdt.c | 2 +- drivers/watchdog/booke_wdt.c | 35 ++++++++++++++++- drivers/watchdog/f71808e_wdt.c | 78 +++++++++++++++++++++++++++++++------- drivers/watchdog/ks8695_wdt.c | 2 +- drivers/watchdog/w83627hf_wdt.c | 8 ++- 7 files changed, 109 insertions(+), 27 deletions(-) Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Recorded preimage for 'drivers/media/video/zoran/zoran.h' Renaming sound/soc/s3c24xx/smdk_spdif.c => sound/soc/samsung/smdk_spdif.c Auto-merging sound/soc/samsung/smdk_spdif.c Auto-merging Documentation/kvm/api.txt Auto-merging Documentation/lguest/lguest.txt Auto-merging Documentation/networking/dccp.txt Auto-merging Documentation/powerpc/booting-without-of.txt Auto-merging MAINTAINERS Auto-merging arch/arm/mach-imx/pm-imx27.c Auto-merging arch/arm/mach-msm/io.c Auto-merging arch/arm/mach-omap1/pm.c Auto-merging arch/arm/mach-omap2/cpuidle34xx.c Auto-merging arch/arm/mach-omap2/pm24xx.c Auto-merging arch/arm/mach-omap2/pm34xx.c Auto-merging arch/arm/mach-omap2/pm44xx.c Auto-merging arch/arm/mach-omap2/serial.c Auto-merging arch/arm/mm/flush.c Auto-merging arch/arm/plat-omap/include/plat/omap_hwmod.h Auto-merging arch/arm/plat-samsung/pm.c Auto-merging arch/blackfin/mach-bf537/include/mach/defBF534.h Auto-merging block/cfq-iosched.c Auto-merging drivers/ata/libata-core.c Auto-merging drivers/dma/intel_mid_dma.c Auto-merging drivers/gpu/drm/radeon/atombios.h Auto-merging drivers/input/serio/Kconfig Auto-merging drivers/input/touchscreen/Kconfig Auto-merging drivers/media/video/cx25840/cx25840-ir.c Auto-merging drivers/media/video/saa7164/saa7164-core.c Auto-merging drivers/media/video/via-camera.c Auto-merging drivers/media/video/zoran/zoran.h CONFLICT (content): Merge conflict in drivers/media/video/zoran/zoran.h Auto-merging drivers/misc/Kconfig Auto-merging drivers/mmc/host/Kconfig Auto-merging drivers/mtd/nand/nand_base.c Auto-merging drivers/net/bnx2x/bnx2x_main.c Auto-merging drivers/net/bnx2x/bnx2x_reg.h Auto-merging drivers/net/bonding/bond_3ad.c Auto-merging drivers/net/cxgb3/t3_hw.c Auto-merging drivers/net/e1000/e1000_main.c Auto-merging drivers/net/e1000e/82571.c Auto-merging drivers/net/e1000e/ich8lan.c Auto-merging drivers/net/e1000e/phy.c Auto-merging drivers/net/eepro.c Auto-merging drivers/net/ixgbe/ixgbe_82599.c Auto-merging drivers/net/ll_temac_main.c Auto-merging drivers/net/tehuti.c Auto-merging drivers/net/tun.c Auto-merging drivers/net/vxge/vxge-traffic.h Auto-merging drivers/net/wan/dscc4.c Auto-merging drivers/net/wimax/i2400m/driver.c Auto-merging drivers/net/wimax/i2400m/i2400m.h Auto-merging drivers/net/wireless/ath/ath5k/reg.h Auto-merging drivers/net/wireless/iwlwifi/iwl-sta.c Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c Auto-merging drivers/platform/x86/fujitsu-laptop.c Auto-merging drivers/power/s3c_adc_battery.c Auto-merging drivers/s390/net/lcs.c Auto-merging drivers/s390/scsi/zfcp_cfdc.c Auto-merging drivers/scsi/bfa/bfa_fcpim.c Auto-merging drivers/scsi/bfa/bfa_fcs_lport.c Auto-merging drivers/scsi/libfc/fc_fcp.c Auto-merging drivers/scsi/lpfc/lpfc_attr.c Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c Auto-merging drivers/scsi/lpfc/lpfc_sli.c CONFLICT (delete/modify): drivers/staging/stradis/stradis.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of drivers/staging/stradis/stradis.c left in tree. Auto-merging fs/anon_inodes.c Auto-merging fs/coda/inode.c Auto-merging fs/xfs/linux-2.6/xfs_super.c Auto-merging include/linux/mfd/core.h Auto-merging kernel/debug/kdb/kdb_main.c Auto-merging kernel/power/swap.c Auto-merging kernel/time/clocksource.c Auto-merging lib/nlattr.c Auto-merging mm/percpu.c Auto-merging net/Kconfig Auto-merging net/core/dev.c Auto-merging net/decnet/dn_dev.c Auto-merging net/ipv4/tcp_output.c Auto-merging net/ipv6/af_inet6.c Auto-merging scripts/kconfig/confdata.c Auto-merging scripts/mod/modpost.c Auto-merging sound/core/pcm_native.c Auto-merging sound/soc/codecs/max98088.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/stradis/stradis.c drivers/staging/stradis/stradis.c: needs merge rm 'drivers/staging/stradis/stradis.c' $ git commit -v -a Recorded resolution for 'drivers/media/video/zoran/zoran.h'. [master 2e31e73] Merge remote branch 'trivial/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/mtdnand.tmpl | 2 +- Documentation/cgroups/cgroup_event_listener.c | 2 +- Documentation/cgroups/memcg_test.txt | 2 +- Documentation/kdump/kdump.txt | 15 +++++++++------ Documentation/ko_KR/HOWTO | 4 ++-- Documentation/kprobes.txt | 2 +- Documentation/kvm/api.txt | 2 +- Documentation/lguest/lguest.txt | 7 +++++-- Documentation/networking/bridge.txt | 4 ++-- Documentation/networking/caif/spi_porting.txt | 2 +- Documentation/networking/dccp.txt | 4 ++-- Documentation/networking/generic_netlink.txt | 2 +- Documentation/powerpc/booting-without-of.txt | 2 +- Documentation/scheduler/00-INDEX | 2 +- Documentation/scsi/ChangeLog.lpfc | 2 +- Documentation/timers/timer_stats.txt | 2 +- Documentation/zh_CN/HOWTO | 4 ++-- Documentation/zh_CN/SubmittingDrivers | 2 +- MAINTAINERS | 10 +++++----- arch/arm/common/it8152.c | 2 +- arch/arm/common/vic.c | 2 +- arch/arm/mach-at91/board-ecbat91.c | 6 +++--- arch/arm/mach-at91/pm.c | 2 +- arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 2 +- arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 2 +- arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +- arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +- arch/arm/mach-bcmring/dma.c | 2 +- arch/arm/mach-bcmring/include/csp/dmacHw.h | 2 +- .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +- .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 2 +- arch/arm/mach-davinci/pm.c | 2 +- arch/arm/mach-gemini/include/mach/hardware.h | 2 +- arch/arm/mach-imx/pm-imx27.c | 2 +- arch/arm/mach-lpc32xx/pm.c | 2 +- arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 2 +- arch/arm/mach-msm/io.c | 2 +- arch/arm/mach-omap1/pm.c | 2 +- arch/arm/mach-omap2/cpuidle34xx.c | 2 +- arch/arm/mach-omap2/pm24xx.c | 2 +- arch/arm/mach-omap2/pm34xx.c | 2 +- arch/arm/mach-omap2/pm44xx.c | 2 +- arch/arm/mach-omap2/serial.c | 2 +- arch/arm/mach-pnx4008/pm.c | 2 +- arch/arm/mach-pxa/mxm8x10.c | 2 +- arch/arm/mach-pxa/pm.c | 2 +- arch/arm/mach-pxa/sharpsl_pm.c | 2 +- arch/arm/mach-s3c64xx/dma.c | 2 +- arch/arm/mach-sa1100/pm.c | 2 +- arch/arm/mach-spear3xx/spear300.c | 4 ++-- arch/arm/mach-spear3xx/spear310.c | 2 +- arch/arm/mach-spear3xx/spear320.c | 2 +- arch/arm/mach-spear3xx/spear3xx.c | 6 +++--- arch/arm/mach-spear6xx/spear6xx.c | 4 ++-- arch/arm/mach-u300/Kconfig | 2 +- arch/arm/mach-u300/include/mach/coh901318.h | 4 ++-- arch/arm/mm/flush.c | 1 - arch/arm/plat-mxc/include/mach/irqs.h | 2 +- arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +- arch/arm/plat-samsung/pm.c | 2 +- arch/avr32/mach-at32ap/pm.c | 2 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +- arch/blackfin/mach-common/pm.c | 2 +- arch/cris/arch-v32/lib/nand_init.S | 2 +- arch/cris/include/asm/etraxgpio.h | 2 +- arch/h8300/Kconfig.debug | 2 +- arch/ia64/kvm/mmio.c | 2 +- arch/m68k/mac/psc.c | 2 +- arch/mips/alchemy/common/power.c | 2 +- arch/mips/alchemy/devboards/pm.c | 2 +- arch/mips/include/asm/mach-powertv/ioremap.h | 2 +- arch/mips/jz4740/board-qi_lb60.c | 4 ++-- arch/mips/jz4740/gpio.c | 2 +- arch/mips/jz4740/pm.c | 2 +- arch/mips/loongson/common/pm.c | 2 +- arch/mips/mti-malta/malta-memory.c | 2 +- arch/mips/pci/pcie-octeon.c | 2 +- arch/mips/powertv/memory.c | 2 +- arch/mips/txx9/generic/pci.c | 2 +- arch/powerpc/include/asm/8xx_immap.h | 4 ++-- arch/powerpc/oprofile/op_model_cell.c | 2 +- arch/powerpc/platforms/52xx/lite5200_pm.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +- arch/powerpc/platforms/83xx/suspend-asm.S | 6 +++--- arch/powerpc/platforms/83xx/suspend.c | 2 +- arch/powerpc/platforms/ps3/device-init.c | 4 ++-- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- arch/powerpc/platforms/pseries/suspend.c | 2 +- arch/powerpc/sysdev/fsl_pmc.c | 2 +- arch/sh/boards/mach-hp6xx/pm.c | 2 +- arch/sh/kernel/cpu/shmobile/pm.c | 2 +- arch/sh/mm/cache-sh5.c | 2 +- arch/sparc/kernel/traps_64.c | 2 +- arch/x86/include/asm/pgalloc.h | 2 +- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/amd_iommu.c | 4 ++-- arch/x86/kernel/early_printk_mrst.c | 2 +- arch/x86/kernel/head_32.S | 2 +- block/cfq-iosched.c | 2 +- drivers/acpi/acpica/acobject.h | 2 +- drivers/acpi/sleep.c | 8 ++++---- drivers/acpi/video.c | 2 +- drivers/ata/libata-core.c | 4 ++-- drivers/ata/sata_vsc.c | 2 +- drivers/atm/idt77252.h | 2 +- drivers/atm/iphase.c | 4 ++-- drivers/base/bus.c | 2 +- drivers/base/power/main.c | 2 +- drivers/dma/intel_mid_dma.c | 6 +++--- drivers/edac/amd8131_edac.h | 2 +- drivers/edac/cell_edac.c | 4 ++-- drivers/edac/edac_core.h | 2 +- drivers/edac/ppc4xx_edac.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++-- drivers/gpu/drm/radeon/atombios.h | 2 +- drivers/i2c/busses/i2c-nomadik.c | 4 ++-- drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 - drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- drivers/input/serio/Kconfig | 2 +- drivers/input/touchscreen/Kconfig | 2 +- drivers/isdn/gigaset/bas-gigaset.c | 4 ++-- drivers/isdn/gigaset/ser-gigaset.c | 4 ++-- drivers/isdn/gigaset/usb-gigaset.c | 4 ++-- drivers/isdn/hardware/mISDN/ipac.h | 4 ++-- drivers/isdn/hardware/mISDN/isar.h | 2 +- drivers/macintosh/via-pmu-backlight.c | 4 ++-- drivers/macintosh/via-pmu.c | 2 +- drivers/media/video/cx25840/cx25840-ir.c | 2 +- drivers/media/video/davinci/vpif.h | 2 +- drivers/media/video/davinci/vpss.c | 2 +- drivers/media/video/omap/omap_vout.c | 2 +- drivers/media/video/saa7164/saa7164-core.c | 4 ++-- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/via-camera.c | 2 -- drivers/message/fusion/lsi/mpi_log_sas.h | 2 +- drivers/message/fusion/mptbase.c | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/message/i2o/i2o_block.c | 2 +- drivers/misc/Kconfig | 2 +- drivers/misc/arm-charlcd.c | 2 +- drivers/mmc/card/block.c | 2 +- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/au1xmmc.c | 2 +- drivers/mmc/host/sdricoh_cs.c | 4 ++-- drivers/mtd/nand/nand_base.c | 2 +- drivers/net/bnx2x/bnx2x_main.c | 2 +- drivers/net/bnx2x/bnx2x_reg.h | 2 +- drivers/net/bonding/bond_3ad.c | 6 +++--- drivers/net/chelsio/subr.c | 2 +- drivers/net/cxgb3/mc5.c | 2 +- drivers/net/cxgb3/t3_hw.c | 2 +- drivers/net/e1000/e1000_hw.h | 2 +- drivers/net/e1000/e1000_main.c | 2 +- drivers/net/e1000e/82571.c | 2 +- drivers/net/e1000e/ich8lan.c | 2 +- drivers/net/e1000e/phy.c | 2 +- drivers/net/eepro.c | 2 +- drivers/net/irda/donauboe.h | 2 +- drivers/net/ixgbe/ixgbe_82599.c | 4 ++-- drivers/net/ll_temac_main.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/tehuti.c | 6 +++--- drivers/net/tun.c | 2 +- drivers/net/via-velocity.c | 2 +- drivers/net/vxge/vxge-traffic.h | 2 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wimax/i2400m/driver.c | 2 +- drivers/net/wimax/i2400m/i2400m.h | 4 ++-- drivers/net/wireless/ath/ath5k/reg.h | 6 +++--- drivers/net/wireless/b43/phy_g.c | 2 +- drivers/net/wireless/b43legacy/phy.c | 2 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- drivers/net/wireless/prism54/islpci_dev.c | 6 +++--- drivers/net/wireless/prism54/islpci_eth.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- drivers/net/wireless/wl3501_cs.c | 2 +- drivers/pcmcia/m32r_cfc.h | 2 +- drivers/pcmcia/m32r_pcc.h | 2 +- drivers/pcmcia/m8xx_pcmcia.c | 2 +- drivers/platform/x86/acer-wmi.c | 2 +- drivers/platform/x86/asus-laptop.c | 2 +- drivers/platform/x86/asus_acpi.c | 2 +- drivers/platform/x86/dell-laptop.c | 2 +- drivers/platform/x86/eeepc-laptop.c | 2 +- drivers/platform/x86/fujitsu-laptop.c | 2 +- drivers/platform/x86/sony-laptop.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 4 ++-- drivers/platform/x86/toshiba_acpi.c | 2 +- drivers/power/s3c_adc_battery.c | 4 ++-- drivers/s390/net/lcs.c | 2 +- drivers/s390/scsi/zfcp_cfdc.c | 2 +- drivers/scsi/a100u2w.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- drivers/scsi/aic94xx/aic94xx_reg_def.h | 4 ++-- drivers/scsi/aic94xx/aic94xx_scb.c | 2 +- drivers/scsi/aic94xx/aic94xx_seq.c | 6 +++--- drivers/scsi/bfa/bfa_fcpim.c | 2 +- drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- drivers/scsi/dc395x.c | 8 ++++---- drivers/scsi/libfc/fc_fcp.c | 2 +- drivers/scsi/lpfc/lpfc_attr.c | 2 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 2 +- drivers/scsi/megaraid.h | 2 +- drivers/scsi/megaraid/megaraid_mm.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/scsi/scsi_netlink.c | 2 +- drivers/scsi/scsi_sysfs.c | 6 ++++-- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/spi/atmel_spi.c | 4 ++-- drivers/spi/spidev.c | 2 +- drivers/staging/msm/msm_fb_bl.c | 2 +- drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- drivers/telephony/ixj.c | 3 ++- drivers/usb/gadget/imx_udc.c | 2 +- drivers/usb/host/imx21-hcd.c | 2 +- drivers/usb/host/oxu210hp-hcd.c | 2 +- drivers/usb/misc/adutux.c | 2 +- drivers/usb/misc/iowarrior.c | 2 +- drivers/usb/misc/ldusb.c | 2 +- drivers/usb/musb/musb_gadget.c | 4 ++-- drivers/usb/wusbcore/wa-rpipe.c | 2 +- drivers/video/atmel_lcdfb.c | 2 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/aty/atyfb_base.c | 2 +- drivers/video/aty/radeon_backlight.c | 2 +- drivers/video/backlight/88pm860x_bl.c | 2 +- drivers/video/backlight/max8925_bl.c | 2 +- drivers/video/nvidia/nv_backlight.c | 2 +- drivers/video/omap2/displays/panel-taal.c | 2 +- drivers/video/riva/fbdev.c | 2 +- drivers/video/sstfb.c | 2 +- fs/anon_inodes.c | 6 +++--- fs/coda/inode.c | 2 +- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 4 ++-- fs/ext4/inode.c | 6 +++--- fs/jbd/transaction.c | 2 +- fs/jbd2/transaction.c | 2 +- fs/notify/fanotify/Kconfig | 2 +- fs/ocfs2/inode.c | 2 +- fs/ocfs2/suballoc.c | 2 +- fs/xfs/linux-2.6/xfs_super.c | 2 +- include/acpi/actbl1.h | 2 +- include/linux/cgroup.h | 2 +- include/linux/firewire-cdev.h | 2 +- include/linux/mfd/core.h | 2 +- include/linux/poll.h | 2 +- include/linux/suspend.h | 8 ++++---- include/linux/u64_stats_sync.h | 12 ++++++------ include/net/sctp/user.h | 4 ++-- include/scsi/fc/fc_fcp.h | 4 ++-- init/Kconfig | 2 +- kernel/audit.c | 2 +- kernel/debug/kdb/kdb_main.c | 2 +- kernel/hrtimer.c | 2 +- kernel/kexec.c | 2 +- kernel/perf_event.c | 2 +- kernel/power/hibernate.c | 4 ++-- kernel/power/suspend.c | 4 ++-- kernel/power/swap.c | 2 +- kernel/sched.c | 2 +- kernel/sysctl_binary.c | 2 +- kernel/time.c | 4 ++-- kernel/time/clocksource.c | 2 +- kernel/trace/trace_entries.h | 2 +- lib/nlattr.c | 2 +- lib/swiotlb.c | 2 +- mm/page_alloc.c | 2 +- mm/percpu.c | 2 +- mm/rmap.c | 2 +- mm/sparse-vmemmap.c | 2 +- net/Kconfig | 4 +++- net/core/dev.c | 2 +- net/dccp/Kconfig | 4 +++- net/decnet/dn_dev.c | 2 +- net/ipv4/Kconfig | 4 +++- net/ipv4/tcp_output.c | 2 +- net/ipv6/af_inet6.c | 2 +- net/sched/Kconfig | 2 +- scripts/mod/modpost.c | 2 +- security/apparmor/include/match.h | 2 +- sound/core/init.c | 2 +- sound/core/pcm_native.c | 2 +- sound/isa/opl3sa2.c | 2 +- sound/pci/ca0106/ca0106.h | 2 +- sound/pci/ca0106/ca0106_main.c | 2 +- sound/pci/emu10k1/emu10k1x.c | 2 +- sound/pci/emu10k1/p16v.h | 2 +- sound/pci/es1968.c | 2 +- sound/pci/rme9652/hdspm.c | 6 +++--- sound/soc/codecs/max98088.c | 2 +- sound/soc/samsung/smdk_spdif.c | 6 +++--- 297 files changed, 398 insertions(+), 387 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging suspend/linux-next $ git merge suspend/linux-next Auto-merging drivers/base/power/main.c Auto-merging include/linux/device.h Auto-merging include/linux/suspend.h Auto-merging kernel/power/hibernate.c Auto-merging kernel/power/suspend.c Merge made by recursive. Documentation/power/drivers-testing.txt | 8 +- Documentation/power/runtime_pm.txt | 31 ++++++ drivers/base/power/generic_ops.c | 6 +- drivers/base/power/main.c | 174 +++++++++++-------------------- drivers/base/power/runtime.c | 47 +++++++-- drivers/base/power/wakeup.c | 20 ++-- drivers/spi/spi.c | 92 +++++++++++++++-- drivers/usb/core/driver.c | 7 +- include/linux/device.h | 4 +- include/linux/pm.h | 51 ++------- include/linux/pm_runtime.h | 13 +++ include/linux/suspend.h | 4 +- kernel/freezer.c | 9 ++- kernel/power/Makefile | 5 +- kernel/power/hibernate.c | 7 +- kernel/power/process.c | 8 ++- kernel/power/suspend.c | 2 +- 17 files changed, 282 insertions(+), 206 deletions(-) Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging fs/nfsd/vfs.c Auto-merging include/linux/fsnotify_backend.h Merge made by recursive. fs/cachefiles/namei.c | 1 - fs/cachefiles/xattr.c | 1 - fs/nfsd/vfs.c | 3 - fs/notify/dnotify/dnotify.c | 15 +++--- fs/notify/fanotify/fanotify.c | 24 +++++---- fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- fs/notify/group.c | 1 + fs/notify/mark.c | 36 +++++-------- include/linux/fanotify.h | 5 ++- include/linux/fsnotify_backend.h | 14 ++++- 10 files changed, 121 insertions(+), 80 deletions(-) Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging catalin/for-next $ git merge catalin/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'drivers/Makefile' using previous resolution. Resolved 'include/linux/Kbuild' using previous resolution. Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile CONFLICT (content): Merge conflict in drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d00234a] Merge remote branch 'alacrity/linux-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 248 +++++++ drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4389 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Merge made by recursive. drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) Merging i7300_edac/linux_next $ git merge i7300_edac/linux_next Already up-to-date! Merge made by recursive. Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Auto-merging arch/powerpc/include/asm/prom.h Auto-merging arch/powerpc/sysdev/tsi108_dev.c Auto-merging drivers/net/gianfar.c Auto-merging drivers/net/xilinx_emaclite.c Merge made by recursive. Documentation/kbuild/makefiles.txt | 15 ++++++++ Documentation/powerpc/dts-bindings/eeprom.txt | 28 ++++++++++++++ arch/microblaze/boot/Makefile | 12 ++----- arch/microblaze/include/asm/prom.h | 3 -- arch/microblaze/kernel/prom_parse.c | 38 ------------------- arch/powerpc/boot/Makefile | 8 ++--- arch/powerpc/boot/dts/pcm030.dts | 1 + arch/powerpc/boot/dts/pcm032.dts | 3 +- arch/powerpc/include/asm/prom.h | 3 -- arch/powerpc/kernel/prom_parse.c | 38 ------------------- arch/powerpc/sysdev/mv64x60_dev.c | 1 + arch/powerpc/sysdev/tsi108_dev.c | 1 + drivers/misc/eeprom/at24.c | 43 +++++++++++++++++++--- drivers/net/fs_enet/fs_enet-main.c | 1 + drivers/net/gianfar.c | 1 + drivers/net/ucc_geth.c | 1 + drivers/net/xilinx_emaclite.c | 1 + drivers/of/Kconfig | 4 ++ drivers/of/Makefile | 1 + drivers/of/of_mdio.c | 26 +++++++++----- drivers/of/of_net.c | 48 +++++++++++++++++++++++++ include/asm-generic/vmlinux.lds.h | 13 ++++++- include/linux/of_net.h | 15 ++++++++ scripts/Makefile.lib | 23 ++++++++++++ 24 files changed, 214 insertions(+), 114 deletions(-) create mode 100644 Documentation/powerpc/dts-bindings/eeprom.txt create mode 100644 drivers/of/of_net.c create mode 100644 include/linux/of_net.h Merging spi/next-spi $ git merge spi/next-spi Removing drivers/spi/xilinx_spi.h Removing drivers/spi/xilinx_spi_of.c Removing drivers/spi/xilinx_spi_pltfm.c Merge made by recursive. drivers/spi/Kconfig | 18 +--- drivers/spi/Makefile | 5 +- drivers/spi/amba-pl022.c | 56 +++++------ drivers/spi/dw_spi.c | 50 ++++++---- drivers/spi/dw_spi_mid.c | 223 ++++++++++++++++++++++++++++++++++++++++ drivers/spi/dw_spi_pci.c | 20 +++- drivers/spi/mpc52xx_psc_spi.c | 35 +++---- drivers/spi/spi_imx.c | 30 +----- drivers/spi/spi_nuc900.c | 2 +- drivers/spi/spi_topcliff_pch.c | 8 +- drivers/spi/xilinx_spi.c | 133 ++++++++++++++++++++---- drivers/spi/xilinx_spi.h | 32 ------ drivers/spi/xilinx_spi_of.c | 133 ------------------------ drivers/spi/xilinx_spi_pltfm.c | 102 ------------------ include/linux/spi/dw_spi.h | 24 ++++- 15 files changed, 455 insertions(+), 416 deletions(-) create mode 100644 drivers/spi/dw_spi_mid.c delete mode 100644 drivers/spi/xilinx_spi.h delete mode 100644 drivers/spi/xilinx_spi_of.c delete mode 100644 drivers/spi/xilinx_spi_pltfm.c Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/arm/kernel/perf_event.c Auto-merging arch/s390/Kconfig Auto-merging arch/x86/Kconfig Removing arch/x86/kernel/apic/nmi.c Auto-merging arch/x86/kernel/head_32.S Auto-merging fs/proc/base.c Auto-merging init/Kconfig Auto-merging kernel/hrtimer.c Auto-merging kernel/kthread.c Auto-merging kernel/perf_event.c Auto-merging kernel/printk.c Auto-merging kernel/sched.c Auto-merging kernel/sysctl_binary.c Auto-merging lib/Makefile Merge made by recursive. CREDITS | 2 - Documentation/RCU/trace.txt | 144 ++++- Documentation/kernel-parameters.txt | 21 +- Documentation/x86/boot.txt | 1 + MAINTAINERS | 18 +- arch/Kconfig | 3 + arch/alpha/include/asm/perf_event.h | 6 - arch/alpha/kernel/irq_alpha.c | 2 - arch/alpha/kernel/perf_event.c | 11 +- arch/arm/kernel/perf_event.c | 4 +- arch/mips/kernel/perf_event_mipsxx.c | 2 +- arch/powerpc/kernel/e500-pmu.c | 2 +- arch/powerpc/kernel/mpc7450-pmu.c | 2 +- arch/powerpc/kernel/perf_event.c | 2 +- arch/powerpc/kernel/perf_event_fsl_emb.c | 2 +- arch/powerpc/kernel/power4-pmu.c | 2 +- arch/powerpc/kernel/power5+-pmu.c | 2 +- arch/powerpc/kernel/power5-pmu.c | 2 +- arch/powerpc/kernel/power6-pmu.c | 2 +- arch/powerpc/kernel/power7-pmu.c | 2 +- arch/powerpc/kernel/ppc970-pmu.c | 2 +- arch/s390/Kconfig | 1 + arch/s390/include/asm/mutex.h | 2 + arch/sh/kernel/cpu/sh4/perf_event.c | 2 +- arch/sh/kernel/cpu/sh4a/perf_event.c | 2 +- arch/sh/kernel/perf_event.c | 2 +- arch/sparc/include/asm/perf_event.h | 4 - arch/sparc/kernel/nmi.c | 2 - arch/sparc/kernel/perf_event.c | 9 +- arch/x86/Kconfig | 41 ++- arch/x86/Kconfig.debug | 11 + arch/x86/boot/compressed/head_64.S | 2 +- arch/x86/include/asm/alternative.h | 8 + arch/x86/include/asm/amd_nb.h | 49 +- arch/x86/include/asm/apic.h | 3 +- arch/x86/include/asm/apicdef.h | 1 + arch/x86/include/asm/bootparam.h | 1 + arch/x86/include/asm/fixmap.h | 4 + arch/x86/include/asm/i387.h | 24 + arch/x86/include/asm/io_apic.h | 9 +- arch/x86/include/asm/irq.h | 4 - arch/x86/include/asm/kdebug.h | 2 +- arch/x86/include/asm/microcode.h | 6 + arch/x86/include/asm/mpspec.h | 2 +- arch/x86/include/asm/mrst-vrtc.h | 9 + arch/x86/include/asm/mrst.h | 14 +- arch/x86/include/asm/nmi.h | 53 +-- arch/x86/include/asm/pci.h | 1 + arch/x86/include/asm/perf_event.h | 2 - arch/x86/include/asm/perf_event_p4.h | 63 ++- arch/x86/include/asm/setup.h | 6 + arch/x86/include/asm/smpboot_hooks.h | 1 - arch/x86/include/asm/stacktrace.h | 33 +- arch/x86/include/asm/timer.h | 6 - arch/x86/kernel/Makefile | 1 - arch/x86/kernel/acpi/boot.c | 53 +-- arch/x86/kernel/alternative.c | 52 ++- arch/x86/kernel/amd_nb.c | 135 +++-- arch/x86/kernel/apb_timer.c | 1 + arch/x86/kernel/aperture_64.c | 10 +- arch/x86/kernel/apic/Makefile | 5 +- arch/x86/kernel/apic/apic.c | 183 +++--- arch/x86/kernel/apic/hw_nmi.c | 20 +- arch/x86/kernel/apic/io_apic.c | 108 ++-- arch/x86/kernel/apic/nmi.c | 567 ----------------- arch/x86/kernel/apic/x2apic_uv_x.c | 61 +- arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/cpu/intel_cacheinfo.c | 147 ++--- arch/x86/kernel/cpu/mcheck/mce_amd.c | 135 +++-- arch/x86/kernel/cpu/perf_event.c | 74 ++- arch/x86/kernel/cpu/perf_event_amd.c | 16 +- arch/x86/kernel/cpu/perf_event_intel.c | 26 + arch/x86/kernel/cpu/perfctr-watchdog.c | 644 +------------------- arch/x86/kernel/dumpstack.c | 12 +- arch/x86/kernel/dumpstack_32.c | 25 +- arch/x86/kernel/dumpstack_64.c | 24 +- arch/x86/kernel/early_printk.c | 3 +- arch/x86/kernel/ftrace.c | 3 + arch/x86/kernel/head32.c | 3 + arch/x86/kernel/head_32.S | 6 + arch/x86/kernel/kprobes.c | 113 ++++- arch/x86/kernel/microcode_amd.c | 34 +- arch/x86/kernel/mpparse.c | 114 +---- arch/x86/kernel/pci-gart_64.c | 34 +- arch/x86/kernel/process.c | 3 +- arch/x86/kernel/reboot_fixups_32.c | 16 + arch/x86/kernel/setup.c | 13 +- arch/x86/kernel/smpboot.c | 36 +- arch/x86/kernel/stacktrace.c | 8 +- arch/x86/kernel/time.c | 18 - arch/x86/kernel/trampoline_64.S | 2 +- arch/x86/kernel/traps.c | 27 +- arch/x86/kernel/tsc.c | 96 +++- arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} | 49 ++- arch/x86/kernel/vmlinux.lds.S | 8 +- arch/x86/mm/Makefile | 2 +- arch/x86/mm/{k8topology_64.c => amdtopology_64.c} | 13 +- arch/x86/mm/init.c | 3 +- arch/x86/mm/init_32.c | 20 +- arch/x86/mm/kmemcheck/error.c | 2 +- arch/x86/mm/numa_64.c | 22 +- arch/x86/mm/pageattr.c | 33 +- arch/x86/mm/setup_nx.c | 2 +- arch/x86/mm/srat_32.c | 1 + arch/x86/mm/srat_64.c | 10 + arch/x86/oprofile/backtrace.c | 2 +- arch/x86/oprofile/nmi_timer_int.c | 3 - arch/x86/oprofile/op_model_amd.c | 1 + arch/x86/oprofile/op_model_p4.c | 2 +- arch/x86/pci/Makefile | 1 + arch/x86/pci/ce4100.c | 315 ++++++++++ arch/x86/pci/pcbios.c | 23 + arch/x86/platform/Makefile | 2 + arch/x86/platform/ce4100/Makefile | 1 + arch/x86/platform/ce4100/ce4100.c | 132 ++++ arch/x86/platform/iris/Makefile | 1 + arch/x86/platform/iris/iris.c | 91 +++ arch/x86/platform/mrst/Makefile | 2 + .../{kernel => platform/mrst}/early_printk_mrst.c | 0 arch/x86/platform/mrst/mrst.c | 576 ++++++++++++++++-- arch/x86/platform/mrst/vrtc.c | 165 +++++ arch/x86/platform/sfi/sfi.c | 13 +- drivers/acpi/acpica/nsinit.c | 2 - drivers/acpi/numa.c | 14 +- drivers/char/agp/amd64-agp.c | 33 +- drivers/edac/amd64_edac.c | 4 +- drivers/platform/x86/intel_scu_ipc.c | 5 + drivers/rtc/Kconfig | 12 + drivers/rtc/Makefile | 1 + drivers/rtc/class.c | 13 + drivers/rtc/interface.c | 574 +++++++++++------- drivers/rtc/rtc-dev.c | 104 ---- drivers/rtc/rtc-lib.c | 28 + drivers/rtc/rtc-mrst.c | 582 ++++++++++++++++++ drivers/watchdog/hpwdt.c | 11 +- fs/proc/base.c | 79 +++ include/linux/ftrace_event.h | 14 + include/linux/hrtimer.h | 33 +- include/linux/init_task.h | 18 +- include/linux/interrupt.h | 6 +- include/linux/kprobes.h | 4 +- include/linux/module.h | 11 +- include/linux/mutex.h | 4 + include/linux/nmi.h | 10 +- include/linux/perf_event.h | 26 +- include/linux/rculist.h | 5 - include/linux/rcupdate.h | 4 +- include/linux/rcutiny.h | 13 +- include/linux/rcutree.h | 2 + include/linux/rtc.h | 51 ++- include/linux/sched.h | 51 ++- include/linux/sfi.h | 8 +- include/linux/stacktrace.h | 4 +- include/linux/syscalls.h | 10 +- include/linux/timer.h | 32 +- include/linux/timerqueue.h | 50 ++ include/linux/tracepoint.h | 33 +- include/linux/workqueue.h | 8 + include/trace/define_trace.h | 15 + include/trace/events/syscalls.h | 4 + include/trace/ftrace.h | 21 +- init/Kconfig | 68 ++- init/main.c | 5 +- kernel/cpu.c | 29 +- kernel/fork.c | 5 +- kernel/futex.c | 235 ++++---- kernel/hrtimer.c | 83 +-- kernel/hw_breakpoint.c | 2 +- kernel/irq/manage.c | 4 +- kernel/kprobes.c | 565 ++++++++++++------ kernel/kthread.c | 2 +- kernel/lockdep_proc.c | 16 +- kernel/module.c | 171 +++++- kernel/mutex.c | 2 +- kernel/perf_event.c | 573 +++++++++++++----- kernel/posix-timers.c | 10 +- kernel/printk.c | 8 +- kernel/rcutiny.c | 105 +++-- kernel/rcutiny_plugin.h | 433 +++++++++++++- kernel/rcutorture.c | 270 ++++++++- kernel/rcutree.c | 156 +++--- kernel/rcutree.h | 61 +- kernel/rcutree_plugin.h | 135 ++++- kernel/rcutree_trace.c | 12 +- kernel/sched.c | 632 ++++--------------- kernel/sched_autogroup.c | 229 +++++++ kernel/sched_autogroup.h | 32 + kernel/sched_clock.c | 2 +- kernel/sched_debug.c | 91 ++-- kernel/sched_fair.c | 322 ++++++++-- kernel/sched_features.h | 2 - kernel/sched_rt.c | 24 + kernel/softirq.c | 4 +- kernel/srcu.c | 8 +- kernel/sys.c | 4 +- kernel/sysctl.c | 53 +- kernel/sysctl_binary.c | 1 - kernel/time/timecompare.c | 5 +- kernel/time/timekeeping.c | 9 +- kernel/time/timer_list.c | 8 +- kernel/timer.c | 50 +-- kernel/trace/ring_buffer.c | 9 +- kernel/trace/trace_event_perf.c | 31 +- kernel/trace/trace_events.c | 6 + kernel/trace/trace_export.c | 14 +- kernel/trace/trace_selftest.c | 2 +- kernel/watchdog.c | 11 +- lib/Kconfig.debug | 3 +- lib/Makefile | 2 +- lib/timerqueue.c | 107 ++++ scripts/Makefile.build | 13 +- tools/perf/Documentation/perf-annotate.txt | 37 ++- tools/perf/Documentation/perf-buildid-list.txt | 3 + tools/perf/Documentation/perf-diff.txt | 21 +- tools/perf/Documentation/perf-kvm.txt | 8 +- tools/perf/Documentation/perf-lock.txt | 15 + tools/perf/Documentation/perf-probe.txt | 4 +- tools/perf/Documentation/perf-record.txt | 22 +- tools/perf/Documentation/perf-report.txt | 55 ++- tools/perf/Documentation/perf-sched.txt | 18 +- .../{perf-trace-perl.txt => perf-script-perl.txt} | 28 +- ...erf-trace-python.txt => perf-script-python.txt} | 88 ++-- .../{perf-trace.txt => perf-script.txt} | 61 +- tools/perf/Documentation/perf-stat.txt | 44 ++- tools/perf/Documentation/perf-test.txt | 2 +- tools/perf/Documentation/perf-timechart.txt | 2 + tools/perf/Documentation/perf-top.txt | 28 +- tools/perf/MANIFEST | 1 + tools/perf/Makefile | 19 +- tools/perf/bench/mem-memcpy-arch.h | 12 + tools/perf/bench/mem-memcpy-x86-64-asm-def.h | 4 + tools/perf/bench/mem-memcpy-x86-64-asm.S | 2 + tools/perf/bench/mem-memcpy.c | 219 +++++-- tools/perf/builtin-annotate.c | 10 +- tools/perf/builtin-buildid-list.c | 3 +- tools/perf/builtin-diff.c | 21 +- tools/perf/builtin-inject.c | 41 +- tools/perf/builtin-kmem.c | 27 +- tools/perf/builtin-lock.c | 23 +- tools/perf/builtin-record.c | 44 ++- tools/perf/builtin-report.c | 23 +- tools/perf/builtin-sched.c | 33 +- tools/perf/{builtin-trace.c => builtin-script.c} | 119 ++-- tools/perf/builtin-stat.c | 325 ++++++++-- tools/perf/builtin-test.c | 23 +- tools/perf/builtin-timechart.c | 48 +- tools/perf/builtin-top.c | 20 +- tools/perf/builtin.h | 2 +- tools/perf/command-list.txt | 2 +- tools/perf/feature-tests.mak | 4 +- tools/perf/perf.c | 2 +- .../perf/scripts/python/Perf-Trace-Util/Context.c | 2 +- tools/perf/util/build-id.c | 7 +- tools/perf/util/debug.c | 42 +- tools/perf/util/debug.h | 2 + tools/perf/util/event.c | 358 +++++++---- tools/perf/util/event.h | 30 +- tools/perf/util/header.c | 43 ++- tools/perf/util/header.h | 2 + tools/perf/util/hist.c | 23 +- tools/perf/util/hist.h | 2 + tools/perf/util/include/asm/cpufeature.h | 9 + tools/perf/util/include/asm/dwarf2.h | 11 + tools/perf/util/include/linux/bitops.h | 5 + tools/perf/util/include/linux/linkage.h | 13 + tools/perf/util/parse-events.c | 12 +- tools/perf/util/parse-options.h | 4 + tools/perf/util/probe-event.c | 220 ++++--- tools/perf/util/probe-finder.c | 42 +- tools/perf/util/probe-finder.h | 6 +- .../perf/util/scripting-engines/trace-event-perl.c | 6 +- .../util/scripting-engines/trace-event-python.c | 4 +- tools/perf/util/session.c | 564 ++++++++++++------ tools/perf/util/session.h | 25 +- tools/perf/util/sort.c | 6 +- tools/perf/util/symbol.c | 139 ++++- tools/perf/util/symbol.h | 4 +- tools/perf/util/ui/util.c | 16 +- 278 files changed, 9462 insertions(+), 5058 deletions(-) create mode 100644 arch/x86/include/asm/mrst-vrtc.h delete mode 100644 arch/x86/kernel/apic/nmi.c rename arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} (65%) rename arch/x86/mm/{k8topology_64.c => amdtopology_64.c} (94%) create mode 100644 arch/x86/pci/ce4100.c create mode 100644 arch/x86/platform/ce4100/Makefile create mode 100644 arch/x86/platform/ce4100/ce4100.c create mode 100644 arch/x86/platform/iris/Makefile create mode 100644 arch/x86/platform/iris/iris.c rename arch/x86/{kernel => platform/mrst}/early_printk_mrst.c (100%) create mode 100644 arch/x86/platform/mrst/vrtc.c create mode 100644 drivers/rtc/rtc-mrst.c create mode 100644 include/linux/timerqueue.h create mode 100644 kernel/sched_autogroup.c create mode 100644 kernel/sched_autogroup.h create mode 100644 lib/timerqueue.c rename tools/perf/Documentation/{perf-trace-perl.txt => perf-script-perl.txt} (90%) rename tools/perf/Documentation/{perf-trace-python.txt => perf-script-python.txt} (89%) rename tools/perf/Documentation/{perf-trace.txt => perf-script.txt} (62%) create mode 100644 tools/perf/bench/mem-memcpy-arch.h create mode 100644 tools/perf/bench/mem-memcpy-x86-64-asm-def.h create mode 100644 tools/perf/bench/mem-memcpy-x86-64-asm.S rename tools/perf/{builtin-trace.c => builtin-script.c} (83%) create mode 100644 tools/perf/util/include/asm/cpufeature.h create mode 100644 tools/perf/util/include/asm/dwarf2.h create mode 100644 tools/perf/util/include/linux/linkage.h Merging rcu/rcu/next $ git merge rcu/rcu/next Already up-to-date. Merging oprofile/for-next $ git merge oprofile/for-next Auto-merging arch/x86/oprofile/op_model_amd.c Merge made by recursive. arch/x86/include/asm/msr-index.h | 4 +++ arch/x86/oprofile/nmi_int.c | 3 ++ arch/x86/oprofile/op_model_amd.c | 54 +++++++++++++++++++++++++------------ 3 files changed, 43 insertions(+), 18 deletions(-) Merging xen/upstream/xen $ git merge xen/upstream/xen Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/x86/xen/setup.c Auto-merging drivers/xen/events.c Merge made by recursive. drivers/xen/Kconfig | 7 + drivers/xen/Makefile | 2 + drivers/xen/gntdev.c | 647 +++++++++++++++++++++++++++++++++++++++++++++ include/xen/gntdev.h | 119 +++++++++ include/xen/grant_table.h | 39 +++- 5 files changed, 813 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/gntdev.c create mode 100644 include/xen/gntdev.h Merging swiotlb-xen/master $ git merge swiotlb-xen/master Resolved 'drivers/xen/Kconfig' using previous resolution. Resolved 'drivers/xen/Makefile' using previous resolution. Auto-merging drivers/net/Kconfig Auto-merging drivers/xen/Kconfig CONFLICT (content): Merge conflict in drivers/xen/Kconfig Auto-merging drivers/xen/Makefile CONFLICT (content): Merge conflict in drivers/xen/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7e43a82] Merge remote branch 'swiotlb-xen/master' $ git diff -M --stat --summary HEAD^.. arch/x86/include/asm/xen/pci.h | 17 + arch/x86/pci/xen.c | 73 ++ drivers/block/Kconfig | 1 + drivers/net/Kconfig | 1 + drivers/pci/Kconfig | 1 + drivers/xen/Kconfig | 75 ++ drivers/xen/Makefile | 1 + drivers/xen/events.c | 95 ++- drivers/xen/manage.c | 3 +- drivers/xen/pciback/Makefile | 17 + drivers/xen/pciback/conf_space.c | 435 +++++++ drivers/xen/pciback/conf_space.h | 126 +++ drivers/xen/pciback/conf_space_capability.c | 66 ++ drivers/xen/pciback/conf_space_capability.h | 26 + drivers/xen/pciback/conf_space_capability_msi.c | 111 ++ drivers/xen/pciback/conf_space_capability_pm.c | 113 ++ drivers/xen/pciback/conf_space_capability_vpd.c | 40 + drivers/xen/pciback/conf_space_header.c | 385 +++++++ drivers/xen/pciback/conf_space_quirks.c | 140 +++ drivers/xen/pciback/conf_space_quirks.h | 35 + drivers/xen/pciback/controller.c | 442 ++++++++ drivers/xen/pciback/passthrough.c | 178 +++ drivers/xen/pciback/pci_stub.c | 1371 +++++++++++++++++++++++ drivers/xen/pciback/pciback.h | 142 +++ drivers/xen/pciback/pciback_ops.c | 241 ++++ drivers/xen/pciback/slot.c | 191 ++++ drivers/xen/pciback/vpci.c | 244 ++++ drivers/xen/pciback/xenbus.c | 726 ++++++++++++ drivers/xen/xenbus/Makefile | 5 + drivers/xen/xenbus/xenbus_probe.c | 351 +----- drivers/xen/xenbus/xenbus_probe.h | 31 +- drivers/xen/xenbus/xenbus_probe_backend.c | 276 +++++ drivers/xen/xenbus/xenbus_probe_frontend.c | 294 +++++ include/xen/events.h | 10 + include/xen/xenbus.h | 2 +- 35 files changed, 5942 insertions(+), 323 deletions(-) create mode 100644 drivers/xen/pciback/Makefile create mode 100644 drivers/xen/pciback/conf_space.c create mode 100644 drivers/xen/pciback/conf_space.h create mode 100644 drivers/xen/pciback/conf_space_capability.c create mode 100644 drivers/xen/pciback/conf_space_capability.h create mode 100644 drivers/xen/pciback/conf_space_capability_msi.c create mode 100644 drivers/xen/pciback/conf_space_capability_pm.c create mode 100644 drivers/xen/pciback/conf_space_capability_vpd.c create mode 100644 drivers/xen/pciback/conf_space_header.c create mode 100644 drivers/xen/pciback/conf_space_quirks.c create mode 100644 drivers/xen/pciback/conf_space_quirks.h create mode 100644 drivers/xen/pciback/controller.c create mode 100644 drivers/xen/pciback/passthrough.c create mode 100644 drivers/xen/pciback/pci_stub.c create mode 100644 drivers/xen/pciback/pciback.h create mode 100644 drivers/xen/pciback/pciback_ops.c create mode 100644 drivers/xen/pciback/slot.c create mode 100644 drivers/xen/pciback/vpci.c create mode 100644 drivers/xen/pciback/xenbus.c create mode 100644 drivers/xen/xenbus/xenbus_probe_backend.c create mode 100644 drivers/xen/xenbus/xenbus_probe_frontend.c Merging xen-pvhvm/linux-next $ git merge xen-pvhvm/linux-next Auto-merging arch/x86/include/asm/xen/page.h Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/x86/xen/mmu.c Auto-merging include/xen/interface/memory.h Merge made by recursive. Merging edac-amd/for-next $ git merge edac-amd/for-next Auto-merging drivers/edac/edac_core.h Merge made by recursive. drivers/edac/Kconfig | 8 +- drivers/edac/amd64_edac.c | 827 +++++++++++++++++------------------------ drivers/edac/amd64_edac.h | 86 ++--- drivers/edac/amd64_edac_inj.c | 25 +- drivers/edac/cpc925_edac.c | 9 +- drivers/edac/e752x_edac.c | 8 +- drivers/edac/edac_core.h | 5 +- drivers/edac/edac_mc.c | 4 +- drivers/edac/edac_mc_sysfs.c | 57 ++-- drivers/edac/i5100_edac.c | 9 +- drivers/edac/mce_amd.c | 450 +++++++++++++++++------ drivers/edac/mce_amd.h | 14 +- drivers/edac/mce_amd_inj.c | 9 +- 13 files changed, 795 insertions(+), 716 deletions(-) Merging percpu/for-next $ git merge percpu/for-next Auto-merging MAINTAINERS Auto-merging arch/x86/kernel/kprobes.c Auto-merging drivers/xen/events.c Auto-merging include/linux/kprobes.h Auto-merging kernel/fork.c Auto-merging kernel/hrtimer.c Auto-merging kernel/kprobes.c Auto-merging kernel/printk.c Auto-merging kernel/rcutree.c Auto-merging kernel/softirq.c Auto-merging kernel/watchdog.c Auto-merging mm/percpu.c Auto-merging mm/slab.c Merge made by recursive. MAINTAINERS | 10 ++ arch/x86/Kconfig.cpu | 3 + arch/x86/include/asm/percpu.h | 158 ++++++++++++++++++++++++++++- arch/x86/kernel/kprobes.c | 14 ++-- arch/x86/xen/enlighten.c | 4 +- arch/x86/xen/multicalls.h | 2 +- arch/x86/xen/spinlock.c | 8 +- arch/x86/xen/time.c | 8 +- drivers/acpi/processor_idle.c | 6 +- drivers/char/random.c | 2 +- drivers/connector/cn_proc.c | 5 +- drivers/cpuidle/cpuidle.c | 2 +- drivers/s390/cio/cio.c | 2 +- drivers/staging/speakup/fakekey.c | 11 +-- drivers/xen/events.c | 10 +- fs/buffer.c | 37 ++++---- include/asm-generic/irq_regs.h | 8 +- include/linux/elevator.h | 12 +-- include/linux/highmem.h | 13 ++- include/linux/kernel_stat.h | 2 +- include/linux/kprobes.h | 4 +- include/linux/percpu.h | 205 ++++++++++++++++++++++++++++++++++++- kernel/exit.c | 2 +- kernel/fork.c | 2 +- kernel/hrtimer.c | 2 +- kernel/irq_work.c | 18 ++-- kernel/kprobes.c | 8 +- kernel/rcutree.c | 4 +- kernel/softirq.c | 42 ++++---- kernel/taskstats.c | 5 +- kernel/time/tick-common.c | 2 +- kernel/time/tick-oneshot.c | 4 +- kernel/watchdog.c | 36 ++++---- lib/percpu_counter.c | 8 +- mm/percpu.c | 8 +- mm/slab.c | 6 +- mm/vmstat.c | 149 ++++++++++++++++++++------- 37 files changed, 628 insertions(+), 194 deletions(-) Merging workqueues/for-next $ git merge workqueues/for-next Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Resolved 'drivers/media/video/bt8xx/bttv-input.c' using previous resolution. Resolved 'drivers/rtc/rtc-dev.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merging arch/arm/mach-pxa/sharpsl_pm.c Auto-merging drivers/ata/libata-core.c Auto-merging drivers/ata/libata-sff.c Auto-merging drivers/block/xen-blkfront.c Auto-merging drivers/char/tpm/tpm.c Auto-merging drivers/gpu/drm/ttm/ttm_bo.c Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_fb.c Auto-merging drivers/media/dvb/dvb-usb/dvb-usb-remote.c Auto-merging drivers/media/video/bt8xx/bttv-driver.c Auto-merging drivers/media/video/bt8xx/bttv-input.c CONFLICT (content): Merge conflict in drivers/media/video/bt8xx/bttv-input.c Auto-merging drivers/media/video/cx18/cx18-driver.c Auto-merging drivers/media/video/cx231xx/cx231xx-cards.c Auto-merging drivers/media/video/cx23885/cx23885-input.c Auto-merging drivers/media/video/em28xx/em28xx-cards.c Auto-merging drivers/media/video/em28xx/em28xx-input.c Auto-merging drivers/media/video/saa7134/saa7134-core.c Auto-merging drivers/mfd/tps65010.c Auto-merging drivers/mmc/core/core.c Auto-merging drivers/mmc/host/omap_hsmmc.c Auto-merging drivers/net/ibm_newemac/core.c Auto-merging drivers/power/ds2760_battery.c Auto-merging drivers/power/intel_mid_battery.c Auto-merging drivers/rtc/rtc-dev.c CONFLICT (content): Merge conflict in drivers/rtc/rtc-dev.c Auto-merging drivers/staging/pohmelfs/inode.c Auto-merging fs/ncpfs/inode.c Auto-merging fs/nfsd/nfs4state.c Auto-merging fs/ocfs2/cluster/heartbeat.c Auto-merging include/linux/workqueue.h Auto-merging init/main.c Auto-merging mm/slab.c Auto-merging mm/vmstat.c Auto-merging net/atm/lec.c Auto-merging net/core/netpoll.c Auto-merging net/netfilter/ipvs/ip_vs_ctl.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c1fbc69] Merge remote branch 'workqueues/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 10 ++++ arch/arm/mach-pxa/sharpsl_pm.c | 3 +- arch/sh/drivers/push-switch.c | 2 +- drivers/ata/libata-core.c | 2 +- drivers/ata/libata-sff.c | 2 +- drivers/block/floppy.c | 4 +- drivers/block/xen-blkfront.c | 4 +- drivers/cdrom/gdrom.c | 2 +- drivers/char/hvsi.c | 4 +- drivers/char/pcmcia/ipwireless/hardware.c | 2 +- drivers/char/pcmcia/ipwireless/network.c | 3 +- drivers/char/pcmcia/ipwireless/tty.c | 2 +- drivers/char/sonypi.c | 2 +- drivers/char/tpm/tpm.c | 4 +- drivers/gpu/drm/ttm/ttm_bo.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- drivers/isdn/capi/capidrv.c | 1 + drivers/isdn/capi/kcapi.c | 26 +++++++--- drivers/isdn/mISDN/hwchannel.c | 4 +- drivers/isdn/mISDN/l1oip_core.c | 2 + drivers/leds/leds-wm8350.c | 2 +- drivers/macintosh/ams/ams-core.c | 2 +- drivers/macintosh/rack-meter.c | 4 +- drivers/media/dvb/dvb-core/dvb_net.c | 3 +- drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 3 +- drivers/media/dvb/mantis/mantis_evm.c | 2 +- drivers/media/dvb/mantis/mantis_uart.c | 1 + drivers/media/video/bt8xx/bttv-driver.c | 9 ++++ drivers/media/video/bt8xx/bttv-input.c | 5 +-- drivers/media/video/cx18/cx18-driver.c | 8 +++ drivers/media/video/cx231xx/cx231xx-cards.c | 8 +++ drivers/media/video/cx23885/cx23885-input.c | 2 - drivers/media/video/cx88/cx88-mpeg.c | 8 +++ drivers/media/video/em28xx/em28xx-cards.c | 8 +++ drivers/media/video/em28xx/em28xx-input.c | 2 +- drivers/media/video/omap24xxcam.c | 6 +- drivers/media/video/saa7134/saa7134-core.c | 11 ++++- drivers/media/video/saa7134/saa7134-empress.c | 2 +- drivers/mfd/menelaus.c | 3 +- drivers/mfd/tps65010.c | 13 +++--- drivers/misc/ioc4.c | 29 ++++-------- drivers/mmc/core/core.c | 2 +- drivers/mmc/host/omap.c | 24 +++++++--- drivers/mmc/host/omap_hsmmc.c | 2 +- drivers/net/chelsio/my3126.c | 2 +- drivers/net/ibm_newemac/core.c | 4 +- drivers/net/wireless/zd1211rw/zd_mac.c | 3 +- drivers/power/ds2760_battery.c | 6 +-- drivers/power/intel_mid_battery.c | 6 +-- drivers/rtc/rtc-ds1305.c | 2 +- drivers/rtc/rtc-ds1374.c | 2 +- drivers/rtc/rtc-ds3232.c | 2 +- drivers/rtc/rtc-rx8025.c | 2 +- drivers/s390/char/tape_3590.c | 18 +++++-- drivers/s390/char/tape_block.c | 2 +- drivers/staging/pohmelfs/inode.c | 4 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/speedtch.c | 28 ++++++----- drivers/usb/gadget/u_ether.c | 4 +- drivers/usb/host/ohci-hcd.c | 3 +- drivers/usb/otg/isp1301_omap.c | 2 +- drivers/usb/serial/oti6858.c | 5 +- drivers/video/fb_defio.c | 2 +- drivers/video/omap/lcd_mipid.c | 2 +- fs/ncpfs/inode.c | 7 +++- fs/nfsd/nfs4state.c | 2 +- fs/ocfs2/cluster/heartbeat.c | 3 +- fs/ocfs2/cluster/quorum.c | 4 +- fs/xfs/xfs_mru_cache.c | 2 +- include/linux/workqueue.h | 4 +- init/main.c | 3 - kernel/workqueue.c | 60 ++++++++++++++++++++++++- mm/slab.c | 2 +- mm/vmstat.c | 2 +- net/atm/lec.c | 2 +- net/core/netpoll.c | 2 +- net/dsa/dsa.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/sunrpc/xprtsock.c | 2 +- 79 files changed, 288 insertions(+), 155 deletions(-) Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging drivers-x86/linux-next $ git merge drivers-x86/linux-next Auto-merging MAINTAINERS Auto-merging drivers/platform/x86/acer-wmi.c Auto-merging drivers/platform/x86/eeepc-laptop.c Auto-merging drivers/platform/x86/fujitsu-laptop.c Auto-merging drivers/platform/x86/intel_scu_ipc.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Merge made by recursive. .../ABI/testing/sysfs-platform-ideapad-laptop | 6 + MAINTAINERS | 8 + drivers/platform/x86/Kconfig | 19 +- drivers/platform/x86/Makefile | 1 + drivers/platform/x86/acer-wmi.c | 319 ++++++++++- drivers/platform/x86/classmate-laptop.c | 19 +- drivers/platform/x86/eeepc-laptop.c | 11 + drivers/platform/x86/eeepc-wmi.c | 609 +++++++++++++++++--- drivers/platform/x86/fujitsu-laptop.c | 2 +- drivers/platform/x86/ideapad-laptop.c | 259 ++++++--- drivers/platform/x86/intel_scu_ipc.c | 4 +- drivers/platform/x86/intel_scu_ipcutil.c | 133 +++++ drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/wmi.c | 135 +++-- 14 files changed, 1291 insertions(+), 236 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-platform-ideapad-laptop create mode 100644 drivers/platform/x86/intel_scu_ipcutil.c Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging driver-core/driver-core-next $ git merge driver-core/driver-core-next Auto-merging drivers/base/bus.c Auto-merging drivers/base/core.c Auto-merging include/linux/device.h Merge made by recursive. drivers/base/base.h | 62 +++++++++++++++++++---------------------------- drivers/base/bus.c | 13 ++++----- drivers/base/class.c | 42 ++++++++++++++++---------------- drivers/base/core.c | 24 ++++++++++-------- fs/sysfs/group.c | 10 +------ include/linux/device.h | 7 ++--- 6 files changed, 70 insertions(+), 88 deletions(-) Merging tty/tty-next $ git merge tty/tty-next Auto-merging drivers/char/specialix.c Auto-merging drivers/serial/8250.c Auto-merging drivers/serial/8250_pci.c Auto-merging drivers/serial/omap-serial.c Auto-merging drivers/serial/serial_core.c Auto-merging drivers/tty/n_gsm.c Auto-merging drivers/tty/tty_io.c Auto-merging fs/compat_ioctl.c Auto-merging kernel/printk.c Merge made by recursive. Documentation/ABI/testing/sysfs-tty | 19 + Documentation/filesystems/proc.txt | 24 + Documentation/serial/00-INDEX | 2 + Documentation/serial/serial-rs485.txt | 120 +++ arch/alpha/include/asm/ioctls.h | 1 + arch/mips/include/asm/ioctls.h | 1 + arch/parisc/include/asm/ioctls.h | 1 + arch/parisc/kernel/pdc_cons.c | 8 +- arch/powerpc/include/asm/ioctls.h | 1 + arch/sh/include/asm/ioctls.h | 1 + arch/sparc/include/asm/ioctls.h | 1 + arch/xtensa/include/asm/ioctls.h | 1 + drivers/char/Kconfig | 9 + drivers/char/Makefile | 1 + drivers/char/hvc_dcc.c | 133 +++ drivers/char/ip2/ip2main.c | 2 +- drivers/char/rocket.c | 2 +- drivers/char/specialix.c | 2 +- drivers/serial/8250.c | 109 ++- drivers/serial/8250_pci.c | 36 + drivers/serial/Kconfig | 25 + drivers/serial/Makefile | 5 +- drivers/serial/apbuart.c | 48 +- drivers/serial/cpm_uart/cpm_uart.h | 6 - drivers/serial/cpm_uart/cpm_uart_core.c | 19 + drivers/serial/ifx6x60.c | 1406 ++++++++++++++++++++++++++++++ drivers/serial/ifx6x60.h | 129 +++ drivers/serial/mpc52xx_uart.c | 6 +- drivers/serial/omap-serial.c | 38 +- drivers/serial/pch_uart.c | 1451 +++++++++++++++++++++++++++++++ drivers/serial/serial_core.c | 10 +- drivers/serial/vt8500_serial.c | 648 ++++++++++++++ drivers/tty/n_gsm.c | 213 +++-- drivers/tty/tty_io.c | 52 +- drivers/tty/vt/vt.c | 23 +- drivers/video/xen-fbfront.c | 2 +- fs/compat_ioctl.c | 1 + fs/proc/Makefile | 1 + fs/proc/proc_console.c | 114 +++ include/asm-generic/ioctls.h | 1 + include/linux/console.h | 8 +- include/linux/serial_core.h | 7 +- include/linux/spi/ifx_modem.h | 14 + include/linux/tty_driver.h | 9 +- kernel/printk.c | 8 +- 45 files changed, 4532 insertions(+), 186 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-tty create mode 100644 Documentation/serial/serial-rs485.txt create mode 100644 drivers/char/hvc_dcc.c create mode 100644 drivers/serial/ifx6x60.c create mode 100644 drivers/serial/ifx6x60.h create mode 100644 drivers/serial/pch_uart.c create mode 100644 drivers/serial/vt8500_serial.c create mode 100644 fs/proc/proc_console.c create mode 100644 include/linux/spi/ifx_modem.h $ git revert 35c64e5d13c3d7d8c4ad061ad5e20498b9160c24 Finished one revert. [master 8b6becf] Revert "drivers: serial: apbuart: Handle OF failures gracefully" 1 files changed, 29 insertions(+), 19 deletions(-) Merging usb/usb-next $ git merge usb/usb-next Resolved 'arch/arm/mach-omap2/Kconfig' using previous resolution. Resolved 'arch/arm/mach-omap2/clock3xxx_data.c' using previous resolution. Resolved 'arch/arm/mach-omap2/clock44xx_data.c' using previous resolution. Resolved 'arch/sh/Kconfig' using previous resolution. Auto-merging arch/arm/mach-omap2/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Kconfig Auto-merging arch/arm/mach-omap2/Makefile Auto-merging arch/arm/mach-omap2/board-4430sdp.c Auto-merging arch/arm/mach-omap2/board-n8x0.c Auto-merging arch/arm/mach-omap2/board-omap4panda.c Auto-merging arch/arm/mach-omap2/clock2420_data.c Auto-merging arch/arm/mach-omap2/clock2430_data.c Auto-merging arch/arm/mach-omap2/clock3xxx_data.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clock3xxx_data.c Auto-merging arch/arm/mach-omap2/clock44xx_data.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clock44xx_data.c Auto-merging arch/arm/mach-omap2/usb-tusb6010.c Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c Auto-merging arch/blackfin/mach-bf527/boards/cm_bf527.c Auto-merging arch/blackfin/mach-bf527/boards/ezbrd.c Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c Auto-merging arch/blackfin/mach-bf548/boards/cm_bf548.c Auto-merging arch/blackfin/mach-bf548/boards/ezkit.c Auto-merging arch/sh/Kconfig CONFLICT (content): Merge conflict in arch/sh/Kconfig Auto-merging drivers/hid/hid-core.c Auto-merging drivers/hid/hid-ids.h Auto-merging drivers/mfd/twl-core.c Auto-merging drivers/mfd/twl6030-irq.c Auto-merging drivers/net/wimax/i2400m/usb.c Auto-merging drivers/usb/core/driver.c Auto-merging drivers/usb/gadget/imx_udc.c Auto-merging drivers/usb/gadget/u_ether.c Auto-merging drivers/usb/host/ohci-hcd.c Auto-merging drivers/usb/musb/musb_gadget.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 193d4f8] Merge remote branch 'usb/usb-next' $ git diff -M --stat --summary HEAD^.. Documentation/usb/power-management.txt | 113 +- arch/arm/mach-davinci/usb.c | 6 +- arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/Makefile | 6 +- arch/arm/mach-omap2/board-4430sdp.c | 35 +- arch/arm/mach-omap2/board-n8x0.c | 5 +- arch/arm/mach-omap2/board-omap4panda.c | 14 +- arch/arm/mach-omap2/clock2420_data.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 13 +- arch/arm/mach-omap2/clock44xx_data.c | 7 +- arch/arm/mach-omap2/omap_phy_internal.c | 149 ++ arch/arm/mach-omap2/usb-ehci.c | 144 ++- arch/arm/mach-omap2/usb-musb.c | 104 +- arch/arm/mach-omap2/usb-tusb6010.c | 2 +- arch/arm/plat-omap/include/plat/omap44xx.h | 5 + arch/arm/plat-omap/include/plat/usb.h | 10 + arch/blackfin/mach-bf527/boards/ad7160eval.c | 2 +- arch/blackfin/mach-bf527/boards/cm_bf527.c | 4 +- arch/blackfin/mach-bf527/boards/ezbrd.c | 4 +- arch/blackfin/mach-bf527/boards/ezkit.c | 4 +- arch/blackfin/mach-bf527/boards/tll6527m.c | 2 +- arch/blackfin/mach-bf548/boards/cm_bf548.c | 4 +- arch/blackfin/mach-bf548/boards/ezkit.c | 4 +- arch/sh/Kconfig | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 35 +- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 2 + drivers/media/video/tlg2300/pd-main.c | 3 +- drivers/mfd/twl-core.c | 44 +- drivers/mfd/twl6030-irq.c | 9 +- drivers/net/wimax/i2400m/usb.c | 2 +- drivers/staging/bcm/InterfaceInit.c | 2 +- drivers/usb/Kconfig | 9 +- drivers/usb/core/driver.c | 150 +-- drivers/usb/core/hcd-pci.c | 1 - drivers/usb/core/hcd.c | 1 - drivers/usb/core/hub.c | 11 +- drivers/usb/core/message.c | 1 + drivers/usb/core/quirks.c | 15 - drivers/usb/core/sysfs.c | 84 +- drivers/usb/core/usb.c | 3 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 77 +- drivers/usb/gadget/Makefile | 8 +- drivers/usb/gadget/amd5536udc.c | 1 - drivers/usb/gadget/atmel_usba_udc.c | 4 +- drivers/usb/gadget/ci13xxx_msm.c | 134 ++ drivers/usb/gadget/ci13xxx_pci.c | 176 ++ drivers/usb/gadget/ci13xxx_udc.c | 421 ++-- drivers/usb/gadget/ci13xxx_udc.h | 20 + drivers/usb/gadget/composite.c | 10 +- drivers/usb/gadget/dummy_hcd.c | 251 ++- drivers/usb/gadget/f_fs.c | 437 ++-- drivers/usb/gadget/f_mass_storage.c | 524 +++--- drivers/usb/gadget/f_ncm.c | 1407 ++++++++++++ drivers/usb/gadget/file_storage.c | 29 +- drivers/usb/gadget/g_ffs.c | 41 +- drivers/usb/gadget/gadget_chips.h | 25 +- drivers/usb/gadget/imx_udc.c | 8 +- drivers/usb/gadget/imx_udc.h | 3 - drivers/usb/gadget/langwell_udc.c | 23 + drivers/usb/gadget/mass_storage.c | 2 +- drivers/usb/gadget/mv_udc.h | 294 +++ drivers/usb/gadget/mv_udc_core.c | 2149 +++++++++++++++++++ drivers/usb/gadget/mv_udc_phy.c | 214 ++ drivers/usb/gadget/ncm.c | 248 +++ drivers/usb/gadget/pch_udc.c | 2947 ++++++++++++++++++++++++++ drivers/usb/gadget/u_audio.c | 10 +- drivers/usb/gadget/u_ether.c | 14 +- drivers/usb/gadget/u_ether.h | 5 + drivers/usb/host/Kconfig | 19 + drivers/usb/host/ehci-atmel.c | 3 + drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/ehci-hcd.c | 30 +- drivers/usb/host/ehci-msm.c | 345 +++ drivers/usb/host/ehci-mxc.c | 29 +- drivers/usb/host/ehci-omap.c | 320 +++- drivers/usb/host/ehci-pci.c | 39 + drivers/usb/host/ehci-sched.c | 79 + drivers/usb/host/ehci-sh.c | 243 +++ drivers/usb/host/ehci-spear.c | 212 ++ drivers/usb/host/ehci-vt8500.c | 172 ++ drivers/usb/host/ehci-w90x900.c | 3 + drivers/usb/host/ehci-xilinx-of.c | 1 + drivers/usb/host/ehci.h | 1 + drivers/usb/host/ohci-hcd.c | 5 + drivers/usb/host/ohci-omap3.c | 2 +- drivers/usb/host/ohci-sh.c | 2 +- drivers/usb/host/ohci-spear.c | 240 +++ drivers/usb/host/uhci-hcd.c | 2 +- drivers/usb/host/uhci-q.c | 12 +- drivers/usb/host/whci/hcd.c | 2 +- drivers/usb/misc/usbled.c | 118 +- drivers/usb/mon/mon_bin.c | 34 +- drivers/usb/musb/Kconfig | 77 +- drivers/usb/musb/Makefile | 21 +- drivers/usb/musb/am35x.c | 410 +++-- drivers/usb/musb/blackfin.c | 181 ++- drivers/usb/musb/cppi_dma.c | 2 +- drivers/usb/musb/da8xx.c | 170 ++- drivers/usb/musb/davinci.c | 174 ++- drivers/usb/musb/musb_core.c | 193 +-- drivers/usb/musb/musb_core.h | 190 +- drivers/usb/musb/musb_gadget.c | 13 +- drivers/usb/musb/musb_io.h | 4 +- drivers/usb/musb/musb_regs.h | 4 +- drivers/usb/musb/musb_virthub.c | 2 +- drivers/usb/musb/musbhsdma.c | 2 +- drivers/usb/musb/omap2430.c | 378 +++- drivers/usb/musb/tusb6010.c | 181 ++- drivers/usb/musb/ux500.c | 216 ++ drivers/usb/otg/Kconfig | 32 + drivers/usb/otg/Makefile | 3 + drivers/usb/otg/ab8500-usb.c | 585 +++++ drivers/usb/otg/msm72k_otg.c | 1125 ++++++++++ drivers/usb/otg/twl4030-usb.c | 3 +- drivers/usb/otg/twl6030-usb.c | 493 +++++ drivers/usb/serial/ftdi_sio.c | 27 + drivers/usb/serial/option.c | 1 + drivers/usb/serial/ssu100.c | 56 +- drivers/usb/serial/usb-wwan.h | 2 + drivers/usb/serial/usb_wwan.c | 79 + drivers/usb/storage/uas.c | 82 +- drivers/uwb/i1480/i1480-est.c | 2 +- drivers/uwb/umc-dev.c | 7 +- drivers/uwb/whc-rc.c | 2 +- include/linux/i2c/twl.h | 7 + include/linux/usb.h | 7 +- include/linux/usb/ch11.h | 47 + include/linux/usb/ch9.h | 10 + include/linux/usb/hcd.h | 4 + include/linux/usb/msm_hsusb.h | 112 + include/linux/usb/msm_hsusb_hw.h | 59 + include/linux/usb/musb.h | 8 +- include/linux/usb/otg.h | 2 +- 136 files changed, 15391 insertions(+), 2001 deletions(-) create mode 100644 arch/arm/mach-omap2/omap_phy_internal.c create mode 100644 drivers/usb/gadget/ci13xxx_msm.c create mode 100644 drivers/usb/gadget/ci13xxx_pci.c create mode 100644 drivers/usb/gadget/f_ncm.c create mode 100644 drivers/usb/gadget/mv_udc.h create mode 100644 drivers/usb/gadget/mv_udc_core.c create mode 100644 drivers/usb/gadget/mv_udc_phy.c create mode 100644 drivers/usb/gadget/ncm.c create mode 100644 drivers/usb/gadget/pch_udc.c create mode 100644 drivers/usb/host/ehci-msm.c create mode 100644 drivers/usb/host/ehci-sh.c create mode 100644 drivers/usb/host/ehci-spear.c create mode 100644 drivers/usb/host/ehci-vt8500.c create mode 100644 drivers/usb/host/ohci-spear.c create mode 100644 drivers/usb/musb/ux500.c create mode 100644 drivers/usb/otg/ab8500-usb.c create mode 100644 drivers/usb/otg/msm72k_otg.c create mode 100644 drivers/usb/otg/twl6030-usb.c create mode 100644 include/linux/usb/msm_hsusb.h create mode 100644 include/linux/usb/msm_hsusb_hw.h Merging staging/staging-next $ git merge staging/staging-next Auto-merging MAINTAINERS Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/Makefile Removing drivers/staging/adis16255/Kconfig Removing drivers/staging/adis16255/Makefile Removing drivers/staging/adis16255/adis16255.c Removing drivers/staging/adis16255/adis16255.h Removing drivers/staging/batman-adv/Kconfig Removing drivers/staging/batman-adv/Makefile Removing drivers/staging/batman-adv/README Removing drivers/staging/batman-adv/TODO Removing drivers/staging/batman-adv/aggregation.c Removing drivers/staging/batman-adv/aggregation.h Removing drivers/staging/batman-adv/bat_debugfs.c Removing drivers/staging/batman-adv/bat_debugfs.h Removing drivers/staging/batman-adv/bat_sysfs.c Removing drivers/staging/batman-adv/bat_sysfs.h Removing drivers/staging/batman-adv/bitarray.c Removing drivers/staging/batman-adv/bitarray.h Removing drivers/staging/batman-adv/hard-interface.c Removing drivers/staging/batman-adv/hard-interface.h Removing drivers/staging/batman-adv/hash.c Removing drivers/staging/batman-adv/hash.h Removing drivers/staging/batman-adv/icmp_socket.c Removing drivers/staging/batman-adv/icmp_socket.h Removing drivers/staging/batman-adv/main.c Removing drivers/staging/batman-adv/main.h Removing drivers/staging/batman-adv/originator.c Removing drivers/staging/batman-adv/originator.h Removing drivers/staging/batman-adv/packet.h Removing drivers/staging/batman-adv/ring_buffer.c Removing drivers/staging/batman-adv/ring_buffer.h Removing drivers/staging/batman-adv/routing.c Removing drivers/staging/batman-adv/routing.h Removing drivers/staging/batman-adv/send.c Removing drivers/staging/batman-adv/send.h Removing drivers/staging/batman-adv/soft-interface.c Removing drivers/staging/batman-adv/soft-interface.h Removing drivers/staging/batman-adv/sysfs-class-net-batman-adv Removing drivers/staging/batman-adv/sysfs-class-net-mesh Removing drivers/staging/batman-adv/translation-table.c Removing drivers/staging/batman-adv/translation-table.h Removing drivers/staging/batman-adv/types.h Removing drivers/staging/batman-adv/unicast.c Removing drivers/staging/batman-adv/unicast.h Removing drivers/staging/batman-adv/vis.c Removing drivers/staging/batman-adv/vis.h Removing drivers/staging/bcm/Arp.c Removing drivers/staging/bcm/Debug.c Removing drivers/staging/bcm/HostMibs.h Auto-merging drivers/staging/bcm/InterfaceInit.c Removing drivers/staging/bcm/Interfacemain.h Removing drivers/staging/bcm/Osal_Misc.c Removing drivers/staging/bcm/osal_misc.h Removing drivers/staging/brcm80211/include/bcm_rpc.h Removing drivers/staging/brcm80211/include/bcm_rpc_tp.h Removing drivers/staging/brcm80211/include/bcm_xdr.h Removing drivers/staging/brcm80211/include/dbus.h Removing drivers/staging/brcm80211/include/epivers.h Removing drivers/staging/brcm80211/include/linux_osl.h Removing drivers/staging/brcm80211/include/linuxver.h Removing drivers/staging/brcm80211/sys/wlc_rpc.h Removing drivers/staging/brcm80211/sys/wlc_rpctx.h Auto-merging drivers/staging/cx25821/cx25821-alsa.c Removing drivers/staging/hv/vmbus.c Auto-merging drivers/staging/sm7xx/smtcfb.c Removing drivers/staging/winbond/mlmetxrx.c Removing drivers/staging/winbond/mlmetxrx_f.h Removing drivers/staging/winbond/sysdef.h Removing drivers/staging/winbond/wbhal_f.h Removing drivers/staging/winbond/wblinux_f.h Removing drivers/staging/winbond/wbusb_s.h Auto-merging drivers/usb/serial/option.c Merge made by recursive. MAINTAINERS | 4 +- drivers/staging/Kconfig | 10 +- drivers/staging/Makefile | 5 +- drivers/staging/adis16255/Kconfig | 11 - drivers/staging/adis16255/Makefile | 1 - drivers/staging/adis16255/adis16255.c | 468 --- drivers/staging/adis16255/adis16255.h | 12 - drivers/staging/asus_oled/asus_oled.c | 2 +- .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 4 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +- drivers/staging/autofs/dirhash.c | 87 +- drivers/staging/batman-adv/Kconfig | 26 - drivers/staging/batman-adv/Makefile | 22 - drivers/staging/batman-adv/README | 240 -- drivers/staging/batman-adv/TODO | 14 - drivers/staging/batman-adv/aggregation.c | 275 -- drivers/staging/batman-adv/aggregation.h | 43 - drivers/staging/batman-adv/bat_debugfs.c | 343 -- drivers/staging/batman-adv/bat_debugfs.h | 33 - drivers/staging/batman-adv/bat_sysfs.c | 558 --- drivers/staging/batman-adv/bat_sysfs.h | 42 - drivers/staging/batman-adv/bitarray.c | 201 -- drivers/staging/batman-adv/bitarray.h | 47 - drivers/staging/batman-adv/hard-interface.c | 647 ---- drivers/staging/batman-adv/hard-interface.h | 58 - drivers/staging/batman-adv/hash.c | 306 -- drivers/staging/batman-adv/hash.h | 100 - drivers/staging/batman-adv/icmp_socket.c | 359 -- drivers/staging/batman-adv/icmp_socket.h | 34 - drivers/staging/batman-adv/main.c | 217 -- drivers/staging/batman-adv/main.h | 183 - drivers/staging/batman-adv/originator.c | 533 --- drivers/staging/batman-adv/originator.h | 36 - drivers/staging/batman-adv/packet.h | 134 - drivers/staging/batman-adv/ring_buffer.c | 52 - drivers/staging/batman-adv/ring_buffer.h | 28 - drivers/staging/batman-adv/routing.c | 1389 -------- drivers/staging/batman-adv/routing.h | 46 - drivers/staging/batman-adv/send.c | 580 ---- drivers/staging/batman-adv/send.h | 41 - drivers/staging/batman-adv/soft-interface.c | 398 --- drivers/staging/batman-adv/soft-interface.h | 32 - .../staging/batman-adv/sysfs-class-net-batman-adv | 14 - drivers/staging/batman-adv/sysfs-class-net-mesh | 41 - drivers/staging/batman-adv/translation-table.c | 518 --- drivers/staging/batman-adv/translation-table.h | 45 - drivers/staging/batman-adv/types.h | 241 -- drivers/staging/batman-adv/unicast.c | 269 -- drivers/staging/batman-adv/unicast.h | 39 - drivers/staging/batman-adv/vis.c | 895 ----- drivers/staging/batman-adv/vis.h | 37 - drivers/staging/bcm/Adapter.h | 134 +- drivers/staging/bcm/Arp.c | 94 - drivers/staging/bcm/Bcmchar.c | 967 ++---- drivers/staging/bcm/Bcmnet.c | 404 +-- drivers/staging/bcm/CmHost.c | 139 +- drivers/staging/bcm/CmHost.h | 3 - drivers/staging/bcm/DDRInit.c | 17 +- drivers/staging/bcm/Debug.c | 41 - drivers/staging/bcm/Debug.h | 88 +- drivers/staging/bcm/HandleControlPacket.c | 39 +- drivers/staging/bcm/HostMibs.h | 7 - drivers/staging/bcm/IPv6Protocol.c | 10 +- drivers/staging/bcm/IPv6ProtocolHdr.h | 3 - drivers/staging/bcm/InterfaceDld.c | 136 +- drivers/staging/bcm/InterfaceIdleMode.c | 20 +- drivers/staging/bcm/InterfaceIdleMode.h | 2 - drivers/staging/bcm/InterfaceInit.c | 854 ++--- drivers/staging/bcm/InterfaceInit.h | 28 +- drivers/staging/bcm/InterfaceIsr.c | 44 +- drivers/staging/bcm/InterfaceMisc.c | 29 +- drivers/staging/bcm/InterfaceMisc.h | 3 - drivers/staging/bcm/InterfaceRx.c | 40 +- drivers/staging/bcm/InterfaceTx.c | 74 +- drivers/staging/bcm/InterfaceTx.h | 6 - drivers/staging/bcm/Interfacemain.h | 10 - drivers/staging/bcm/LeakyBucket.c | 72 +- drivers/staging/bcm/Macros.h | 40 +- drivers/staging/bcm/Makefile | 4 +- drivers/staging/bcm/Misc.c | 536 +--- drivers/staging/bcm/Osal_Misc.c | 27 - drivers/staging/bcm/PHSModule.c | 234 +- drivers/staging/bcm/PHSModule.h | 45 - drivers/staging/bcm/Protocol.h | 6 +- drivers/staging/bcm/Prototypes.h | 122 +- drivers/staging/bcm/Qos.c | 106 +- drivers/staging/bcm/TODO | 25 +- drivers/staging/bcm/Transmit.c | 393 +-- drivers/staging/bcm/cntrl_SignalingInterface.h | 254 -- drivers/staging/bcm/headers.h | 40 +- drivers/staging/bcm/hostmibs.c | 35 +- drivers/staging/bcm/led_control.c | 135 +- drivers/staging/bcm/nvm.c | 642 +--- drivers/staging/bcm/nvm.h | 80 - drivers/staging/bcm/osal_misc.h | 49 - drivers/staging/brcm80211/README | 10 +- drivers/staging/brcm80211/brcmfmac/README | 5 +- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 12 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 270 +-- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 59 +- .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 4 +- drivers/staging/brcm80211/brcmfmac/dhd.h | 19 +- drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 6 +- drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 40 +- drivers/staging/brcm80211/brcmfmac/dhd_common.c | 18 +- .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 36 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 148 +- .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 1 - drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 7 +- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 348 +- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 586 ++-- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 48 +- drivers/staging/brcm80211/brcmfmac/wl_iw.c | 578 ++-- drivers/staging/brcm80211/brcmfmac/wl_iw.h | 2 +- drivers/staging/brcm80211/include/bcm_rpc.h | 79 - drivers/staging/brcm80211/include/bcm_rpc_tp.h | 137 - drivers/staging/brcm80211/include/bcm_xdr.h | 60 - drivers/staging/brcm80211/include/bcmdefs.h | 63 +- drivers/staging/brcm80211/include/bcmsdbus.h | 6 +- drivers/staging/brcm80211/include/bcmsdh.h | 12 +- drivers/staging/brcm80211/include/bcmsdh_sdmmc.h | 6 +- drivers/staging/brcm80211/include/bcmsrom.h | 8 +- drivers/staging/brcm80211/include/bcmutils.h | 60 +- drivers/staging/brcm80211/include/d11.h | 7 - drivers/staging/brcm80211/include/dbus.h | 353 -- drivers/staging/brcm80211/include/epivers.h | 44 - drivers/staging/brcm80211/include/hnddma.h | 91 +- drivers/staging/brcm80211/include/hndpmu.h | 44 +- drivers/staging/brcm80211/include/linux_osl.h | 407 --- drivers/staging/brcm80211/include/linuxver.h | 38 - drivers/staging/brcm80211/include/nicpci.h | 12 +- drivers/staging/brcm80211/include/osl.h | 209 +- drivers/staging/brcm80211/include/proto/ethernet.h | 54 +- drivers/staging/brcm80211/include/proto/wpa.h | 94 - drivers/staging/brcm80211/include/rpc_osl.h | 2 +- drivers/staging/brcm80211/include/siutils.h | 28 +- drivers/staging/brcm80211/include/wlioctl.h | 342 +-- drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 63 +- drivers/staging/brcm80211/phy/wlc_phy_hal.h | 6 - drivers/staging/brcm80211/phy/wlc_phy_int.h | 4 +- drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 13 +- drivers/staging/brcm80211/phy/wlc_phy_n.c | 59 +- drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3 + drivers/staging/brcm80211/phy/wlc_phytbl_n.c | 3 + drivers/staging/brcm80211/sys/wl_dbg.h | 72 +- drivers/staging/brcm80211/sys/wl_export.h | 8 +- drivers/staging/brcm80211/sys/wl_mac80211.c | 1026 ++----- drivers/staging/brcm80211/sys/wl_mac80211.h | 50 +- drivers/staging/brcm80211/sys/wl_ucode.h | 12 + drivers/staging/brcm80211/sys/wl_ucode_loader.c | 13 +- drivers/staging/brcm80211/sys/wlc_alloc.c | 70 +- drivers/staging/brcm80211/sys/wlc_alloc.h | 12 +- drivers/staging/brcm80211/sys/wlc_ampdu.c | 316 +- drivers/staging/brcm80211/sys/wlc_ampdu.h | 30 +- drivers/staging/brcm80211/sys/wlc_antsel.c | 49 +- drivers/staging/brcm80211/sys/wlc_antsel.h | 16 +- drivers/staging/brcm80211/sys/wlc_bmac.c | 806 +++--- drivers/staging/brcm80211/sys/wlc_bmac.h | 182 +- drivers/staging/brcm80211/sys/wlc_bsscfg.h | 3 +- drivers/staging/brcm80211/sys/wlc_cfg.h | 24 - drivers/staging/brcm80211/sys/wlc_channel.c | 102 +- drivers/staging/brcm80211/sys/wlc_event.c | 16 +- drivers/staging/brcm80211/sys/wlc_event.h | 5 +- drivers/staging/brcm80211/sys/wlc_mac80211.c | 1297 +++----- drivers/staging/brcm80211/sys/wlc_mac80211.h | 312 +- drivers/staging/brcm80211/sys/wlc_phy_shim.c | 14 +- drivers/staging/brcm80211/sys/wlc_pub.h | 48 +- drivers/staging/brcm80211/sys/wlc_rate.c | 6 +- drivers/staging/brcm80211/sys/wlc_rpc.h | 527 --- drivers/staging/brcm80211/sys/wlc_rpctx.h | 71 - drivers/staging/brcm80211/sys/wlc_scb.h | 2 +- drivers/staging/brcm80211/sys/wlc_stf.c | 72 +- drivers/staging/brcm80211/sys/wlc_stf.h | 31 +- drivers/staging/brcm80211/sys/wlc_types.h | 31 +- drivers/staging/brcm80211/util/aiutils.c | 25 +- drivers/staging/brcm80211/util/bcmotp.c | 22 +- drivers/staging/brcm80211/util/bcmsrom.c | 95 +- drivers/staging/brcm80211/util/bcmutils.c | 112 +- drivers/staging/brcm80211/util/bcmwifi.c | 4 + drivers/staging/brcm80211/util/hnddma.c | 136 +- drivers/staging/brcm80211/util/hndpmu.c | 174 +- drivers/staging/brcm80211/util/linux_osl.c | 247 +-- drivers/staging/brcm80211/util/nicpci.c | 125 +- drivers/staging/brcm80211/util/nvram/nvram_ro.c | 4 +- drivers/staging/brcm80211/util/sbutils.c | 13 +- drivers/staging/brcm80211/util/siutils.c | 206 +- drivers/staging/comedi/drivers.c | 30 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../staging/comedi/drivers/addi-data/addi_common.c | 4 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 66 +- drivers/staging/comedi/drivers/jr3_pci.c | 7 + drivers/staging/comedi/drivers/ni_tiocmd.c | 71 +- drivers/staging/comedi/drivers/rtd520.c | 2 +- drivers/staging/comedi/drivers/s526.c | 139 +- drivers/staging/comedi/drivers/usbdux.c | 2 +- drivers/staging/cptm1217/Kconfig | 12 + drivers/staging/cptm1217/Makefile | 2 + drivers/staging/cptm1217/TODO | 5 + drivers/staging/cptm1217/clearpad_tm1217.c | 675 ++++ drivers/staging/cptm1217/cp_tm1217.h | 9 + drivers/staging/crystalhd/crystalhd_hw.c | 2 +- drivers/staging/crystalhd/crystalhd_lnx.c | 6 +- drivers/staging/cx25821/cx25821-alsa.c | 2 +- drivers/staging/cxt1e1/comet.c | 8 +- drivers/staging/cxt1e1/functions.c | 8 +- drivers/staging/cxt1e1/hwprobe.c | 4 +- drivers/staging/cxt1e1/linux.c | 18 +- drivers/staging/cxt1e1/musycc.c | 58 +- drivers/staging/cxt1e1/pmcc4_drv.c | 38 +- drivers/staging/cxt1e1/sbecom_inline_linux.h | 4 +- drivers/staging/easycap/Kconfig | 1 - drivers/staging/easycap/Makefile | 1 + drivers/staging/easycap/README | 93 +- drivers/staging/easycap/easycap.h | 186 +- drivers/staging/easycap/easycap_debug.h | 2 + drivers/staging/easycap/easycap_ioctl.c | 2286 +++++++------ drivers/staging/easycap/easycap_low.c | 895 +++-- drivers/staging/easycap/easycap_main.c | 2782 ++++++++++------ drivers/staging/easycap/easycap_settings.c | 272 ++- drivers/staging/easycap/easycap_sound.c | 603 +++-- drivers/staging/easycap/easycap_testcard.c | 372 ++- drivers/staging/et131x/et131x_initpci.c | 2 +- drivers/staging/frontier/alphatrack.c | 4 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 54 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 8 +- drivers/staging/ft1000/ft1000-usb/Makefile | 2 +- .../ft1000-usb/{ft1000_chdev.c => ft1000_debug.c} | 435 +-- .../staging/ft1000/ft1000-usb/ft1000_download.c | 386 ++-- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 433 +-- drivers/staging/ft1000/ft1000-usb/ft1000_hw.h | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 373 ++- drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 34 +- drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 62 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/hv/Makefile | 2 +- drivers/staging/hv/blkvsc.c | 52 +- drivers/staging/hv/blkvsc_drv.c | 117 +- drivers/staging/hv/channel.c | 338 +- drivers/staging/hv/channel_mgmt.c | 244 +- drivers/staging/hv/channel_mgmt.h | 245 +- drivers/staging/hv/connection.c | 56 +- drivers/staging/hv/hv.c | 346 +- drivers/staging/hv/hv.h | 36 +- drivers/staging/hv/hv_api.h | 278 +- drivers/staging/hv/hv_utils.c | 99 +- drivers/staging/hv/netvsc.c | 937 +++--- drivers/staging/hv/netvsc.h | 164 +- drivers/staging/hv/netvsc_api.h | 64 +- drivers/staging/hv/netvsc_drv.c | 83 +- drivers/staging/hv/osd.c | 108 +- drivers/staging/hv/osd.h | 22 +- drivers/staging/hv/ring_buffer.c | 404 ++-- drivers/staging/hv/ring_buffer.h | 56 +- drivers/staging/hv/rndis.h | 353 +- drivers/staging/hv/rndis_filter.c | 640 ++-- drivers/staging/hv/rndis_filter.h | 2 +- drivers/staging/hv/storvsc.c | 584 ++-- drivers/staging/hv/storvsc_api.h | 54 +- drivers/staging/hv/storvsc_drv.c | 95 +- drivers/staging/hv/vmbus.c | 274 -- drivers/staging/hv/vmbus_api.h | 24 - drivers/staging/hv/vmbus_drv.c | 351 ++- drivers/staging/hv/vmbus_private.h | 7 +- drivers/staging/hv/vstorage.h | 106 +- drivers/staging/iio/Documentation/sysfs-bus-iio | 627 +++-- .../staging/iio/Documentation/sysfs-bus-iio-dds | 93 + drivers/staging/iio/Kconfig | 6 +- drivers/staging/iio/Makefile | 7 +- drivers/staging/iio/TODO | 4 + drivers/staging/iio/accel/Kconfig | 27 + drivers/staging/iio/accel/Makefile | 12 + drivers/staging/iio/accel/accel.h | 20 + drivers/staging/iio/accel/adis16201.h | 150 + drivers/staging/iio/accel/adis16201_core.c | 659 ++++ drivers/staging/iio/accel/adis16201_ring.c | 218 ++ drivers/staging/iio/accel/adis16201_trigger.c | 122 + drivers/staging/iio/accel/adis16203.h | 143 + drivers/staging/iio/accel/adis16203_core.c | 568 ++++ drivers/staging/iio/accel/adis16203_ring.c | 211 ++ drivers/staging/iio/accel/adis16203_trigger.c | 122 + drivers/staging/iio/accel/adis16204.h | 151 + drivers/staging/iio/accel/adis16204_core.c | 613 ++++ drivers/staging/iio/accel/adis16204_ring.c | 206 ++ drivers/staging/iio/accel/adis16204_trigger.c | 122 + drivers/staging/iio/accel/adis16209_ring.c | 2 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- drivers/staging/iio/adc/Kconfig | 91 +- drivers/staging/iio/adc/Makefile | 15 + drivers/staging/iio/adc/ad7150.c | 877 +++++ drivers/staging/iio/adc/ad7152.c | 610 ++++ drivers/staging/iio/adc/ad7291.c | 1039 ++++++ drivers/staging/iio/adc/ad7298.c | 501 +++ drivers/staging/iio/adc/ad7314.c | 308 ++ drivers/staging/iio/adc/ad7745.c | 734 ++++ drivers/staging/iio/adc/ad7816.c | 535 +++ drivers/staging/iio/adc/ad7887.h | 105 + drivers/staging/iio/adc/ad7887_core.c | 305 ++ drivers/staging/iio/adc/ad7887_ring.c | 266 ++ drivers/staging/iio/adc/adt7310.c | 952 ++++++ drivers/staging/iio/adc/adt7410.c | 915 +++++ drivers/staging/iio/adc/adt75.c | 732 ++++ drivers/staging/iio/addac/Kconfig | 25 + drivers/staging/iio/addac/Makefile | 7 + drivers/staging/iio/addac/adt7316-i2c.c | 170 + drivers/staging/iio/addac/adt7316-spi.c | 180 + drivers/staging/iio/addac/adt7316.c | 2402 +++++++++++++ drivers/staging/iio/addac/adt7316.h | 33 + drivers/staging/iio/dac/Kconfig | 21 + drivers/staging/iio/dac/Makefile | 6 + drivers/staging/iio/dac/ad5446.c | 323 ++ drivers/staging/iio/dac/ad5446.h | 96 + drivers/staging/iio/dac/ad5624r.h | 21 + drivers/staging/iio/dac/ad5624r_spi.c | 300 ++ drivers/staging/iio/dac/dac.h | 6 + drivers/staging/iio/dds/Kconfig | 56 + drivers/staging/iio/dds/Makefile | 11 + drivers/staging/iio/dds/ad5930.c | 170 + drivers/staging/iio/dds/ad9832.c | 264 ++ drivers/staging/iio/dds/ad9834.c | 477 +++ drivers/staging/iio/dds/ad9834.h | 112 + drivers/staging/iio/dds/ad9850.c | 156 + drivers/staging/iio/dds/ad9852.c | 305 ++ drivers/staging/iio/dds/ad9910.c | 440 +++ drivers/staging/iio/dds/ad9951.c | 249 ++ drivers/staging/iio/dds/dds.h | 110 + drivers/staging/iio/gyro/Kconfig | 38 +- drivers/staging/iio/gyro/Makefile | 12 + drivers/staging/iio/gyro/adis16060.h | 101 + drivers/staging/iio/gyro/adis16060_core.c | 319 ++ drivers/staging/iio/gyro/adis16080.h | 102 + drivers/staging/iio/gyro/adis16080_core.c | 271 ++ drivers/staging/iio/gyro/adis16130.h | 108 + drivers/staging/iio/gyro/adis16130_core.c | 313 ++ drivers/staging/iio/gyro/adis16251.h | 185 + drivers/staging/iio/gyro/adis16251_core.c | 777 +++++ drivers/staging/iio/gyro/adis16260.h | 3 + drivers/staging/iio/gyro/adis16260_core.c | 142 +- drivers/staging/iio/gyro/adis16260_platform_data.h | 19 + drivers/staging/iio/gyro/gyro.h | 9 + drivers/staging/iio/imu/adis16350_core.c | 1 + drivers/staging/iio/meter/Kconfig | 61 + drivers/staging/iio/meter/Makefile | 15 + drivers/staging/iio/meter/ade7753.c | 730 ++++ drivers/staging/iio/meter/ade7753.h | 140 + drivers/staging/iio/meter/ade7754.c | 756 +++++ drivers/staging/iio/meter/ade7754.h | 161 + drivers/staging/iio/meter/ade7758.h | 171 + drivers/staging/iio/meter/ade7758_core.c | 866 +++++ drivers/staging/iio/meter/ade7758_ring.c | 212 ++ drivers/staging/iio/meter/ade7758_trigger.c | 125 + drivers/staging/iio/meter/ade7759.c | 670 ++++ drivers/staging/iio/meter/ade7759.h | 122 + drivers/staging/iio/meter/ade7854-i2c.c | 272 ++ drivers/staging/iio/meter/ade7854-spi.c | 360 ++ drivers/staging/iio/meter/ade7854.c | 680 ++++ drivers/staging/iio/meter/ade7854.h | 245 ++ drivers/staging/iio/meter/meter.h | 396 +++ drivers/staging/iio/resolver/Kconfig | 54 + drivers/staging/iio/resolver/Makefile | 7 + drivers/staging/iio/resolver/ad2s120x.c | 310 ++ drivers/staging/iio/resolver/ad2s1210.c | 872 +++++ drivers/staging/iio/resolver/ad2s90.c | 159 + drivers/staging/iio/sysfs.h | 6 + drivers/staging/intel_sst/Kconfig | 1 + drivers/staging/intel_sst/intel_sst.c | 116 +- drivers/staging/intel_sst/intel_sst.h | 8 +- .../staging/intel_sst/intel_sst_app_interface.c | 314 ++- drivers/staging/intel_sst/intel_sst_common.h | 10 +- .../staging/intel_sst/intel_sst_drv_interface.c | 209 +- drivers/staging/intel_sst/intel_sst_dsp.c | 70 +- drivers/staging/intel_sst/intel_sst_fw_ipc.h | 113 +- drivers/staging/intel_sst/intel_sst_ioctl.h | 15 +- drivers/staging/intel_sst/intel_sst_ipc.c | 194 +- drivers/staging/intel_sst/intel_sst_pvt.c | 36 +- drivers/staging/intel_sst/intel_sst_stream.c | 20 +- .../staging/intel_sst/intel_sst_stream_encoded.c | 214 +- drivers/staging/intel_sst/intelmid.c | 192 +- drivers/staging/intel_sst/intelmid.h | 5 - drivers/staging/intel_sst/intelmid_ctrl.c | 28 +- drivers/staging/intel_sst/intelmid_msic_control.c | 24 +- drivers/staging/intel_sst/intelmid_pvt.c | 54 +- drivers/staging/intel_sst/intelmid_v0_control.c | 32 +- drivers/staging/intel_sst/intelmid_v1_control.c | 70 +- drivers/staging/intel_sst/intelmid_v2_control.c | 96 +- drivers/staging/keucr/init.c | 420 ++-- drivers/staging/keucr/init.h | 3 + drivers/staging/keucr/ms.c | 10 +- drivers/staging/keucr/smilmain.c | 4 +- drivers/staging/keucr/smilsub.c | 4 +- drivers/staging/line6/capture.c | 2 +- drivers/staging/line6/midi.c | 4 +- drivers/staging/line6/playback.c | 2 +- drivers/staging/memrar/memrar.h | 19 + drivers/staging/msm/Makefile | 4 +- drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- drivers/staging/msm/tvenc.c | 5 +- drivers/staging/phison/phison.c | 2 +- drivers/staging/pohmelfs/crypto.c | 6 +- drivers/staging/rt2860/chip/mac_pci.h | 7 +- drivers/staging/rt2860/chip/mac_usb.h | 5 +- drivers/staging/rt2860/chip/rtmp_mac.h | 19 +- drivers/staging/rt2860/chip/rtmp_phy.h | 14 +- drivers/staging/rt2860/chips/rt3090.c | 8 +- drivers/staging/rt2860/chips/rt30xx.c | 13 +- drivers/staging/rt2860/common/ba_action.c | 18 +- drivers/staging/rt2860/common/cmm_data.c | 2 +- drivers/staging/rt2860/common/cmm_data_pci.c | 4 +- drivers/staging/rt2860/common/cmm_mac_pci.c | 10 +- drivers/staging/rt2860/common/cmm_mac_usb.c | 2 +- drivers/staging/rt2860/common/cmm_wpa.c | 22 +- drivers/staging/rt2860/common/ee_efuse.c | 15 +- drivers/staging/rt2860/common/mlme.c | 13 +- drivers/staging/rt2860/common/rt_rf.c | 3 +- drivers/staging/rt2860/common/rtmp_init.c | 24 +- drivers/staging/rt2860/common/rtmp_mcu.c | 4 +- drivers/staging/rt2860/common/spectrum.c | 2 +- drivers/staging/rt2860/mlme.h | 41 +- drivers/staging/rt2860/oid.h | 15 +- drivers/staging/rt2860/pci_main_dev.c | 22 +- drivers/staging/rt2860/rt_linux.c | 35 +- drivers/staging/rt2860/rt_linux.h | 11 +- drivers/staging/rt2860/rt_main_dev.c | 18 +- drivers/staging/rt2860/rt_pci_rbus.c | 7 +- drivers/staging/rt2860/rt_usb.c | 45 +- drivers/staging/rt2860/rtmp.h | 71 +- drivers/staging/rt2860/rtmp_def.h | 37 +- drivers/staging/rt2860/rtmp_timer.h | 13 +- drivers/staging/rt2860/spectrum.h | 12 +- drivers/staging/rt2860/sta/assoc.c | 15 +- drivers/staging/rt2860/sta/auth.c | 10 +- drivers/staging/rt2860/sta/connect.c | 38 +- drivers/staging/rt2860/sta/rtmp_data.c | 35 +- drivers/staging/rt2860/sta/sanity.c | 5 +- drivers/staging/rt2860/sta/sync.c | 25 +- drivers/staging/rt2860/sta/wpa.c | 5 +- drivers/staging/rt2860/sta_ioctl.c | 25 +- drivers/staging/rt2860/usb_main_dev.c | 20 +- drivers/staging/rt2860/wpa.h | 5 +- drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192e/r8192E_core.c | 6 +- drivers/staging/rtl8192e/r819xE_phy.c | 2 +- drivers/staging/rtl8192u/Makefile | 1 - drivers/staging/rtl8192u/dot11d.h | 2 - drivers/staging/rtl8192u/ieee80211/Makefile | 2 - drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 - drivers/staging/rtl8192u/ieee80211/dot11d.h | 3 - drivers/staging/rtl8192u/ieee80211/ieee80211.h | 8 - drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 12 - .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 47 +- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 4 - drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192u/r8192U_core.c | 27 +- drivers/staging/rtl8192u/r8192U_wx.c | 6 - drivers/staging/rtl8192u/r819xU_phy.c | 6 +- drivers/staging/rtl8712/TODO | 1 - drivers/staging/rtl8712/osdep_service.h | 25 +- drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 2 +- drivers/staging/sep/Kconfig | 10 + drivers/staging/sep/Makefile | 2 + drivers/staging/sep/TODO | 5 + drivers/staging/sep/sep_dev.h | 156 + drivers/staging/sep/sep_driver.c | 3577 ++++++++++++++++++++ drivers/staging/sep/sep_driver_api.h | 297 ++ drivers/staging/sep/sep_driver_config.h | 239 ++ drivers/staging/sep/sep_driver_hw_defs.h | 233 ++ drivers/staging/sm7xx/smtcfb.c | 2 +- drivers/staging/solo6x10/Kconfig | 4 +- drivers/staging/solo6x10/TODO | 4 - drivers/staging/solo6x10/solo6010-core.c | 42 +- drivers/staging/solo6x10/solo6010-disp.c | 6 +- drivers/staging/solo6x10/solo6010-enc.c | 6 +- drivers/staging/solo6x10/solo6010-g723.c | 22 +- drivers/staging/solo6x10/solo6010-gpio.c | 4 +- drivers/staging/solo6x10/solo6010-i2c.c | 13 +- drivers/staging/solo6x10/solo6010-osd-font.h | 60 +- drivers/staging/solo6x10/solo6010-p2m.c | 156 +- drivers/staging/solo6x10/solo6010-tw28.c | 118 +- drivers/staging/solo6x10/solo6010-v4l2-enc.c | 370 ++- drivers/staging/solo6x10/solo6010-v4l2.c | 197 +- drivers/staging/solo6x10/solo6010.h | 39 +- drivers/staging/speakup/spk_types.h | 2 +- drivers/staging/spectra/ffsport.c | 61 +- drivers/staging/spectra/ffsport.h | 1 + drivers/staging/spectra/flash.c | 4 +- drivers/staging/spectra/lld_emu.c | 6 +- drivers/staging/spectra/lld_nand.c | 177 +- drivers/staging/ste_rmi4/Kconfig | 9 + drivers/staging/ste_rmi4/Makefile | 4 + drivers/staging/ste_rmi4/TODO | 7 + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1179 +++++++ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 50 + drivers/staging/tidspbridge/core/tiomap3430.c | 4 +- drivers/staging/tidspbridge/rmgr/nldr.c | 2 +- drivers/staging/udlfb/udlfb.c | 5 +- drivers/staging/vme/bridges/vme_ca91cx42.c | 235 +- drivers/staging/vme/bridges/vme_ca91cx42.h | 2 +- drivers/staging/vme/bridges/vme_tsi148.c | 264 +- drivers/staging/vme/bridges/vme_tsi148.h | 2 +- drivers/staging/vme/devices/vme_user.c | 79 +- drivers/staging/vme/vme.c | 116 +- drivers/staging/vme/vme_bridge.h | 2 +- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/vt6655/wpa2.c | 4 +- drivers/staging/vt6656/baseband.c | 2 +- drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/dpc.c | 4 +- drivers/staging/vt6656/iwctl.c | 2 +- drivers/staging/vt6656/power.c | 2 +- drivers/staging/vt6656/rxtx.c | 3 +- drivers/staging/vt6656/tkip.c | 37 +- drivers/staging/vt6656/wpa2.c | 4 +- .../arch/arm/mach-omap2/cyashalomap_kernel.c | 10 +- drivers/staging/winbond/Makefile | 1 - drivers/staging/winbond/core.h | 2 +- drivers/staging/winbond/mac_structures.h | 545 --- drivers/staging/winbond/mds.c | 70 +- drivers/staging/winbond/mds_f.h | 3 +- drivers/staging/winbond/mds_s.h | 4 - drivers/staging/winbond/mlmetxrx.c | 62 - drivers/staging/winbond/mlmetxrx_f.h | 23 - drivers/staging/winbond/mto.c | 5 +- drivers/staging/winbond/phy_calibration.c | 5 +- drivers/staging/winbond/phy_calibration.h | 2 +- drivers/staging/winbond/reg.c | 36 +- drivers/staging/winbond/sysdef.h | 31 - drivers/staging/winbond/wb35reg.c | 33 +- drivers/staging/winbond/wb35reg_f.h | 2 +- drivers/staging/winbond/wb35reg_s.h | 77 +- drivers/staging/winbond/wb35rx.c | 30 +- drivers/staging/winbond/wb35rx_f.h | 2 +- drivers/staging/winbond/wb35tx.c | 31 +- drivers/staging/winbond/wb35tx_f.h | 1 - drivers/staging/winbond/{wbhal_s.h => wbhal.h} | 14 +- drivers/staging/winbond/wbhal_f.h | 81 - drivers/staging/winbond/wblinux_f.h | 17 - drivers/staging/winbond/wbusb.c | 50 +- drivers/staging/winbond/wbusb_s.h | 18 - drivers/staging/wlags49_h2/wl_pci.c | 2 +- drivers/staging/wlags49_h2/wl_profile.c | 2 +- drivers/staging/wlags49_h2/wl_sysfs.c | 4 +- drivers/staging/wlan-ng/p80211conv.c | 45 +- drivers/staging/wlan-ng/p80211conv.h | 6 +- drivers/staging/wlan-ng/p80211netdev.c | 6 +- drivers/staging/wlan-ng/p80211netdev.h | 10 +- drivers/staging/wlan-ng/p80211types.h | 4 +- drivers/staging/wlan-ng/prism2mgmt.c | 26 +- drivers/staging/xgifb/XGI_main_26.c | 9 +- drivers/staging/zram/xvmalloc.c | 6 +- drivers/staging/zram/zram_drv.c | 3 +- drivers/usb/serial/option.c | 1 - include/linux/rar_register.h | 16 + 563 files changed, 51120 insertions(+), 32253 deletions(-) delete mode 100644 drivers/staging/adis16255/Kconfig delete mode 100644 drivers/staging/adis16255/Makefile delete mode 100644 drivers/staging/adis16255/adis16255.c delete mode 100644 drivers/staging/adis16255/adis16255.h delete mode 100644 drivers/staging/batman-adv/Kconfig delete mode 100644 drivers/staging/batman-adv/Makefile delete mode 100644 drivers/staging/batman-adv/README delete mode 100644 drivers/staging/batman-adv/TODO delete mode 100644 drivers/staging/batman-adv/aggregation.c delete mode 100644 drivers/staging/batman-adv/aggregation.h delete mode 100644 drivers/staging/batman-adv/bat_debugfs.c delete mode 100644 drivers/staging/batman-adv/bat_debugfs.h delete mode 100644 drivers/staging/batman-adv/bat_sysfs.c delete mode 100644 drivers/staging/batman-adv/bat_sysfs.h delete mode 100644 drivers/staging/batman-adv/bitarray.c delete mode 100644 drivers/staging/batman-adv/bitarray.h delete mode 100644 drivers/staging/batman-adv/hard-interface.c delete mode 100644 drivers/staging/batman-adv/hard-interface.h delete mode 100644 drivers/staging/batman-adv/hash.c delete mode 100644 drivers/staging/batman-adv/hash.h delete mode 100644 drivers/staging/batman-adv/icmp_socket.c delete mode 100644 drivers/staging/batman-adv/icmp_socket.h delete mode 100644 drivers/staging/batman-adv/main.c delete mode 100644 drivers/staging/batman-adv/main.h delete mode 100644 drivers/staging/batman-adv/originator.c delete mode 100644 drivers/staging/batman-adv/originator.h delete mode 100644 drivers/staging/batman-adv/packet.h delete mode 100644 drivers/staging/batman-adv/ring_buffer.c delete mode 100644 drivers/staging/batman-adv/ring_buffer.h delete mode 100644 drivers/staging/batman-adv/routing.c delete mode 100644 drivers/staging/batman-adv/routing.h delete mode 100644 drivers/staging/batman-adv/send.c delete mode 100644 drivers/staging/batman-adv/send.h delete mode 100644 drivers/staging/batman-adv/soft-interface.c delete mode 100644 drivers/staging/batman-adv/soft-interface.h delete mode 100644 drivers/staging/batman-adv/sysfs-class-net-batman-adv delete mode 100644 drivers/staging/batman-adv/sysfs-class-net-mesh delete mode 100644 drivers/staging/batman-adv/translation-table.c delete mode 100644 drivers/staging/batman-adv/translation-table.h delete mode 100644 drivers/staging/batman-adv/types.h delete mode 100644 drivers/staging/batman-adv/unicast.c delete mode 100644 drivers/staging/batman-adv/unicast.h delete mode 100644 drivers/staging/batman-adv/vis.c delete mode 100644 drivers/staging/batman-adv/vis.h delete mode 100644 drivers/staging/bcm/Arp.c delete mode 100644 drivers/staging/bcm/Debug.c delete mode 100644 drivers/staging/bcm/HostMibs.h delete mode 100644 drivers/staging/bcm/Interfacemain.h delete mode 100644 drivers/staging/bcm/Osal_Misc.c delete mode 100644 drivers/staging/bcm/osal_misc.h delete mode 100644 drivers/staging/brcm80211/include/bcm_rpc.h delete mode 100644 drivers/staging/brcm80211/include/bcm_rpc_tp.h delete mode 100644 drivers/staging/brcm80211/include/bcm_xdr.h delete mode 100644 drivers/staging/brcm80211/include/dbus.h delete mode 100644 drivers/staging/brcm80211/include/epivers.h delete mode 100644 drivers/staging/brcm80211/include/linux_osl.h delete mode 100644 drivers/staging/brcm80211/include/linuxver.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpc.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpctx.h create mode 100644 drivers/staging/cptm1217/Kconfig create mode 100644 drivers/staging/cptm1217/Makefile create mode 100644 drivers/staging/cptm1217/TODO create mode 100644 drivers/staging/cptm1217/clearpad_tm1217.c create mode 100644 drivers/staging/cptm1217/cp_tm1217.h rename drivers/staging/ft1000/ft1000-usb/{ft1000_chdev.c => ft1000_debug.c} (61%) delete mode 100644 drivers/staging/hv/vmbus.c create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-dds create mode 100644 drivers/staging/iio/accel/adis16201.h create mode 100644 drivers/staging/iio/accel/adis16201_core.c create mode 100644 drivers/staging/iio/accel/adis16201_ring.c create mode 100644 drivers/staging/iio/accel/adis16201_trigger.c create mode 100644 drivers/staging/iio/accel/adis16203.h create mode 100644 drivers/staging/iio/accel/adis16203_core.c create mode 100644 drivers/staging/iio/accel/adis16203_ring.c create mode 100644 drivers/staging/iio/accel/adis16203_trigger.c create mode 100644 drivers/staging/iio/accel/adis16204.h create mode 100644 drivers/staging/iio/accel/adis16204_core.c create mode 100644 drivers/staging/iio/accel/adis16204_ring.c create mode 100644 drivers/staging/iio/accel/adis16204_trigger.c create mode 100644 drivers/staging/iio/adc/ad7150.c create mode 100644 drivers/staging/iio/adc/ad7152.c create mode 100644 drivers/staging/iio/adc/ad7291.c create mode 100644 drivers/staging/iio/adc/ad7298.c create mode 100644 drivers/staging/iio/adc/ad7314.c create mode 100644 drivers/staging/iio/adc/ad7745.c create mode 100644 drivers/staging/iio/adc/ad7816.c create mode 100644 drivers/staging/iio/adc/ad7887.h create mode 100644 drivers/staging/iio/adc/ad7887_core.c create mode 100644 drivers/staging/iio/adc/ad7887_ring.c create mode 100644 drivers/staging/iio/adc/adt7310.c create mode 100644 drivers/staging/iio/adc/adt7410.c create mode 100644 drivers/staging/iio/adc/adt75.c create mode 100644 drivers/staging/iio/addac/Kconfig create mode 100644 drivers/staging/iio/addac/Makefile create mode 100644 drivers/staging/iio/addac/adt7316-i2c.c create mode 100644 drivers/staging/iio/addac/adt7316-spi.c create mode 100644 drivers/staging/iio/addac/adt7316.c create mode 100644 drivers/staging/iio/addac/adt7316.h create mode 100644 drivers/staging/iio/dac/Kconfig create mode 100644 drivers/staging/iio/dac/Makefile create mode 100644 drivers/staging/iio/dac/ad5446.c create mode 100644 drivers/staging/iio/dac/ad5446.h create mode 100644 drivers/staging/iio/dac/ad5624r.h create mode 100644 drivers/staging/iio/dac/ad5624r_spi.c create mode 100644 drivers/staging/iio/dac/dac.h create mode 100644 drivers/staging/iio/dds/Kconfig create mode 100644 drivers/staging/iio/dds/Makefile create mode 100644 drivers/staging/iio/dds/ad5930.c create mode 100644 drivers/staging/iio/dds/ad9832.c create mode 100644 drivers/staging/iio/dds/ad9834.c create mode 100644 drivers/staging/iio/dds/ad9834.h create mode 100644 drivers/staging/iio/dds/ad9850.c create mode 100644 drivers/staging/iio/dds/ad9852.c create mode 100644 drivers/staging/iio/dds/ad9910.c create mode 100644 drivers/staging/iio/dds/ad9951.c create mode 100644 drivers/staging/iio/dds/dds.h create mode 100644 drivers/staging/iio/gyro/adis16060.h create mode 100644 drivers/staging/iio/gyro/adis16060_core.c create mode 100644 drivers/staging/iio/gyro/adis16080.h create mode 100644 drivers/staging/iio/gyro/adis16080_core.c create mode 100644 drivers/staging/iio/gyro/adis16130.h create mode 100644 drivers/staging/iio/gyro/adis16130_core.c create mode 100644 drivers/staging/iio/gyro/adis16251.h create mode 100644 drivers/staging/iio/gyro/adis16251_core.c create mode 100644 drivers/staging/iio/gyro/adis16260_platform_data.h create mode 100644 drivers/staging/iio/meter/Kconfig create mode 100644 drivers/staging/iio/meter/Makefile create mode 100644 drivers/staging/iio/meter/ade7753.c create mode 100644 drivers/staging/iio/meter/ade7753.h create mode 100644 drivers/staging/iio/meter/ade7754.c create mode 100644 drivers/staging/iio/meter/ade7754.h create mode 100644 drivers/staging/iio/meter/ade7758.h create mode 100644 drivers/staging/iio/meter/ade7758_core.c create mode 100644 drivers/staging/iio/meter/ade7758_ring.c create mode 100644 drivers/staging/iio/meter/ade7758_trigger.c create mode 100644 drivers/staging/iio/meter/ade7759.c create mode 100644 drivers/staging/iio/meter/ade7759.h create mode 100644 drivers/staging/iio/meter/ade7854-i2c.c create mode 100644 drivers/staging/iio/meter/ade7854-spi.c create mode 100644 drivers/staging/iio/meter/ade7854.c create mode 100644 drivers/staging/iio/meter/ade7854.h create mode 100644 drivers/staging/iio/meter/meter.h create mode 100644 drivers/staging/iio/resolver/Kconfig create mode 100644 drivers/staging/iio/resolver/Makefile create mode 100644 drivers/staging/iio/resolver/ad2s120x.c create mode 100644 drivers/staging/iio/resolver/ad2s1210.c create mode 100644 drivers/staging/iio/resolver/ad2s90.c 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/ste_rmi4/Kconfig create mode 100644 drivers/staging/ste_rmi4/Makefile create mode 100644 drivers/staging/ste_rmi4/TODO create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h create mode 100644 drivers/staging/vme/bridges/Module.symvers delete mode 100644 drivers/staging/winbond/mlmetxrx.c delete mode 100644 drivers/staging/winbond/mlmetxrx_f.h delete mode 100644 drivers/staging/winbond/sysdef.h rename drivers/staging/winbond/{wbhal_s.h => wbhal.h} (98%) delete mode 100644 drivers/staging/winbond/wbhal_f.h delete mode 100644 drivers/staging/winbond/wblinux_f.h delete mode 100644 drivers/staging/winbond/wbusb_s.h Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging bkl-trivial/trivial $ git merge bkl-trivial/trivial Already up-to-date. Merging bkl-llseek/llseek $ git merge bkl-llseek/llseek Already up-to-date. Merging bkl-vfs/vfs $ git merge bkl-vfs/vfs Already up-to-date. Merging bkl-config/config $ git merge bkl-config/config Resolved 'arch/powerpc/kernel/setup_64.c' using previous resolution. Resolved 'include/linux/hardirq.h' using previous resolution. Resolved 'include/linux/smp_lock.h' using previous resolution. Auto-merging arch/powerpc/kernel/setup_64.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c Auto-merging arch/tile/kernel/compat.c Auto-merging arch/tile/kernel/compat_signal.c Auto-merging arch/tile/kernel/signal.c Auto-merging block/compat_ioctl.c Auto-merging block/ioctl.c Auto-merging drivers/block/drbd/drbd_receiver.c Auto-merging drivers/block/drbd/drbd_worker.c Auto-merging drivers/char/agp/frontend.c Auto-merging drivers/char/amiserial.c Auto-merging drivers/char/specialix.c Auto-merging drivers/hid/hidraw.c Auto-merging drivers/hid/usbhid/hiddev.c Auto-merging drivers/input/input.c Auto-merging drivers/media/dvb/ngene/ngene-core.c Auto-merging drivers/media/video/bt8xx/bttv-driver.c Auto-merging drivers/media/video/cx88/cx88-blackbird.c Auto-merging drivers/media/video/cx88/cx88-video.c Auto-merging drivers/media/video/pwc/pwc-if.c Auto-merging drivers/media/video/s2255drv.c Auto-merging drivers/media/video/saa7134/saa7134-empress.c Auto-merging drivers/media/video/saa7164/saa7164.h Auto-merging drivers/media/video/usbvision/usbvision-video.c Auto-merging drivers/media/video/v4l2-compat-ioctl32.c Auto-merging drivers/pci/proc.c Auto-merging drivers/s390/block/dasd_eer.c Auto-merging drivers/s390/char/vmlogrdr.c Auto-merging drivers/s390/char/vmur.c Auto-merging drivers/s390/crypto/zcrypt_api.c Auto-merging drivers/scsi/hpsa.c Auto-merging drivers/scsi/sd.c Auto-merging drivers/serial/serial_core.c Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/cx25821/cx25821.h Auto-merging drivers/staging/easycap/easycap.h Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c Auto-merging drivers/staging/rtl8712/osdep_service.h CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree. Auto-merging drivers/usb/core/devio.c Auto-merging drivers/usb/core/inode.c Auto-merging drivers/usb/gadget/f_fs.c Auto-merging drivers/usb/host/isp1362-hcd.c Auto-merging drivers/usb/mon/mon_bin.c Auto-merging drivers/usb/serial/usb-serial.c Auto-merging drivers/xen/xenfs/privcmd.c Auto-merging fs/block_dev.c Auto-merging fs/ceph/inode.c Auto-merging fs/ceph/mds_client.c Auto-merging fs/compat_ioctl.c Auto-merging fs/ecryptfs/super.c Auto-merging fs/ext3/super.c Auto-merging fs/ioctl.c Auto-merging fs/lockd/clntlock.c Auto-merging fs/lockd/clntproc.c Auto-merging fs/lockd/svc4proc.c Auto-merging fs/lockd/svclock.c Auto-merging fs/lockd/svcproc.c Auto-merging fs/locks.c Auto-merging fs/namespace.c Auto-merging fs/ncpfs/dir.c Auto-merging fs/ncpfs/inode.c Auto-merging fs/nfs/super.c Auto-merging fs/nfsd/nfs4state.c Auto-merging fs/ocfs2/super.c Auto-merging fs/proc/inode.c Auto-merging fs/reiserfs/ioctl.c Auto-merging fs/reiserfs/journal.c Auto-merging fs/reiserfs/super.c Auto-merging include/linux/hardirq.h CONFLICT (content): Merge conflict in include/linux/hardirq.h Auto-merging include/linux/smp_lock.h CONFLICT (content): Merge conflict in include/linux/smp_lock.h Auto-merging include/linux/tty.h Auto-merging init/main.c Auto-merging kernel/trace/trace.c Auto-merging lib/Kconfig.debug Auto-merging net/irda/af_irda.c Auto-merging net/sunrpc/svc_xprt.c Auto-merging sound/core/pcm_native.c Auto-merging sound/core/sound.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/stradis/Kconfig arch/powerpc/kernel/setup_64.c: needs merge drivers/staging/stradis/Kconfig: needs merge include/linux/hardirq.h: needs merge include/linux/smp_lock.h: needs merge rm 'drivers/staging/stradis/Kconfig' $ git commit -v -a [master 2154711] Merge remote branch 'bkl-config/config' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/Kconfig | 4 ++-- drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- drivers/gpu/drm/i810/i810_drv.c | 6 +++++- drivers/staging/Kconfig | 11 +++++++++++ drivers/staging/cx25821/cx25821.h | 1 - include/linux/smp_lock.h | 15 ++------------- lib/Kconfig.debug | 9 --------- 7 files changed, 21 insertions(+), 43 deletions(-) Merging irqflags/master $ git merge irqflags/master Already up-to-date. Merging cleancache/linux-next $ git merge cleancache/linux-next Resolved 'fs/ocfs2/super.c' using previous resolution. Resolved 'fs/super.c' using previous resolution. Resolved 'include/linux/fs.h' using previous resolution. Resolved 'mm/Kconfig' using previous resolution. Auto-merging arch/x86/include/asm/xen/hypercall.h Auto-merging drivers/xen/Makefile Auto-merging fs/btrfs/extent_io.c Auto-merging fs/btrfs/super.c Auto-merging fs/buffer.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c Auto-merging fs/ocfs2/super.c CONFLICT (content): Merge conflict in fs/ocfs2/super.c Auto-merging fs/super.c CONFLICT (content): Merge conflict in fs/super.c Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging mm/Kconfig CONFLICT (content): Merge conflict in mm/Kconfig Auto-merging mm/Makefile Auto-merging mm/filemap.c Auto-merging mm/truncate.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 07f2c12] Merge remote branch 'cleancache/linux-next' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ arch/x86/include/asm/xen/hypercall.h | 7 + drivers/xen/Makefile | 1 + drivers/xen/tmem.c | 264 +++++++++++++++++++ fs/btrfs/extent_io.c | 9 + fs/btrfs/super.c | 2 + fs/buffer.c | 5 + fs/ext3/super.c | 2 + fs/ext4/super.c | 2 + fs/mpage.c | 7 + fs/ocfs2/super.c | 2 + fs/super.c | 3 + include/linux/cleancache.h | 118 +++++++++ include/linux/fs.h | 5 + include/xen/interface/xen.h | 22 ++ mm/Kconfig | 22 ++ mm/Makefile | 1 + mm/cleancache.c | 245 ++++++++++++++++++ mm/filemap.c | 11 + mm/truncate.c | 10 + 21 files changed, 1016 insertions(+), 0 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache create mode 100644 Documentation/vm/cleancache.txt create mode 100644 drivers/xen/tmem.c create mode 100644 include/linux/cleancache.h create mode 100644 mm/cleancache.c Merging scsi-post-merge/merge-base:master $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master From ../next * [new branch] scsi-post-merge/master -> scsi-post-merge/master $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base From ../next * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base $ git checkout scsi-post-merge/master Switched to branch 'scsi-post-merge/master' $ git rebase --onto master scsi-post-merge/merge-base First, rewinding head to replay your work on top of it... Applying: [SCSI] target: Add LIO target core v4.0.0-rc6 Applying: [SCSI] sd: implement sd_check_events() $ cd ../next $ git pull -f ../rebase-tmp scsi-post-merge/master From ../rebase-tmp * branch scsi-post-merge/master -> FETCH_HEAD Updating 07f2c12..6efc571 Fast-forward Documentation/target/tcm_mod_builder.py | 1094 +++++ Documentation/target/tcm_mod_builder.txt | 145 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/scsi/sd.c | 104 +- drivers/scsi/sd.h | 1 - drivers/target/Kconfig | 31 + drivers/target/Makefile | 24 + drivers/target/target_core_alua.c | 1991 +++++++++ drivers/target/target_core_alua.h | 126 + drivers/target/target_core_cdb.c | 1131 +++++ drivers/target/target_core_configfs.c | 3231 ++++++++++++++ drivers/target/target_core_device.c | 1694 +++++++ drivers/target/target_core_fabric_configfs.c | 1001 +++++ drivers/target/target_core_fabric_lib.c | 451 ++ drivers/target/target_core_file.c | 688 +++ drivers/target/target_core_file.h | 50 + drivers/target/target_core_hba.c | 185 + drivers/target/target_core_hba.h | 7 + drivers/target/target_core_iblock.c | 808 ++++ drivers/target/target_core_iblock.h | 40 + drivers/target/target_core_mib.c | 1078 +++++ drivers/target/target_core_mib.h | 28 + drivers/target/target_core_pr.c | 4251 ++++++++++++++++++ drivers/target/target_core_pr.h | 67 + drivers/target/target_core_pscsi.c | 1470 ++++++ drivers/target/target_core_pscsi.h | 65 + drivers/target/target_core_rd.c | 1091 +++++ drivers/target/target_core_rd.h | 73 + drivers/target/target_core_scdb.c | 105 + drivers/target/target_core_scdb.h | 10 + drivers/target/target_core_tmr.c | 395 ++ drivers/target/target_core_tpg.c | 826 ++++ drivers/target/target_core_transport.c | 6133 ++++++++++++++++++++++++++ drivers/target/target_core_ua.c | 332 ++ drivers/target/target_core_ua.h | 36 + include/target/configfs_macros.h | 147 + include/target/target_core_base.h | 936 ++++ include/target/target_core_configfs.h | 52 + include/target/target_core_device.h | 61 + include/target/target_core_fabric_configfs.h | 106 + include/target/target_core_fabric_lib.h | 28 + include/target/target_core_fabric_ops.h | 100 + include/target/target_core_tmr.h | 43 + include/target/target_core_tpg.h | 35 + include/target/target_core_transport.h | 350 ++ 46 files changed, 30571 insertions(+), 52 deletions(-) create mode 100755 Documentation/target/tcm_mod_builder.py create mode 100644 Documentation/target/tcm_mod_builder.txt create mode 100644 drivers/target/Kconfig create mode 100644 drivers/target/Makefile create mode 100644 drivers/target/target_core_alua.c create mode 100644 drivers/target/target_core_alua.h create mode 100644 drivers/target/target_core_cdb.c create mode 100644 drivers/target/target_core_configfs.c create mode 100644 drivers/target/target_core_device.c create mode 100644 drivers/target/target_core_fabric_configfs.c create mode 100644 drivers/target/target_core_fabric_lib.c create mode 100644 drivers/target/target_core_file.c create mode 100644 drivers/target/target_core_file.h create mode 100644 drivers/target/target_core_hba.c create mode 100644 drivers/target/target_core_hba.h create mode 100644 drivers/target/target_core_iblock.c create mode 100644 drivers/target/target_core_iblock.h create mode 100644 drivers/target/target_core_mib.c create mode 100644 drivers/target/target_core_mib.h create mode 100644 drivers/target/target_core_pr.c create mode 100644 drivers/target/target_core_pr.h create mode 100644 drivers/target/target_core_pscsi.c create mode 100644 drivers/target/target_core_pscsi.h create mode 100644 drivers/target/target_core_rd.c create mode 100644 drivers/target/target_core_rd.h create mode 100644 drivers/target/target_core_scdb.c create mode 100644 drivers/target/target_core_scdb.h create mode 100644 drivers/target/target_core_tmr.c create mode 100644 drivers/target/target_core_tpg.c create mode 100644 drivers/target/target_core_transport.c create mode 100644 drivers/target/target_core_ua.c create mode 100644 drivers/target/target_core_ua.h create mode 100644 include/target/configfs_macros.h create mode 100644 include/target/target_core_base.h create mode 100644 include/target/target_core_configfs.h create mode 100644 include/target/target_core_device.h create mode 100644 include/target/target_core_fabric_configfs.h create mode 100644 include/target/target_core_fabric_lib.h create mode 100644 include/target/target_core_fabric_ops.h create mode 100644 include/target/target_core_tmr.h create mode 100644 include/target/target_core_tpg.h create mode 100644 include/target/target_core_transport.h $ rm -r ../rebase-tmp rm: remove write-protected regular file `../rebase-tmp/.git/objects/a1/15350a517f0c46cd9ce13098be58c1e4271487'? rm: remove write-protected regular file `../rebase-tmp/.git/objects/34/b5805aa88bdee097143803437d0c09c1484f06'? rm: remove write-protected regular file `../rebase-tmp/.git/objects/d2/9d3391af9407495775d5c730c3027768f34bb9'? rm: remove write-protected regular file `../rebase-tmp/.git/objects/6e/fc571bbdba5e3e4755576fa3ae96390983119d'? rm: remove write-protected regular file `../rebase-tmp/.git/objects/14/b48637ec6a832e901ced219551cad91acf3f64'? rm: remove write-protected regular file `../rebase-tmp/.git/objects/7b/58e8623ff34292d2070fdefaa7b31bcbebbb9e'? rm: remove write-protected regular file `../rebase-tmp/.git/objects/70/92fae96405356ddb0861f5ae3ede5b1f56ea38'? rm: remove write-protected regular file `../rebase-tmp/.git/objects/7e/2183adb3b756f4f45304fbee43ae8b281f3f23'? $ git revert 1967733650dac41c93954a187246c91430c4a94f Automatic revert failed. After resolving the conflicts, mark the corrected paths with 'git add ' or 'git rm ' and commit the result. Resolved 'drivers/input/keyboard/Kconfig' using previous resolution. $ git commit -v -a [master eb46944] Revert "input/tc3589x: add tc3589x keypad support" 5 files changed, 1 insertions(+), 563 deletions(-) delete mode 100644 drivers/input/keyboard/tc3589x-keypad.c