--- /dev/null
+$ date
+Fri Oct 7 10:45:13 EST 2011
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 538d288 Merge branch 'for-linus' of git://github.com/dtor/input
+Merging origin/master
+$ git merge origin/master
+Updating 538d288..3ee72ca
+Fast-forward
+ Documentation/networking/scaling.txt | 10 +++++-----
+ arch/x86/pci/acpi.c | 11 +++++++++++
+ drivers/md/dm-crypt.c | 2 ++
+ drivers/md/dm-flakey.c | 4 +++-
+ drivers/md/dm-raid.c | 2 +-
+ drivers/md/dm-table.c | 32 ++++++++++++++++++++++++++------
+ drivers/md/md.c | 22 +++++++++++++++++++---
+ drivers/md/md.h | 2 +-
+ drivers/md/multipath.c | 3 +--
+ drivers/md/raid1.c | 3 +--
+ drivers/md/raid10.c | 5 ++---
+ drivers/md/raid5.c | 6 ++----
+ drivers/net/macvlan.c | 2 +-
+ include/linux/device-mapper.h | 5 +++++
+ net/bridge/br_device.c | 3 ---
+ net/ipv4/tcp_input.c | 4 +---
+ net/ipv4/tcp_ipv4.c | 11 +++++++----
+ net/ipv6/tcp_ipv6.c | 8 +++++---
+ net/netfilter/ipvs/ip_vs_ctl.c | 2 +-
+ 19 files changed, 94 insertions(+), 43 deletions(-)
+Merging fixes/fixes
+$ git merge fixes/fixes
+Already up-to-date.
+Merging kbuild-current/rc-fixes
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes
+$ git merge arm-current/fixes
+Merge made by recursive.
+ arch/arm/configs/integrator_defconfig | 19 +++++++++++++++----
+ arch/arm/mm/init.c | 7 +++++++
+ 2 files changed, 22 insertions(+), 4 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 52xx-and-virtex-current/powerpc/merge
+$ git merge 52xx-and-virtex-current/powerpc/merge
+Already up-to-date.
+Merging sparc-current/master
+$ git merge sparc-current/master
+Already up-to-date.
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+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/shpchp_core.c | 4 ++--
+ drivers/pci/hotplug/shpchp_hpc.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging wireless-current/master
+$ git merge wireless-current/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Already up-to-date.
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+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 devicetree-current/devicetree/merge
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging spi-current/spi/merge
+$ git merge spi-current/spi/merge
+Already up-to-date.
+Merging arm/for-next
+$ git merge arm/for-next
+Removing arch/arm/include/asm/auxvec.h
+Removing arch/arm/include/asm/bitsperlong.h
+Removing arch/arm/include/asm/cputime.h
+Removing arch/arm/include/asm/emergency-restart.h
+Removing arch/arm/include/asm/errno.h
+Removing arch/arm/include/asm/ioctl.h
+Removing arch/arm/include/asm/irq_regs.h
+Removing arch/arm/include/asm/kdebug.h
+Removing arch/arm/include/asm/local.h
+Removing arch/arm/include/asm/local64.h
+Removing arch/arm/include/asm/percpu.h
+Removing arch/arm/include/asm/poll.h
+Removing arch/arm/include/asm/resource.h
+Removing arch/arm/include/asm/sections.h
+Removing arch/arm/include/asm/siginfo.h
+Removing arch/arm/include/asm/sizes.h
+Auto-merging arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h
+Auto-merging arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
+Removing arch/arm/mach-sa1100/leds-simpad.c
+Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+Auto-merging drivers/gpio/gpio-davinci.c
+Auto-merging drivers/gpio/gpio-ks8695.c
+Auto-merging drivers/gpio/gpio-lpc32xx.c
+Auto-merging drivers/gpio/gpio-sa1100.c
+Merge made by recursive.
+ Documentation/devicetree/bindings/arm/l2cc.txt | 44 +
+ arch/arm/Kconfig | 79 +-
+ arch/arm/Kconfig.debug | 87 +-
+ arch/arm/Makefile | 3 +
+ arch/arm/boot/Makefile | 9 +
+ arch/arm/boot/compressed/.gitignore | 9 +
+ arch/arm/boot/compressed/Makefile | 40 +-
+ arch/arm/boot/compressed/atags_to_fdt.c | 97 ++
+ arch/arm/boot/compressed/head.S | 121 ++-
+ arch/arm/boot/compressed/libfdt_env.h | 15 +
+ arch/arm/boot/compressed/misc.c | 42 +-
+ arch/arm/boot/compressed/string.c | 127 ++
+ arch/arm/boot/compressed/vmlinux.lds.in | 4 +
+ arch/arm/common/gic.c | 205 +++-
+ arch/arm/common/sa1111.c | 9 +-
+ arch/arm/common/scoop.c | 2 +-
+ arch/arm/common/timer-sp.c | 9 +
+ arch/arm/include/asm/Kbuild | 17 +
+ arch/arm/include/asm/auxvec.h | 4 -
+ arch/arm/include/asm/bitsperlong.h | 1 -
+ arch/arm/include/asm/bug.h | 55 +-
+ arch/arm/include/asm/cachetype.h | 5 +-
+ arch/arm/include/asm/cputime.h | 6 -
+ arch/arm/include/asm/cputype.h | 6 +
+ arch/arm/include/asm/dma-mapping.h | 9 +-
+ arch/arm/include/asm/ecard.h | 1 -
+ arch/arm/include/asm/emergency-restart.h | 6 -
+ arch/arm/include/asm/errno.h | 6 -
+ arch/arm/include/asm/gpio.h | 19 +
+ arch/arm/include/asm/hardware/cache-l2x0.h | 17 +
+ arch/arm/include/asm/hardware/gic.h | 8 +
+ arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 +
+ arch/arm/include/asm/hw_breakpoint.h | 2 +
+ arch/arm/include/asm/io.h | 21 +
+ arch/arm/include/asm/ioctl.h | 1 -
+ arch/arm/include/asm/irq_regs.h | 1 -
+ arch/arm/include/asm/kdebug.h | 1 -
+ arch/arm/include/asm/local.h | 1 -
+ arch/arm/include/asm/local64.h | 1 -
+ arch/arm/include/asm/mach/arch.h | 5 +-
+ arch/arm/include/asm/mach/map.h | 1 +
+ arch/arm/include/asm/memory.h | 16 -
+ arch/arm/include/asm/module.h | 4 -
+ arch/arm/include/asm/page.h | 42 +-
+ arch/arm/include/asm/percpu.h | 6 -
+ arch/arm/include/asm/pgalloc.h | 6 +-
+ arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++
+ arch/arm/include/asm/pgtable-2level-types.h | 67 +
+ arch/arm/include/asm/pgtable-2level.h | 143 ++
+ arch/arm/include/asm/pgtable-hwdef.h | 77 +-
+ arch/arm/include/asm/pgtable.h | 167 +--
+ arch/arm/include/asm/pmu.h | 93 +-
+ arch/arm/include/asm/poll.h | 1 -
+ arch/arm/include/asm/proc-fns.h | 8 +
+ arch/arm/include/asm/resource.h | 6 -
+ arch/arm/include/asm/sections.h | 1 -
+ arch/arm/include/asm/siginfo.h | 6 -
+ arch/arm/include/asm/sizes.h | 21 -
+ arch/arm/include/asm/smp.h | 6 +
+ arch/arm/include/asm/suspend.h | 17 +-
+ arch/arm/include/asm/system.h | 4 +-
+ arch/arm/include/asm/tlb.h | 1 +
+ arch/arm/include/asm/tlbflush.h | 4 +-
+ arch/arm/include/asm/topology.h | 33 +
+ arch/arm/kernel/Makefile | 10 +-
+ arch/arm/kernel/armksyms.c | 3 -
+ arch/arm/kernel/ecard.c | 36 +-
+ arch/arm/kernel/entry-armv.S | 44 +-
+ arch/arm/kernel/head.S | 135 +-
+ arch/arm/kernel/hw_breakpoint.c | 270 ++--
+ arch/arm/kernel/kprobes-arm.c | 4 +
+ arch/arm/kernel/kprobes-test-arm.c | 1323 +++++++++++++++
+ arch/arm/kernel/kprobes-test-thumb.c | 1187 +++++++++++++
+ arch/arm/kernel/kprobes-test.c | 1748 ++++++++++++++++++++
+ arch/arm/kernel/kprobes-test.h | 392 +++++
+ arch/arm/kernel/kprobes-thumb.c | 7 +
+ arch/arm/kernel/kprobes.h | 8 +
+ arch/arm/kernel/machine_kexec.c | 35 +-
+ arch/arm/kernel/module.c | 2 +-
+ arch/arm/kernel/perf_event.c | 475 +++---
+ arch/arm/kernel/perf_event_v6.c | 87 +-
+ arch/arm/kernel/perf_event_v7.c | 395 +++---
+ arch/arm/kernel/perf_event_xscale.c | 90 +-
+ arch/arm/kernel/pmu.c | 182 +--
+ arch/arm/kernel/process.c | 2 +-
+ arch/arm/kernel/setup.c | 58 +-
+ arch/arm/kernel/sleep.S | 85 +-
+ arch/arm/kernel/smp.c | 20 +
+ arch/arm/kernel/smp_scu.c | 2 +-
+ arch/arm/kernel/suspend.c | 72 +
+ arch/arm/kernel/topology.c | 148 ++
+ arch/arm/kernel/traps.c | 31 +-
+ arch/arm/kernel/vmlinux.lds.S | 3 +-
+ arch/arm/lib/backtrace.S | 6 -
+ arch/arm/mach-at91/Makefile.boot | 6 +-
+ arch/arm/mach-at91/at91cap9_devices.c | 2 +-
+ arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45.c | 2 +
+ arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
+ arch/arm/mach-at91/board-1arm.c | 2 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c | 2 +-
+ arch/arm/mach-at91/board-cam60.c | 2 +-
+ arch/arm/mach-at91/board-cap9adk.c | 2 +-
+ arch/arm/mach-at91/board-carmeva.c | 2 +-
+ arch/arm/mach-at91/board-cpu9krea.c | 2 +-
+ arch/arm/mach-at91/board-cpuat91.c | 2 +-
+ arch/arm/mach-at91/board-csb337.c | 2 +-
+ arch/arm/mach-at91/board-csb637.c | 2 +-
+ arch/arm/mach-at91/board-eb9200.c | 2 +-
+ arch/arm/mach-at91/board-ecbat91.c | 2 +-
+ arch/arm/mach-at91/board-kafa.c | 2 +-
+ arch/arm/mach-at91/board-kb9202.c | 2 +-
+ arch/arm/mach-at91/board-neocore926.c | 2 +-
+ arch/arm/mach-at91/board-picotux200.c | 2 +-
+ arch/arm/mach-at91/board-qil-a9260.c | 2 +-
+ arch/arm/mach-at91/board-rm9200dk.c | 2 +-
+ arch/arm/mach-at91/board-rm9200ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9-l9260.c | 2 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9g20ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 2 +-
+ arch/arm/mach-at91/board-usb-a9260.c | 2 +-
+ arch/arm/mach-at91/board-usb-a9263.c | 2 +-
+ arch/arm/mach-at91/board-yl-9200.c | 2 +-
+ arch/arm/mach-at91/gpio.c | 4 +-
+ arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 -
+ arch/arm/mach-at91/include/mach/gpio.h | 5 -
+ arch/arm/mach-at91/leds.c | 2 +-
+ arch/arm/mach-at91/pm.c | 2 +-
+ arch/arm/mach-bcmring/Makefile.boot | 2 +-
+ arch/arm/mach-bcmring/arch.c | 4 +-
+ arch/arm/mach-bcmring/include/mach/memory.h | 5 -
+ arch/arm/mach-bcmring/mm.c | 3 +
+ arch/arm/mach-clps711x/Makefile.boot | 2 +-
+ arch/arm/mach-clps711x/autcpu12.c | 2 +-
+ arch/arm/mach-clps711x/cdb89712.c | 2 +-
+ arch/arm/mach-clps711x/ceiva.c | 2 +-
+ arch/arm/mach-clps711x/clep7312.c | 5 +-
+ arch/arm/mach-clps711x/edb7211-arch.c | 5 +-
+ arch/arm/mach-clps711x/fortunet.c | 4 +-
+ arch/arm/mach-clps711x/p720t.c | 5 +-
+ arch/arm/mach-cns3xxx/Makefile.boot | 2 +-
+ arch/arm/mach-cns3xxx/cns3420vb.c | 2 +-
+ arch/arm/mach-davinci/Makefile | 3 +-
+ arch/arm/mach-davinci/Makefile.boot | 4 +-
+ arch/arm/mach-davinci/board-da830-evm.c | 2 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 4 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 2 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
+ arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +-
+ arch/arm/mach-davinci/board-sffsdr.c | 2 +-
+ arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
+ arch/arm/mach-davinci/common.c | 3 +
+ arch/arm/mach-davinci/da830.c | 3 +-
+ arch/arm/mach-davinci/da850.c | 3 +-
+ arch/arm/mach-davinci/dm355.c | 2 +-
+ arch/arm/mach-davinci/dm365.c | 3 +-
+ arch/arm/mach-davinci/dm644x.c | 2 +-
+ arch/arm/mach-davinci/dm646x.c | 2 +-
+ arch/arm/mach-davinci/include/mach/gpio-davinci.h | 91 +
+ arch/arm/mach-davinci/include/mach/gpio.h | 79 +-
+ arch/arm/mach-davinci/include/mach/memory.h | 5 -
+ arch/arm/mach-davinci/tnetv107x.c | 3 +-
+ arch/arm/mach-dove/Makefile.boot | 2 +-
+ arch/arm/mach-dove/cm-a510.c | 2 +-
+ arch/arm/mach-dove/dove-db-setup.c | 2 +-
+ arch/arm/mach-ebsa110/Makefile.boot | 2 +-
+ arch/arm/mach-ebsa110/core.c | 2 +-
+ arch/arm/mach-ebsa110/include/mach/io.h | 2 -
+ arch/arm/mach-ep93xx/Makefile.boot | 10 +-
+ arch/arm/mach-ep93xx/adssphere.c | 2 +-
+ arch/arm/mach-ep93xx/edb93xx.c | 16 +-
+ arch/arm/mach-ep93xx/gesbc9312.c | 2 +-
+ arch/arm/mach-ep93xx/include/mach/gpio.h | 17 +-
+ arch/arm/mach-ep93xx/micro9.c | 8 +-
+ arch/arm/mach-ep93xx/simone.c | 4 +-
+ arch/arm/mach-ep93xx/snappercl15.c | 2 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 2 +-
+ arch/arm/mach-exynos4/Makefile.boot | 2 +-
+ arch/arm/mach-exynos4/include/mach/gpio.h | 7 -
+ arch/arm/mach-exynos4/mach-armlex4210.c | 2 +-
+ arch/arm/mach-exynos4/mach-nuri.c | 2 +-
+ arch/arm/mach-exynos4/mach-smdkc210.c | 2 +-
+ arch/arm/mach-exynos4/mach-smdkv310.c | 2 +-
+ arch/arm/mach-exynos4/mach-universal_c210.c | 2 +-
+ arch/arm/mach-footbridge/Kconfig | 4 +-
+ arch/arm/mach-footbridge/Makefile.boot | 2 +-
+ arch/arm/mach-footbridge/cats-hw.c | 5 +-
+ arch/arm/mach-footbridge/ebsa285.c | 2 +-
+ arch/arm/mach-footbridge/include/mach/io.h | 2 -
+ arch/arm/mach-footbridge/netwinder-hw.c | 5 +-
+ arch/arm/mach-footbridge/personal.c | 2 +-
+ arch/arm/mach-gemini/Makefile.boot | 4 +-
+ arch/arm/mach-gemini/board-nas4220b.c | 2 +-
+ arch/arm/mach-gemini/board-rut1xx.c | 2 +-
+ arch/arm/mach-gemini/board-wbd111.c | 2 +-
+ arch/arm/mach-gemini/board-wbd222.c | 2 +-
+ arch/arm/mach-gemini/include/mach/gpio.h | 5 -
+ arch/arm/mach-h720x/Makefile.boot | 2 +-
+ arch/arm/mach-h720x/h7201-eval.c | 2 +-
+ arch/arm/mach-h720x/h7202-eval.c | 2 +-
+ arch/arm/mach-imx/Makefile.boot | 10 +-
+ arch/arm/mach-imx/iomux-imx31.c | 3 +-
+ arch/arm/mach-imx/mach-armadillo5x0.c | 2 +-
+ arch/arm/mach-imx/mach-cpuimx27.c | 2 +-
+ arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
+ arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 +-
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +-
+ arch/arm/mach-imx/mach-imx27ipcam.c | 2 +-
+ arch/arm/mach-imx/mach-imx27lite.c | 2 +-
+ arch/arm/mach-imx/mach-kzm_arm11_01.c | 2 +-
+ arch/arm/mach-imx/mach-mx1ads.c | 4 +-
+ arch/arm/mach-imx/mach-mx21ads.c | 2 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-mx27ads.c | 5 +-
+ arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-mx31ads.c | 2 +-
+ arch/arm/mach-imx/mach-mx31lilly.c | 2 +-
+ arch/arm/mach-imx/mach-mx31lite.c | 2 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
+ arch/arm/mach-imx/mach-mx35_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-mxt_td60.c | 2 +-
+ arch/arm/mach-imx/mach-pca100.c | 2 +-
+ arch/arm/mach-imx/mach-pcm037.c | 2 +-
+ arch/arm/mach-imx/mach-pcm038.c | 2 +-
+ arch/arm/mach-imx/mach-pcm043.c | 2 +-
+ arch/arm/mach-imx/mach-qong.c | 2 +-
+ arch/arm/mach-imx/mach-scb9328.c | 2 +-
+ arch/arm/mach-integrator/Makefile.boot | 2 +-
+ arch/arm/mach-integrator/core.c | 4 +
+ arch/arm/mach-integrator/include/mach/io.h | 2 -
+ arch/arm/mach-integrator/include/mach/platform.h | 12 -
+ arch/arm/mach-integrator/integrator_ap.c | 88 +-
+ arch/arm/mach-integrator/integrator_cp.c | 2 +-
+ arch/arm/mach-iop13xx/Makefile.boot | 2 +-
+ arch/arm/mach-iop13xx/iq81340mc.c | 2 +-
+ arch/arm/mach-iop13xx/iq81340sc.c | 2 +-
+ arch/arm/mach-iop32x/Makefile.boot | 2 +-
+ arch/arm/mach-iop32x/em7210.c | 2 +-
+ arch/arm/mach-iop32x/glantank.c | 2 +-
+ arch/arm/mach-iop32x/iq31244.c | 4 +-
+ arch/arm/mach-iop32x/iq80321.c | 2 +-
+ arch/arm/mach-iop32x/n2100.c | 2 +-
+ arch/arm/mach-iop33x/Makefile.boot | 2 +-
+ arch/arm/mach-iop33x/iq80331.c | 2 +-
+ arch/arm/mach-iop33x/iq80332.c | 2 +-
+ arch/arm/mach-ixp2000/Makefile.boot | 2 +-
+ arch/arm/mach-ixp2000/core.c | 4 +-
+ arch/arm/mach-ixp2000/enp2611.c | 2 +-
+ .../include/mach/{gpio.h => gpio-ixp2000.h} | 4 +-
+ arch/arm/mach-ixp2000/ixdp2400.c | 2 +-
+ arch/arm/mach-ixp2000/ixdp2800.c | 2 +-
+ arch/arm/mach-ixp2000/ixdp2x00.c | 4 +-
+ arch/arm/mach-ixp2000/ixdp2x01.c | 6 +-
+ arch/arm/mach-ixp23xx/Makefile.boot | 2 +-
+ arch/arm/mach-ixp23xx/espresso.c | 2 +-
+ arch/arm/mach-ixp23xx/ixdp2351.c | 2 +-
+ arch/arm/mach-ixp23xx/roadrunner.c | 2 +-
+ arch/arm/mach-ixp4xx/Makefile.boot | 2 +-
+ arch/arm/mach-ixp4xx/avila-setup.c | 4 +-
+ arch/arm/mach-ixp4xx/common-pci.c | 3 +-
+ arch/arm/mach-ixp4xx/coyote-setup.c | 4 +-
+ arch/arm/mach-ixp4xx/dsmg600-setup.c | 5 +-
+ arch/arm/mach-ixp4xx/fsg-setup.c | 5 +-
+ arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +-
+ arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/include/mach/gpio.h | 3 +
+ arch/arm/mach-ixp4xx/include/mach/io.h | 2 -
+ arch/arm/mach-ixp4xx/ixdp425-setup.c | 8 +-
+ arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +-
+ arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +-
+ arch/arm/mach-ixp4xx/vulcan-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +-
+ arch/arm/mach-kirkwood/Makefile.boot | 2 +-
+ arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
+ arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
+ arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
+ arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
+ arch/arm/mach-kirkwood/irq.c | 3 +-
+ arch/arm/mach-kirkwood/mpp.c | 3 +-
+ arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
+ arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +-
+ arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +-
+ arch/arm/mach-kirkwood/openrd-setup.c | 6 +-
+ arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
+ arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
+ arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +-
+ arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
+ arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
+ arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
+ arch/arm/mach-ks8695/Makefile | 2 +-
+ arch/arm/mach-ks8695/Makefile.boot | 2 +-
+ arch/arm/mach-ks8695/board-acs5k.c | 6 +-
+ arch/arm/mach-ks8695/board-dsm320.c | 6 +-
+ arch/arm/mach-ks8695/board-micrel.c | 6 +-
+ arch/arm/mach-ks8695/devices.c | 1 +
+ arch/arm/mach-ks8695/include/mach/gpio-ks8695.h | 39 +
+ arch/arm/mach-ks8695/include/mach/gpio.h | 38 -
+ arch/arm/mach-ks8695/leds.c | 4 +-
+ arch/arm/mach-lpc32xx/Makefile | 2 +-
+ arch/arm/mach-lpc32xx/Makefile.boot | 2 +-
+ arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h | 50 +
+ arch/arm/mach-lpc32xx/include/mach/gpio.h | 74 -
+ arch/arm/mach-lpc32xx/phy3250.c | 3 +-
+ arch/arm/mach-mmp/Makefile.boot | 2 +-
+ arch/arm/mach-mmp/aspenite.c | 5 +-
+ arch/arm/mach-mmp/mmp2.c | 3 +-
+ arch/arm/mach-mmp/pxa168.c | 3 +-
+ arch/arm/mach-mmp/pxa910.c | 3 +-
+ arch/arm/mach-mmp/tavorevb.c | 3 +-
+ arch/arm/mach-mmp/ttc_dkb.c | 2 +-
+ arch/arm/mach-msm/Makefile.boot | 2 +-
+ arch/arm/mach-msm/board-halibut.c | 6 +-
+ arch/arm/mach-msm/board-mahimahi.c | 6 +-
+ arch/arm/mach-msm/board-msm7x27.c | 11 +-
+ arch/arm/mach-msm/board-msm7x30.c | 31 +-
+ arch/arm/mach-msm/board-msm8960.c | 22 +
+ arch/arm/mach-msm/board-msm8x60.c | 25 +
+ arch/arm/mach-msm/board-qsd8x50.c | 7 +-
+ arch/arm/mach-msm/board-sapphire.c | 9 +-
+ arch/arm/mach-msm/board-trout-mmc.c | 3 +-
+ arch/arm/mach-msm/board-trout-panel.c | 3 +-
+ arch/arm/mach-msm/board-trout.c | 6 +-
+ arch/arm/mach-msm/include/mach/gpio.h | 27 +-
+ arch/arm/mach-msm/include/mach/memory.h | 6 +-
+ arch/arm/mach-mv78xx0/Makefile.boot | 2 +-
+ arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
+ arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
+ arch/arm/mach-mv78xx0/irq.c | 3 +-
+ arch/arm/mach-mv78xx0/mpp.c | 3 +-
+ arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
+ arch/arm/mach-mx5/Makefile.boot | 6 +-
+ arch/arm/mach-mx5/board-cpuimx51.c | 2 +-
+ arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +-
+ arch/arm/mach-mx5/board-mx51_3ds.c | 2 +-
+ arch/arm/mach-mx5/board-mx51_babbage.c | 2 +-
+ arch/arm/mach-mx5/board-mx51_efikamx.c | 2 +-
+ arch/arm/mach-mx5/board-mx51_efikasb.c | 2 +-
+ arch/arm/mach-mxs/Makefile.boot | 2 +-
+ arch/arm/mach-mxs/include/mach/gpio.h | 8 -
+ arch/arm/mach-netx/Makefile.boot | 2 +-
+ arch/arm/mach-netx/nxdb500.c | 2 +-
+ arch/arm/mach-netx/nxdkn.c | 2 +-
+ arch/arm/mach-netx/nxeb500hmi.c | 2 +-
+ arch/arm/mach-nomadik/Makefile.boot | 2 +-
+ arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
+ arch/arm/mach-nomadik/cpu-8815.c | 2 +-
+ arch/arm/mach-nomadik/i2c-8815nhk.c | 2 +-
+ arch/arm/mach-nomadik/include/mach/gpio.h | 2 -
+ arch/arm/mach-nuc93x/Makefile.boot | 2 +-
+ arch/arm/mach-nuc93x/mach-nuc932evb.c | 1 -
+ arch/arm/mach-omap1/Makefile.boot | 2 +-
+ arch/arm/mach-omap1/board-ams-delta.c | 5 +-
+ arch/arm/mach-omap1/board-fsample.c | 5 +-
+ arch/arm/mach-omap1/board-generic.c | 5 +-
+ arch/arm/mach-omap1/board-h2-mmc.c | 3 +-
+ arch/arm/mach-omap1/board-h2.c | 5 +-
+ arch/arm/mach-omap1/board-h3-mmc.c | 3 +-
+ arch/arm/mach-omap1/board-h3.c | 5 +-
+ arch/arm/mach-omap1/board-htcherald.c | 3 +-
+ arch/arm/mach-omap1/board-innovator.c | 5 +-
+ arch/arm/mach-omap1/board-nokia770.c | 5 +-
+ arch/arm/mach-omap1/board-osk.c | 5 +-
+ arch/arm/mach-omap1/board-palmte.c | 5 +-
+ arch/arm/mach-omap1/board-palmtt.c | 4 +-
+ arch/arm/mach-omap1/board-palmz71.c | 4 +-
+ arch/arm/mach-omap1/board-perseus2.c | 5 +-
+ arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
+ arch/arm/mach-omap1/board-sx1.c | 5 +-
+ arch/arm/mach-omap1/board-voiceblue.c | 4 +-
+ arch/arm/mach-omap1/devices.c | 2 +-
+ arch/arm/mach-omap1/fpga.c | 2 +-
+ arch/arm/mach-omap1/io.c | 1 +
+ arch/arm/mach-omap1/irq.c | 3 +-
+ arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +-
+ arch/arm/mach-omap1/leds-osk.c | 3 +-
+ arch/arm/mach-omap1/leds.c | 2 +-
+ arch/arm/mach-omap1/serial.c | 3 +-
+ arch/arm/mach-omap2/Makefile.boot | 2 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 2 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 2 +-
+ arch/arm/mach-omap2/board-3630sdp.c | 2 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 2 +-
+ arch/arm/mach-omap2/board-am3517crane.c | 2 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 2 +-
+ arch/arm/mach-omap2/board-apollon.c | 2 +-
+ arch/arm/mach-omap2/board-cm-t35.c | 4 +-
+ arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
+ arch/arm/mach-omap2/board-devkit8000.c | 2 +-
+ arch/arm/mach-omap2/board-generic.c | 5 +-
+ arch/arm/mach-omap2/board-h4.c | 5 +-
+ arch/arm/mach-omap2/board-igep0020.c | 4 +-
+ arch/arm/mach-omap2/board-ldp.c | 5 +-
+ arch/arm/mach-omap2/board-n8x0.c | 6 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 2 +-
+ arch/arm/mach-omap2/board-omap3logic.c | 4 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 2 +-
+ arch/arm/mach-omap2/board-overo.c | 2 +-
+ arch/arm/mach-omap2/board-rm680.c | 2 +-
+ arch/arm/mach-omap2/board-rx51.c | 2 +-
+ arch/arm/mach-omap2/board-ti8168evm.c | 2 +-
+ arch/arm/mach-omap2/board-zoom.c | 4 +-
+ arch/arm/mach-omap2/devices.c | 3 +-
+ arch/arm/mach-omap2/io.c | 2 +-
+ arch/arm/mach-orion5x/Makefile.boot | 2 +-
+ arch/arm/mach-orion5x/common.c | 4 +-
+ arch/arm/mach-orion5x/common.h | 4 +-
+ arch/arm/mach-orion5x/d2net-setup.c | 4 +-
+ arch/arm/mach-orion5x/db88f5281-setup.c | 5 +-
+ arch/arm/mach-orion5x/dns323-setup.c | 5 +-
+ arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
+ arch/arm/mach-orion5x/irq.c | 3 +-
+ arch/arm/mach-orion5x/kurobox_pro-setup.c | 7 +-
+ arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
+ arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
+ arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
+ arch/arm/mach-orion5x/mss2-setup.c | 2 +-
+ arch/arm/mach-orion5x/mv2120-setup.c | 5 +-
+ arch/arm/mach-orion5x/net2big-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 5 +-
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +-
+ arch/arm/mach-orion5x/rd88f5182-setup.c | 5 +-
+ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +-
+ arch/arm/mach-orion5x/terastation_pro2-setup.c | 5 +-
+ arch/arm/mach-orion5x/ts209-setup.c | 5 +-
+ arch/arm/mach-orion5x/ts409-setup.c | 5 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
+ arch/arm/mach-orion5x/wnr854t-setup.c | 5 +-
+ arch/arm/mach-orion5x/wrt350n-v2-setup.c | 5 +-
+ arch/arm/mach-pnx4008/Makefile.boot | 2 +-
+ arch/arm/mach-pnx4008/core.c | 2 +-
+ arch/arm/mach-pnx4008/gpio.c | 3 +-
+ .../include/mach/{gpio.h => gpio-pnx4008.h} | 2 +-
+ arch/arm/mach-pnx4008/serial.c | 3 +-
+ arch/arm/mach-prima2/Makefile.boot | 2 +-
+ arch/arm/mach-prima2/prima2.c | 2 +-
+ arch/arm/mach-pxa/Makefile.boot | 2 +-
+ arch/arm/mach-pxa/balloon3.c | 2 +-
+ arch/arm/mach-pxa/capc7117.c | 2 +-
+ arch/arm/mach-pxa/cm-x2xx.c | 2 +-
+ arch/arm/mach-pxa/cm-x300.c | 6 +-
+ arch/arm/mach-pxa/colibri-pxa270.c | 4 +-
+ arch/arm/mach-pxa/colibri-pxa300.c | 2 +-
+ arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
+ arch/arm/mach-pxa/corgi.c | 4 +-
+ arch/arm/mach-pxa/csb726.c | 2 +-
+ arch/arm/mach-pxa/em-x270.c | 4 +-
+ arch/arm/mach-pxa/eseries.c | 15 +-
+ arch/arm/mach-pxa/eseries.h | 3 +-
+ arch/arm/mach-pxa/ezx.c | 12 +-
+ arch/arm/mach-pxa/generic.c | 2 +-
+ arch/arm/mach-pxa/gumstix.c | 2 +-
+ arch/arm/mach-pxa/h5000.c | 2 +-
+ arch/arm/mach-pxa/himalaya.c | 2 +-
+ arch/arm/mach-pxa/hx4700.c | 2 +-
+ arch/arm/mach-pxa/icontrol.c | 2 +-
+ arch/arm/mach-pxa/include/mach/littleton.h | 2 +-
+ arch/arm/mach-pxa/irq.c | 3 +-
+ arch/arm/mach-pxa/littleton.c | 2 +-
+ arch/arm/mach-pxa/lpd270.c | 5 +-
+ arch/arm/mach-pxa/lubbock.c | 2 +-
+ arch/arm/mach-pxa/magician.c | 2 +-
+ arch/arm/mach-pxa/mainstone.c | 5 +-
+ arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +-
+ arch/arm/mach-pxa/mioa701.c | 2 +-
+ arch/arm/mach-pxa/mp900.c | 2 +-
+ arch/arm/mach-pxa/palmld.c | 2 +-
+ arch/arm/mach-pxa/palmt5.c | 2 +-
+ arch/arm/mach-pxa/palmtc.c | 2 +-
+ arch/arm/mach-pxa/palmte2.c | 2 +-
+ arch/arm/mach-pxa/palmtreo.c | 4 +-
+ arch/arm/mach-pxa/palmtx.c | 2 +-
+ arch/arm/mach-pxa/palmz72.c | 2 +-
+ arch/arm/mach-pxa/pcm027.c | 2 +-
+ arch/arm/mach-pxa/pcm990-baseboard.c | 3 +-
+ arch/arm/mach-pxa/poodle.c | 4 +-
+ arch/arm/mach-pxa/pxa25x.c | 2 +-
+ arch/arm/mach-pxa/pxa27x.c | 2 +-
+ arch/arm/mach-pxa/pxa3xx.c | 3 +-
+ arch/arm/mach-pxa/pxa95x.c | 3 +-
+ arch/arm/mach-pxa/raumfeld.c | 6 +-
+ arch/arm/mach-pxa/saar.c | 4 +-
+ arch/arm/mach-pxa/saarb.c | 5 +-
+ arch/arm/mach-pxa/spitz.c | 4 +-
+ arch/arm/mach-pxa/stargate2.c | 4 +-
+ arch/arm/mach-pxa/tavorevb.c | 2 +-
+ arch/arm/mach-pxa/tavorevb3.c | 2 +-
+ arch/arm/mach-pxa/tosa.c | 4 +-
+ arch/arm/mach-pxa/trizeps4.c | 4 +-
+ arch/arm/mach-pxa/viper.c | 2 +-
+ arch/arm/mach-pxa/vpac270.c | 2 +-
+ arch/arm/mach-pxa/xcep.c | 2 +-
+ arch/arm/mach-pxa/z2.c | 2 +-
+ arch/arm/mach-pxa/zeus.c | 2 +-
+ arch/arm/mach-pxa/zylonite.c | 2 +-
+ arch/arm/mach-realview/Makefile.boot | 4 +-
+ arch/arm/mach-realview/core.c | 3 +-
+ arch/arm/mach-realview/core.h | 4 +-
+ arch/arm/mach-realview/include/mach/gpio.h | 7 +-
+ arch/arm/mach-realview/realview_eb.c | 2 +-
+ arch/arm/mach-realview/realview_pb1176.c | 5 +-
+ arch/arm/mach-realview/realview_pb11mp.c | 2 +-
+ arch/arm/mach-realview/realview_pba8.c | 2 +-
+ arch/arm/mach-realview/realview_pbx.c | 8 +-
+ arch/arm/mach-rpc/Makefile.boot | 2 +-
+ arch/arm/mach-rpc/include/mach/hardware.h | 25 +-
+ arch/arm/mach-rpc/include/mach/io.h | 193 +---
+ arch/arm/mach-rpc/riscpc.c | 4 +-
+ arch/arm/mach-s3c2410/Makefile.boot | 4 +-
+ arch/arm/mach-s3c2410/include/mach/gpio.h | 6 -
+ arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 2 +-
+ arch/arm/mach-s3c2410/include/mach/io.h | 2 -
+ arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +-
+ arch/arm/mach-s3c2410/mach-bast.c | 2 +-
+ arch/arm/mach-s3c2410/mach-h1940.c | 2 +-
+ arch/arm/mach-s3c2410/mach-n30.c | 4 +-
+ arch/arm/mach-s3c2410/mach-otom.c | 2 +-
+ arch/arm/mach-s3c2410/mach-qt2410.c | 2 +-
+ arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +-
+ arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +-
+ arch/arm/mach-s3c2410/mach-vr1000.c | 2 +-
+ arch/arm/mach-s3c2412/mach-jive.c | 2 +-
+ arch/arm/mach-s3c2412/mach-smdk2413.c | 9 +-
+ arch/arm/mach-s3c2412/mach-vstms.c | 7 +-
+ arch/arm/mach-s3c2416/mach-smdk2416.c | 2 +-
+ arch/arm/mach-s3c2440/mach-anubis.c | 2 +-
+ arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +-
+ arch/arm/mach-s3c2440/mach-gta02.c | 2 +-
+ arch/arm/mach-s3c2440/mach-mini2440.c | 2 +-
+ arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +-
+ arch/arm/mach-s3c2440/mach-osiris.c | 2 +-
+ arch/arm/mach-s3c2440/mach-rx1950.c | 2 +-
+ arch/arm/mach-s3c2440/mach-rx3715.c | 2 +-
+ arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +-
+ arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +-
+ arch/arm/mach-s3c64xx/Makefile.boot | 2 +-
+ arch/arm/mach-s3c64xx/cpu.c | 2 +
+ arch/arm/mach-s3c64xx/include/mach/gpio.h | 7 -
+ arch/arm/mach-s3c64xx/include/mach/memory.h | 2 -
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s5p64x0/Makefile.boot | 2 +-
+ arch/arm/mach-s5p64x0/cpu.c | 3 +
+ arch/arm/mach-s5p64x0/include/mach/gpio.h | 7 -
+ arch/arm/mach-s5p64x0/include/mach/memory.h | 1 -
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
+ arch/arm/mach-s5pc100/Makefile.boot | 2 +-
+ arch/arm/mach-s5pc100/include/mach/gpio.h | 7 -
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
+ arch/arm/mach-s5pv210/Makefile.boot | 2 +-
+ arch/arm/mach-s5pv210/cpu.c | 2 +
+ arch/arm/mach-s5pv210/include/mach/gpio.h | 7 -
+ arch/arm/mach-s5pv210/include/mach/memory.h | 1 -
+ arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkc110.c | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
+ arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
+ arch/arm/mach-sa1100/Makefile | 3 +-
+ arch/arm/mach-sa1100/Makefile.boot | 5 +-
+ arch/arm/mach-sa1100/assabet.c | 5 +-
+ arch/arm/mach-sa1100/badge4.c | 2 +-
+ arch/arm/mach-sa1100/generic.c | 2 +-
+ arch/arm/mach-sa1100/h3100.c | 2 +-
+ arch/arm/mach-sa1100/h3600.c | 2 +-
+ arch/arm/mach-sa1100/hackkit.c | 2 +-
+ arch/arm/mach-sa1100/include/mach/gpio.h | 4 +-
+ arch/arm/mach-sa1100/include/mach/io.h | 6 +-
+ arch/arm/mach-sa1100/include/mach/simpad.h | 94 +-
+ arch/arm/mach-sa1100/jornada720.c | 2 +-
+ arch/arm/mach-sa1100/lart.c | 2 +-
+ arch/arm/mach-sa1100/leds-simpad.c | 100 --
+ arch/arm/mach-sa1100/leds.c | 2 -
+ arch/arm/mach-sa1100/leds.h | 1 -
+ arch/arm/mach-sa1100/nanoengine.c | 2 +-
+ arch/arm/mach-sa1100/shannon.c | 2 +-
+ arch/arm/mach-sa1100/simpad.c | 215 +++-
+ arch/arm/mach-shark/Makefile.boot | 2 +-
+ arch/arm/mach-shark/core.c | 2 +-
+ arch/arm/mach-shmobile/Makefile.boot | 2 +-
+ arch/arm/mach-shmobile/board-ag5evm.c | 3 +
+ arch/arm/mach-shmobile/board-ap4evb.c | 3 +
+ arch/arm/mach-shmobile/board-g3evm.c | 3 +
+ arch/arm/mach-shmobile/board-g4evm.c | 3 +
+ arch/arm/mach-shmobile/board-mackerel.c | 3 +
+ arch/arm/mach-shmobile/include/mach/gpio.h | 24 +-
+ arch/arm/mach-shmobile/include/mach/memory.h | 3 -
+ arch/arm/mach-spear3xx/Makefile.boot | 2 +-
+ arch/arm/mach-spear3xx/spear300_evb.c | 2 +-
+ arch/arm/mach-spear3xx/spear310_evb.c | 2 +-
+ arch/arm/mach-spear3xx/spear320_evb.c | 2 +-
+ arch/arm/mach-spear6xx/Makefile.boot | 2 +-
+ arch/arm/mach-spear6xx/spear600_evb.c | 2 +-
+ arch/arm/mach-tcc8k/Makefile.boot | 2 +-
+ arch/arm/mach-tcc8k/board-tcc8000-sdk.c | 2 +-
+ arch/arm/mach-tegra/Makefile.boot | 2 +-
+ arch/arm/mach-tegra/board-harmony-pcie.c | 10 +-
+ arch/arm/mach-tegra/board-harmony.c | 6 +-
+ arch/arm/mach-tegra/board-harmony.h | 3 +
+ arch/arm/mach-tegra/board-paz00.c | 6 +-
+ arch/arm/mach-tegra/board-paz00.h | 2 +
+ arch/arm/mach-tegra/board-seaboard.c | 6 +-
+ arch/arm/mach-tegra/board-seaboard.h | 2 +
+ arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 +-
+ arch/arm/mach-tegra/board-trimslice.c | 6 +-
+ arch/arm/mach-tegra/board-trimslice.h | 2 +
+ arch/arm/mach-tegra/include/mach/gpio-tegra.h | 39 +
+ arch/arm/mach-tegra/include/mach/gpio.h | 60 -
+ arch/arm/mach-tegra/usb_phy.c | 1 +
+ arch/arm/mach-u300/Kconfig | 1 +
+ arch/arm/mach-u300/Makefile.boot | 4 +-
+ arch/arm/mach-u300/core.c | 34 +-
+ arch/arm/mach-u300/include/mach/gpio-u300.h | 150 ++
+ arch/arm/mach-u300/include/mach/gpio.h | 294 ----
+ arch/arm/mach-u300/include/mach/irqs.h | 25 +-
+ arch/arm/mach-u300/include/mach/memory.h | 13 +-
+ arch/arm/mach-u300/mmc.c | 2 +-
+ arch/arm/mach-u300/u300.c | 2 +-
+ arch/arm/mach-ux500/Makefile.boot | 2 +-
+ arch/arm/mach-ux500/board-mop500-pins.c | 2 +-
+ arch/arm/mach-ux500/board-mop500-u8500uib.c | 3 +-
+ arch/arm/mach-ux500/board-mop500.c | 7 +-
+ arch/arm/mach-ux500/board-u5500-sdi.c | 2 +-
+ arch/arm/mach-ux500/board-u5500.c | 4 +-
+ arch/arm/mach-ux500/cpu-db5500.c | 2 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 2 +-
+ arch/arm/mach-ux500/devices-common.c | 2 +-
+ arch/arm/mach-ux500/include/mach/gpio.h | 2 -
+ arch/arm/mach-versatile/Makefile.boot | 2 +-
+ arch/arm/mach-versatile/include/mach/gpio.h | 7 +-
+ arch/arm/mach-versatile/versatile_ab.c | 2 +-
+ arch/arm/mach-versatile/versatile_pb.c | 2 +-
+ arch/arm/mach-vexpress/Makefile.boot | 2 +-
+ arch/arm/mach-vexpress/hotplug.c | 9 +-
+ arch/arm/mach-vexpress/include/mach/io.h | 2 -
+ arch/arm/mach-vexpress/v2m.c | 2 +-
+ arch/arm/mach-vt8500/Makefile.boot | 2 +-
+ arch/arm/mach-vt8500/bv07.c | 2 +-
+ arch/arm/mach-vt8500/include/mach/gpio.h | 7 +-
+ arch/arm/mach-vt8500/include/mach/io.h | 2 -
+ arch/arm/mach-vt8500/wm8505_7in.c | 2 +-
+ arch/arm/mach-w90x900/Makefile.boot | 2 +-
+ arch/arm/mach-w90x900/include/mach/gpio.h | 6 +-
+ arch/arm/mach-w90x900/mach-nuc910evb.c | 1 -
+ arch/arm/mach-w90x900/mach-nuc950evb.c | 1 -
+ arch/arm/mach-w90x900/mach-nuc960evb.c | 1 -
+ arch/arm/mach-zynq/Makefile.boot | 2 +-
+ arch/arm/mm/cache-l2x0.c | 105 ++-
+ arch/arm/mm/dma-mapping.c | 46 +-
+ arch/arm/mm/init.c | 9 -
+ arch/arm/mm/mm.h | 4 +-
+ arch/arm/mm/mmu.c | 26 +-
+ arch/arm/mm/proc-arm920.S | 21 +-
+ arch/arm/mm/proc-arm926.S | 21 +-
+ arch/arm/mm/proc-sa1100.S | 25 +-
+ arch/arm/mm/proc-v6.S | 44 +-
+ arch/arm/mm/proc-v7.S | 50 +-
+ arch/arm/mm/proc-xsc3.S | 28 +-
+ arch/arm/mm/proc-xscale.S | 25 +-
+ arch/arm/plat-mxc/include/mach/gpio.h | 6 -
+ arch/arm/plat-mxc/include/mach/memory.h | 15 -
+ .../include/plat/{gpio.h => gpio-nomadik.h} | 17 +-
+ arch/arm/plat-omap/debug-devices.c | 3 +-
+ arch/arm/plat-omap/debug-leds.c | 3 +-
+ arch/arm/plat-omap/devices.c | 3 +-
+ arch/arm/plat-omap/include/plat/gpio.h | 20 -
+ arch/arm/plat-omap/include/plat/io.h | 2 +
+ arch/arm/plat-omap/include/plat/memory.h | 13 -
+ arch/arm/plat-omap/io.c | 8 +
+ arch/arm/plat-orion/include/plat/gpio.h | 10 +-
+ arch/arm/plat-pxa/gpio.c | 4 +-
+ arch/arm/plat-pxa/include/plat/gpio.h | 2 +
+ arch/arm/plat-spear/include/plat/gpio.h | 25 +-
+ arch/arm/vfp/vfpmodule.c | 31 +-
+ drivers/amba/bus.c | 68 +-
+ drivers/ata/pata_at91.c | 2 +-
+ drivers/gpio/Kconfig | 9 +
+ drivers/gpio/Makefile | 6 +-
+ .../gpio.c => drivers/gpio/gpio-davinci.c | 7 +-
+ drivers/gpio/gpio-ep93xx.c | 19 +-
+ .../gpio.c => drivers/gpio/gpio-ks8695.c | 4 +-
+ .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c | 2 +-
+ drivers/gpio/gpio-nomadik.c | 3 +-
+ drivers/gpio/gpio-omap.c | 2 +-
+ .../gpio.c => drivers/gpio/gpio-sa1100.c | 4 +-
+ drivers/gpio/gpio-tegra.c | 23 +-
+ .../mach-davinci => drivers/gpio}/gpio-tnetv107x.c | 0
+ drivers/gpio/gpio-u300.c | 1190 ++++++++------
+ drivers/i2c/busses/i2c-ixp2000.c | 2 +-
+ drivers/ide/at91_ide.c | 2 +-
+ drivers/input/keyboard/omap-keypad.c | 2 +-
+ drivers/mfd/menelaus.c | 2 +-
+ drivers/mmc/host/mmci.c | 21 +-
+ drivers/mmc/host/omap.c | 2 +-
+ drivers/mmc/host/sdhci-tegra.c | 4 +-
+ drivers/mtd/nand/ams-delta.c | 2 +-
+ drivers/mtd/onenand/omap2.c | 2 +-
+ drivers/net/arm/at91_ether.c | 2 +-
+ drivers/pcmcia/pxa2xx_vpac270.c | 2 +-
+ drivers/pcmcia/sa1100_simpad.c | 35 +-
+ drivers/spi/spi-atmel.c | 2 +-
+ drivers/spi/spi-pl022.c | 92 +-
+ drivers/tty/serial/amba-pl010.c | 14 +-
+ drivers/tty/serial/amba-pl011.c | 14 +-
+ drivers/tty/serial/atmel_serial.c | 2 +-
+ drivers/usb/host/ohci-pnx4008.c | 2 +-
+ drivers/usb/musb/davinci.c | 2 +-
+ drivers/video/amba-clcd.c | 9 +-
+ drivers/video/atmel_lcdfb.c | 2 +-
+ drivers/video/omap/lcd_apollon.c | 2 +-
+ drivers/video/omap/lcd_h3.c | 2 +-
+ drivers/video/omap/lcd_inn1610.c | 2 +-
+ drivers/video/omap/lcd_ldp.c | 2 +-
+ drivers/video/omap/lcd_osk.c | 2 +-
+ drivers/video/omap/lcd_overo.c | 2 +-
+ drivers/video/omap/lcd_palmtt.c | 2 +-
+ drivers/video/pnx4008/sdum.c | 2 +-
+ include/linux/clk.h | 43 +
+ include/linux/cpu_pm.h | 109 ++
+ kernel/Makefile | 1 +
+ kernel/cpu_pm.c | 233 +++
+ kernel/events/core.c | 4 +-
+ kernel/power/Kconfig | 4 +
+ 750 files changed, 10503 insertions(+), 4313 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/l2cc.txt
+ create mode 100644 arch/arm/boot/compressed/atags_to_fdt.c
+ create mode 100644 arch/arm/boot/compressed/libfdt_env.h
+ create mode 100644 arch/arm/boot/compressed/string.c
+ delete mode 100644 arch/arm/include/asm/auxvec.h
+ delete mode 100644 arch/arm/include/asm/bitsperlong.h
+ delete mode 100644 arch/arm/include/asm/cputime.h
+ delete mode 100644 arch/arm/include/asm/emergency-restart.h
+ delete mode 100644 arch/arm/include/asm/errno.h
+ delete mode 100644 arch/arm/include/asm/ioctl.h
+ delete mode 100644 arch/arm/include/asm/irq_regs.h
+ delete mode 100644 arch/arm/include/asm/kdebug.h
+ delete mode 100644 arch/arm/include/asm/local.h
+ delete mode 100644 arch/arm/include/asm/local64.h
+ delete mode 100644 arch/arm/include/asm/percpu.h
+ create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
+ create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
+ create mode 100644 arch/arm/include/asm/pgtable-2level.h
+ delete mode 100644 arch/arm/include/asm/poll.h
+ delete mode 100644 arch/arm/include/asm/resource.h
+ delete mode 100644 arch/arm/include/asm/sections.h
+ delete mode 100644 arch/arm/include/asm/siginfo.h
+ delete mode 100644 arch/arm/include/asm/sizes.h
+ create mode 100644 arch/arm/kernel/kprobes-test-arm.c
+ create mode 100644 arch/arm/kernel/kprobes-test-thumb.c
+ create mode 100644 arch/arm/kernel/kprobes-test.c
+ create mode 100644 arch/arm/kernel/kprobes-test.h
+ create mode 100644 arch/arm/kernel/suspend.c
+ create mode 100644 arch/arm/kernel/topology.c
+ create mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
+ rename arch/arm/mach-ixp2000/include/mach/{gpio.h => gpio-ixp2000.h} (95%)
+ create mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h
+ create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h
+ rename arch/arm/mach-pnx4008/include/mach/{gpio.h => gpio-pnx4008.h} (99%)
+ delete mode 100644 arch/arm/mach-sa1100/leds-simpad.c
+ create mode 100644 arch/arm/mach-tegra/include/mach/gpio-tegra.h
+ create mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
+ rename arch/arm/plat-nomadik/include/plat/{gpio.h => gpio-nomadik.h} (82%)
+ rename arch/arm/mach-davinci/gpio.c => drivers/gpio/gpio-davinci.c (98%)
+ rename arch/arm/mach-ks8695/gpio.c => drivers/gpio/gpio-ks8695.c (99%)
+ rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%)
+ rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (96%)
+ rename {arch/arm/mach-davinci => drivers/gpio}/gpio-tnetv107x.c (100%)
+ create mode 100644 include/linux/cpu_pm.h
+ create mode 100644 kernel/cpu_pm.c
+Merging arm-lpae/for-next
+$ git merge arm-lpae/for-next
+Resolved 'arch/arm/include/asm/page.h' using previous resolution.
+Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
+Resolved 'arch/arm/include/asm/pgtable-hwdef.h' using previous resolution.
+Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
+Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
+Resolved 'arch/arm/kernel/head.S' using previous resolution.
+Resolved 'arch/arm/kernel/sleep.S' using previous resolution.
+Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution.
+Resolved 'arch/arm/mm/mmu.c' using previous resolution.
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/boot/compressed/head.S
+Auto-merging arch/arm/include/asm/page.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
+Auto-merging arch/arm/include/asm/pgalloc.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
+Auto-merging arch/arm/include/asm/pgtable-hwdef.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
+Auto-merging arch/arm/include/asm/pgtable.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
+Auto-merging arch/arm/include/asm/proc-fns.h
+Auto-merging arch/arm/include/asm/system.h
+Auto-merging arch/arm/include/asm/tlb.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
+Auto-merging arch/arm/kernel/head.S
+CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
+Auto-merging arch/arm/kernel/hw_breakpoint.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/kernel/sleep.S
+CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
+Auto-merging arch/arm/mm/dma-mapping.c
+CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/mm/mmu.c
+CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7863d89] Merge remote-tracking branch 'arm-lpae/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/compressed/head.S | 1 +
+ arch/arm/include/asm/assembler.h | 11 +
+ arch/arm/include/asm/page.h | 4 +
+ arch/arm/include/asm/pgalloc.h | 24 ++
+ arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++
+ arch/arm/include/asm/pgtable-3level-types.h | 70 +++++
+ arch/arm/include/asm/pgtable-3level.h | 107 +++++++
+ arch/arm/include/asm/pgtable-hwdef.h | 4 +
+ arch/arm/include/asm/pgtable.h | 70 ++++-
+ arch/arm/include/asm/proc-fns.h | 21 ++
+ arch/arm/include/asm/setup.h | 8 +
+ arch/arm/include/asm/system.h | 8 +
+ arch/arm/include/asm/tlb.h | 11 +-
+ arch/arm/kernel/head.S | 45 +++-
+ arch/arm/kernel/hw_breakpoint.c | 8 +-
+ arch/arm/kernel/setup.c | 10 +
+ arch/arm/kernel/sleep.S | 2 +
+ arch/arm/mm/Kconfig | 13 +
+ arch/arm/mm/Makefile | 4 +
+ arch/arm/mm/alignment.c | 2 +-
+ arch/arm/mm/context.c | 19 +-
+ arch/arm/mm/fault.c | 87 ++++++
+ arch/arm/mm/idmap.c | 36 +++-
+ arch/arm/mm/ioremap.c | 39 ++-
+ arch/arm/mm/mmu.c | 35 ++-
+ arch/arm/mm/pgd.c | 51 +++-
+ arch/arm/mm/proc-macros.S | 5 +-
+ arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++
+ 29 files changed, 1160 insertions(+), 41 deletions(-)
+ create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level.h
+ create mode 100644 arch/arm/mm/proc-v7lpae.S
+Merging arm-soc/for-next
+$ git merge arm-soc/for-next
+error: refusing to lose untracked file at 'arch/arm/mach-picoxcell/include/mach/uncompress.h'
+CONFLICT (rename/delete): Rename arch/arm/include/asm/sizes.h->arch/arm/mach-picoxcell/include/mach/uncompress.h in arm-soc/for-next and deleted in HEAD
+Auto-merging Documentation/devicetree/bindings/arm/l2cc.txt
+CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/configs/imx_v4_v5_defconfig
+Removing arch/arm/configs/mx1_defconfig
+Removing arch/arm/configs/mx21_defconfig
+Auto-merging arch/arm/configs/mx5_defconfig
+Auto-merging arch/arm/mach-at91/at91cap9_devices.c
+Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
+Auto-merging arch/arm/mach-at91/board-usb-a926x.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Auto-merging arch/arm/mach-davinci/dm355.c
+Auto-merging arch/arm/mach-davinci/dm644x.c
+Auto-merging arch/arm/mach-davinci/dm646x.c
+Removing arch/arm/mach-exynos4/mach-smdkc210.c
+Auto-merging arch/arm/mach-msm/board-msm8x60.c
+CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
+Removing arch/arm/mach-mx5/devices.c
+Removing arch/arm/mach-mx5/devices.h
+Auto-merging arch/arm/mach-mxs/include/mach/gpio.h
+CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
+Removing arch/arm/mach-nuc93x/Kconfig
+Removing arch/arm/mach-nuc93x/Makefile
+CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
+Removing arch/arm/mach-nuc93x/clock.c
+Removing arch/arm/mach-nuc93x/clock.h
+Removing arch/arm/mach-nuc93x/cpu.c
+Removing arch/arm/mach-nuc93x/cpu.h
+Removing arch/arm/mach-nuc93x/dev.c
+Removing arch/arm/mach-nuc93x/include/mach/entry-macro.S
+Removing arch/arm/mach-nuc93x/include/mach/hardware.h
+Removing arch/arm/mach-nuc93x/include/mach/io.h
+Removing arch/arm/mach-nuc93x/include/mach/irqs.h
+Removing arch/arm/mach-nuc93x/include/mach/map.h
+Removing arch/arm/mach-nuc93x/include/mach/memory.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-clock.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-ebi.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-irq.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-serial.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-timer.h
+Removing arch/arm/mach-nuc93x/include/mach/system.h
+Removing arch/arm/mach-nuc93x/include/mach/timex.h
+Removing arch/arm/mach-nuc93x/include/mach/uncompress.h
+Removing arch/arm/mach-nuc93x/include/mach/vmalloc.h
+Removing arch/arm/mach-nuc93x/irq.c
+Removing arch/arm/mach-nuc93x/mach-nuc932evb.c
+Removing arch/arm/mach-nuc93x/nuc932.c
+Removing arch/arm/mach-nuc93x/nuc932.h
+Removing arch/arm/mach-nuc93x/time.c
+Auto-merging arch/arm/mach-omap2/board-generic.c
+Auto-merging arch/arm/mach-omap2/board-h4.c
+Auto-merging arch/arm/mach-omap2/board-ldp.c
+Auto-merging arch/arm/mach-omap2/devices.c
+Removing arch/arm/mach-s3c2410/gpio.c
+Removing arch/arm/mach-s3c2412/gpio.c
+Auto-merging arch/arm/mach-tegra/board-harmony.c
+Auto-merging arch/arm/mach-tegra/board-paz00.c
+Auto-merging arch/arm/mach-tegra/board-paz00.h
+CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
+Auto-merging arch/arm/mach-tegra/board-seaboard.h
+CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
+Auto-merging arch/arm/mach-tegra/board-trimslice.c
+Auto-merging arch/arm/mach-u300/Kconfig
+Auto-merging arch/arm/mach-u300/Makefile.boot
+CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
+Auto-merging arch/arm/mach-u300/core.c
+Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+Auto-merging arch/arm/mach-vexpress/hotplug.c
+Auto-merging arch/arm/mm/cache-l2x0.c
+CONFLICTResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
+Resolved 'arch/arm/mach-msm/board-msm8x60.c' using previous resolution.
+Resolved 'arch/arm/mach-mxs/include/mach/gpio.h' using previous resolution.
+Resolved 'arch/arm/mach-tegra/board-paz00.h' using previous resolution.
+Resolved 'arch/arm/mach-tegra/board-seaboard.h' using previous resolution.
+Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
+Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution.
+Resolved 'arch/arm/plat-mxc/include/mach/gpio.h' using previous resolution.
+ (content): Merge conflict in arch/arm/mm/cache-l2x0.c
+Auto-merging arch/arm/plat-mxc/include/mach/gpio.h
+CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
+Auto-merging arch/arm/plat-omap/devices.c
+Removing arch/arm/plat-s3c24xx/include/plat/map.h
+Auto-merging arch/arm/plat-samsung/include/plat/map-s5p.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
+Documentation/devicetree/bindings/arm/l2cc.txt: needs merge
+arch/arm/mach-at91/board-usb-a9260.c: needs merge
+arch/arm/mach-msm/board-msm8x60.c: needs merge
+arch/arm/mach-mxs/include/mach/gpio.h: needs merge
+arch/arm/mach-nuc93x/Makefile.boot: needs merge
+arch/arm/mach-picoxcell/include/mach/uncompress.h: needs merge
+arch/arm/mach-tegra/board-paz00.h: needs merge
+arch/arm/mach-tegra/board-seaboard.h: needs merge
+arch/arm/mach-u300/Makefile.boot: needs merge
+arch/arm/mm/cache-l2x0.c: needs merge
+arch/arm/plat-mxc/include/mach/gpio.h: needs merge
+rm 'arch/arm/mach-at91/board-usb-a9260.c'
+rm 'arch/arm/mach-nuc93x/Makefile.boot'
+$ git commit -v -a
+[master 5ed851c] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/picoxcell.txt | 24 +
+ .../devicetree/bindings/tty/serial/msm_serial.txt | 27 +
+ arch/arm/Kconfig | 29 +-
+ arch/arm/Makefile | 6 +-
+ arch/arm/boot/dts/msm8660-surf.dts | 24 +
+ arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 249 ++
+ arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 365 ++
+ arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts | 86 +
+ arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts | 92 +
+ arch/arm/boot/dts/prima2-cb.dts | 9 +-
+ arch/arm/boot/dts/tegra-harmony.dts | 1 +
+ arch/arm/boot/dts/tegra-seaboard.dts | 4 +
+ arch/arm/configs/at91sam9g45_defconfig | 214 ++
+ arch/arm/configs/exynos4_defconfig | 1 +
+ .../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +-
+ arch/arm/configs/mx1_defconfig | 91 -
+ arch/arm/configs/mx21_defconfig | 97 -
+ arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 +-
+ arch/arm/include/asm/device.h | 5 +
+ arch/arm/mach-at91/Kconfig | 13 +
+ arch/arm/mach-at91/Makefile | 6 +-
+ arch/arm/mach-at91/at91cap9.c | 2 +
+ arch/arm/mach-at91/at91cap9_devices.c | 6 +
+ arch/arm/mach-at91/at91rm9200.c | 2 +
+ arch/arm/mach-at91/at91rm9200_devices.c | 8 +
+ arch/arm/mach-at91/at91sam9260.c | 2 +
+ arch/arm/mach-at91/at91sam9260_devices.c | 8 +
+ arch/arm/mach-at91/at91sam9261.c | 29 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 8 +
+ arch/arm/mach-at91/at91sam9263.c | 2 +
+ arch/arm/mach-at91/at91sam9263_devices.c | 6 +
+ arch/arm/mach-at91/at91sam9g45.c | 2 +
+ arch/arm/mach-at91/at91sam9g45_devices.c | 6 +
+ arch/arm/mach-at91/board-rsi-ews.c | 233 ++
+ arch/arm/mach-at91/board-usb-a9260.c | 230 --
+ .../{board-usb-a9263.c => board-usb-a926x.c} | 179 +-
+ arch/arm/mach-at91/include/mach/board.h | 5 +
+ arch/arm/mach-at91/include/mach/timex.h | 5 +
+ arch/arm/mach-davinci/Kconfig | 10 +
+ arch/arm/mach-davinci/board-da850-evm.c | 114 +
+ arch/arm/mach-davinci/da850.c | 9 +
+ arch/arm/mach-davinci/devices-da8xx.c | 3 +
+ arch/arm/mach-davinci/devices-tnetv107x.c | 1 +
+ arch/arm/mach-davinci/dm355.c | 1 +
+ arch/arm/mach-davinci/dm644x.c | 1 +
+ arch/arm/mach-davinci/dm646x.c | 1 +
+ arch/arm/mach-davinci/dma.c | 5 +-
+ arch/arm/mach-davinci/include/mach/mmc.h | 3 +
+ arch/arm/mach-davinci/include/mach/mux.h | 10 +
+ arch/arm/mach-exynos4/Kconfig | 57 +-
+ arch/arm/mach-exynos4/Makefile | 11 +-
+ arch/arm/mach-exynos4/clock-exynos4210.c | 139 +
+ arch/arm/mach-exynos4/clock-exynos4212.c | 118 +
+ arch/arm/mach-exynos4/clock.c | 218 +-
+ arch/arm/mach-exynos4/cpu.c | 40 +-
+ arch/arm/mach-exynos4/hotplug.c | 2 +-
+ arch/arm/mach-exynos4/include/mach/exynos4-clock.h | 43 +
+ arch/arm/mach-exynos4/include/mach/map.h | 3 +-
+ arch/arm/mach-exynos4/include/mach/regs-clock.h | 54 +-
+ arch/arm/mach-exynos4/mach-origen.c | 108 +
+ arch/arm/mach-exynos4/mach-smdk4212.c | 292 ++
+ arch/arm/mach-exynos4/mach-smdkc210.c | 309 --
+ arch/arm/mach-exynos4/mach-smdkv310.c | 78 +
+ arch/arm/mach-exynos4/platsmp.c | 10 +-
+ arch/arm/mach-exynos4/pm.c | 79 +-
+ arch/arm/mach-imx/Kconfig | 51 +-
+ arch/arm/mach-imx/Makefile | 10 +-
+ arch/arm/mach-imx/cache-l2x0.c | 2 +-
+ arch/arm/mach-imx/clock-imx25.c | 6 +
+ arch/arm/mach-imx/clock-imx27.c | 6 +-
+ arch/arm/mach-imx/clock-imx31.c | 8 +-
+ arch/arm/mach-imx/clock-imx35.c | 7 +-
+ arch/arm/mach-imx/cpu-imx25.c | 41 +
+ arch/arm/mach-imx/cpu-imx27.c | 28 +-
+ arch/arm/mach-imx/cpu-imx31.c | 49 +-
+ arch/arm/mach-imx/cpu-imx35.c | 30 +-
+ arch/arm/mach-imx/devices-imx27.h | 4 +
+ arch/arm/mach-imx/devices-imx31.h | 4 +
+ arch/arm/mach-imx/devices-imx35.h | 4 +
+ arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
+ arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
+ arch/arm/mach-imx/mach-mx1ads.c | 15 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c | 10 +
+ arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-vpr200.c | 2 +-
+ arch/arm/mach-ixp4xx/Kconfig | 19 +
+ arch/arm/mach-ixp4xx/Makefile | 4 +
+ arch/arm/mach-ixp4xx/include/mach/uncompress.h | 3 +-
+ arch/arm/mach-ixp4xx/miccpt-pci.c | 78 +
+ arch/arm/mach-ixp4xx/omixp-setup.c | 273 ++
+ arch/arm/mach-msm/board-msm8x60.c | 58 +-
+ arch/arm/mach-msm/hotplug.c | 2 +-
+ arch/arm/mach-msm/platsmp.c | 2 +-
+ arch/arm/mach-mx5/Kconfig | 29 +-
+ arch/arm/mach-mx5/Makefile | 2 +-
+ arch/arm/mach-mx5/board-cpuimx51.c | 27 +-
+ arch/arm/mach-mx5/board-cpuimx51sd.c | 25 +-
+ arch/arm/mach-mx5/board-mx51_3ds.c | 1 -
+ arch/arm/mach-mx5/board-mx51_babbage.c | 26 +-
+ arch/arm/mach-mx5/board-mx51_efikamx.c | 13 +-
+ arch/arm/mach-mx5/board-mx51_efikasb.c | 24 +-
+ arch/arm/mach-mx5/board-mx53_ard.c | 4 +-
+ arch/arm/mach-mx5/board-mx53_loco.c | 20 +
+ arch/arm/mach-mx5/clock-mx51-mx53.c | 14 +-
+ arch/arm/mach-mx5/cpu.c | 74 +-
+ arch/arm/mach-mx5/devices-imx51.h | 17 +
+ arch/arm/mach-mx5/devices-imx53.h | 4 +
+ arch/arm/mach-mx5/devices.c | 120 -
+ arch/arm/mach-mx5/devices.h | 5 -
+ arch/arm/mach-mx5/ehci.c | 2 +-
+ arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 3 +-
+ arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +-
+ arch/arm/mach-mx5/mm.c | 8 +-
+ arch/arm/mach-mx5/mx51_efika.c | 20 +-
+ arch/arm/mach-mx5/pm-imx5.c | 15 +-
+ arch/arm/mach-mxs/Kconfig | 6 +
+ arch/arm/mach-mxs/clock-mx28.c | 8 +-
+ arch/arm/mach-mxs/devices-mx23.h | 2 +
+ arch/arm/mach-mxs/devices-mx28.h | 5 +
+ arch/arm/mach-mxs/devices/Kconfig | 6 +
+ arch/arm/mach-mxs/devices/Makefile | 2 +
+ arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 +
+ arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 +
+ arch/arm/mach-mxs/include/mach/devices-common.h | 12 +
+ arch/arm/mach-mxs/include/mach/gpio.h | 4 -
+ arch/arm/mach-mxs/include/mach/mxs.h | 2 +
+ arch/arm/mach-mxs/mach-mx23evk.c | 2 +-
+ arch/arm/mach-mxs/mach-mx28evk.c | 79 +-
+ arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 +-
+ arch/arm/mach-mxs/mach-tx28.c | 1 +
+ arch/arm/mach-nuc93x/Kconfig | 19 -
+ arch/arm/mach-nuc93x/Makefile | 14 -
+ arch/arm/mach-nuc93x/Makefile.boot | 3 -
+ arch/arm/mach-nuc93x/clock.c | 83 -
+ arch/arm/mach-nuc93x/clock.h | 36 -
+ arch/arm/mach-nuc93x/cpu.c | 135 -
+ arch/arm/mach-nuc93x/cpu.h | 48 -
+ arch/arm/mach-nuc93x/dev.c | 42 -
+ arch/arm/mach-nuc93x/include/mach/entry-macro.S | 32 -
+ arch/arm/mach-nuc93x/include/mach/hardware.h | 22 -
+ arch/arm/mach-nuc93x/include/mach/io.h | 28 -
+ arch/arm/mach-nuc93x/include/mach/irqs.h | 59 -
+ arch/arm/mach-nuc93x/include/mach/map.h | 139 -
+ arch/arm/mach-nuc93x/include/mach/memory.h | 21 -
+ arch/arm/mach-nuc93x/include/mach/regs-clock.h | 53 -
+ arch/arm/mach-nuc93x/include/mach/regs-ebi.h | 33 -
+ arch/arm/mach-nuc93x/include/mach/regs-irq.h | 42 -
+ arch/arm/mach-nuc93x/include/mach/regs-serial.h | 52 -
+ arch/arm/mach-nuc93x/include/mach/regs-timer.h | 28 -
+ arch/arm/mach-nuc93x/include/mach/system.h | 28 -
+ arch/arm/mach-nuc93x/include/mach/timex.h | 25 -
+ arch/arm/mach-nuc93x/include/mach/uncompress.h | 50 -
+ arch/arm/mach-nuc93x/include/mach/vmalloc.h | 23 -
+ arch/arm/mach-nuc93x/irq.c | 66 -
+ arch/arm/mach-nuc93x/mach-nuc932evb.c | 42 -
+ arch/arm/mach-nuc93x/nuc932.c | 65 -
+ arch/arm/mach-nuc93x/nuc932.h | 29 -
+ arch/arm/mach-nuc93x/time.c | 100 -
+ arch/arm/mach-omap1/Makefile | 2 +-
+ arch/arm/mach-omap1/mcbsp.c | 45 +
+ arch/arm/mach-omap1/timer.c | 173 +
+ arch/arm/mach-omap2/Makefile | 88 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 17 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 9 +-
+ arch/arm/mach-omap2/board-3630sdp.c | 11 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 17 +-
+ arch/arm/mach-omap2/board-am3517crane.c | 9 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 8 +-
+ arch/arm/mach-omap2/board-apollon.c | 17 +-
+ arch/arm/mach-omap2/board-cm-t35.c | 13 +-
+ arch/arm/mach-omap2/board-cm-t3517.c | 9 +-
+ arch/arm/mach-omap2/board-devkit8000.c | 19 +-
+ arch/arm/mach-omap2/board-flash.c | 5 -
+ arch/arm/mach-omap2/board-flash.h | 19 +
+ arch/arm/mach-omap2/board-generic.c | 2 +-
+ arch/arm/mach-omap2/board-h4.c | 24 +-
+ arch/arm/mach-omap2/board-igep0020.c | 13 +-
+ arch/arm/mach-omap2/board-ldp.c | 9 +-
+ arch/arm/mach-omap2/board-n8x0.c | 25 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 11 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 9 +-
+ arch/arm/mach-omap2/board-omap3logic.c | 11 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 11 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 16 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c | 18 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 17 +-
+ arch/arm/mach-omap2/board-overo.c | 11 +-
+ arch/arm/mach-omap2/board-rm680.c | 25 +-
+ arch/arm/mach-omap2/board-rx51.c | 25 +-
+ arch/arm/mach-omap2/board-ti8168evm.c | 9 +-
+ arch/arm/mach-omap2/board-zoom.c | 23 +-
+ arch/arm/mach-omap2/clock2420_data.c | 48 +
+ arch/arm/mach-omap2/clock2430_data.c | 48 +
+ arch/arm/mach-omap2/clock3xxx_data.c | 47 +-
+ arch/arm/mach-omap2/clock44xx_data.c | 33 +
+ arch/arm/mach-omap2/clockdomain.c | 147 +-
+ arch/arm/mach-omap2/clockdomain.h | 22 +-
+ arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 4 -
+ arch/arm/mach-omap2/clockdomain44xx.c | 2 -
+ arch/arm/mach-omap2/clockdomains2420_data.c | 154 +
+ arch/arm/mach-omap2/clockdomains2430_data.c | 181 +
+ arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 803 +-----
+ arch/arm/mach-omap2/clockdomains3xxx_data.c | 398 +++
+ arch/arm/mach-omap2/clockdomains44xx_data.c | 409 +--
+ arch/arm/mach-omap2/common.c | 18 +
+ arch/arm/mach-omap2/devices.c | 44 +-
+ arch/arm/mach-omap2/display.c | 6 +-
+ arch/arm/mach-omap2/dma.c | 16 +-
+ arch/arm/mach-omap2/gpio.c | 10 +-
+ arch/arm/mach-omap2/hsmmc.c | 8 +-
+ arch/arm/mach-omap2/hwspinlock.c | 8 +-
+ arch/arm/mach-omap2/id.c | 191 +-
+ arch/arm/mach-omap2/io.c | 57 +-
+ arch/arm/mach-omap2/mcbsp.c | 111 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 3 -
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 59 +-
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 67 +-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 200 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 104 +-
+ arch/arm/mach-omap2/omap_twl.c | 107 +-
+ arch/arm/mach-omap2/opp.c | 2 +-
+ arch/arm/mach-omap2/pm.c | 36 +-
+ arch/arm/mach-omap2/pm24xx.c | 27 -
+ arch/arm/mach-omap2/pm34xx.c | 2 +-
+ arch/arm/mach-omap2/powerdomain-common.c | 7 +-
+ arch/arm/mach-omap2/powerdomain.c | 110 +-
+ arch/arm/mach-omap2/powerdomain.h | 19 +-
+ arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 2 +-
+ arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 21 +-
+ arch/arm/mach-omap2/powerdomains2xxx_data.c | 48 +-
+ arch/arm/mach-omap2/powerdomains3xxx_data.c | 97 +-
+ arch/arm/mach-omap2/powerdomains44xx_data.c | 36 +-
+ arch/arm/mach-omap2/prm2xxx_3xxx.c | 56 +
+ arch/arm/mach-omap2/prm2xxx_3xxx.h | 12 +
+ arch/arm/mach-omap2/prm44xx.c | 71 +
+ arch/arm/mach-omap2/prm44xx.h | 12 +
+ arch/arm/mach-omap2/serial.c | 14 +-
+ arch/arm/mach-omap2/smartreflex-class3.c | 4 +-
+ arch/arm/mach-omap2/smartreflex.c | 29 +-
+ arch/arm/mach-omap2/sr_device.c | 8 +-
+ arch/arm/mach-omap2/timer.c | 194 +-
+ arch/arm/mach-omap2/vc.c | 367 ++
+ arch/arm/mach-omap2/vc.h | 88 +-
+ arch/arm/mach-omap2/vc3xxx_data.c | 31 +-
+ arch/arm/mach-omap2/vc44xx_data.c | 44 +-
+ arch/arm/mach-omap2/voltage.c | 1088 ++-----
+ arch/arm/mach-omap2/voltage.h | 150 +-
+ arch/arm/mach-omap2/voltagedomains2xxx_data.c | 32 +
+ arch/arm/mach-omap2/voltagedomains3xxx_data.c | 83 +-
+ arch/arm/mach-omap2/voltagedomains44xx_data.c | 99 +-
+ arch/arm/mach-omap2/vp.c | 278 ++
+ arch/arm/mach-omap2/vp.h | 133 +-
+ arch/arm/mach-omap2/vp3xxx_data.c | 35 +-
+ arch/arm/mach-omap2/vp44xx_data.c | 47 +-
+ arch/arm/mach-picoxcell/Makefile | 3 +
+ arch/arm/mach-picoxcell/Makefile.boot | 1 +
+ arch/arm/mach-picoxcell/common.c | 55 +
+ arch/arm/mach-picoxcell/common.h | 18 +
+ arch/arm/mach-picoxcell/include/mach/debug-macro.S | 35 +
+ arch/arm/mach-picoxcell/include/mach/entry-macro.S | 19 +
+ arch/arm/mach-picoxcell/include/mach/gpio.h | 1 +
+ arch/arm/mach-picoxcell/include/mach/hardware.h | 21 +
+ arch/arm/mach-picoxcell/include/mach/io.h | 22 +
+ arch/arm/mach-picoxcell/include/mach/irqs.h | 25 +
+ arch/arm/mach-picoxcell/include/mach/map.h | 25 +
+ arch/arm/mach-picoxcell/include/mach/memory.h | 1 +
+ .../mach-picoxcell/include/mach/picoxcell_soc.h | 25 +
+ arch/arm/mach-picoxcell/include/mach/system.h | 31 +
+ arch/arm/mach-picoxcell/include/mach/timex.h | 25 +
+ arch/arm/mach-picoxcell/include/mach/uncompress.h | 21 +
+ arch/arm/mach-picoxcell/io.c | 32 +
+ arch/arm/mach-picoxcell/time.c | 132 +
+ arch/arm/mach-prima2/Makefile | 2 +
+ arch/arm/mach-prima2/irq.c | 43 +
+ arch/arm/mach-prima2/pm.c | 149 +
+ arch/arm/mach-prima2/pm.h | 29 +
+ arch/arm/mach-prima2/rtciobrg.c | 139 +
+ arch/arm/mach-prima2/sleep.S | 64 +
+ arch/arm/mach-prima2/timer.c | 34 +
+ arch/arm/mach-realview/hotplug.c | 2 +-
+ arch/arm/mach-s3c2410/Kconfig | 6 -
+ arch/arm/mach-s3c2410/Makefile | 1 -
+ arch/arm/mach-s3c2410/dma.c | 14 -
+ arch/arm/mach-s3c2410/gpio.c | 72 -
+ arch/arm/mach-s3c2410/include/mach/map.h | 52 +-
+ arch/arm/mach-s3c2412/Kconfig | 1 -
+ arch/arm/mach-s3c2412/Makefile | 1 -
+ arch/arm/mach-s3c2412/dma.c | 18 -
+ arch/arm/mach-s3c2412/gpio.c | 62 -
+ arch/arm/mach-s3c2440/Kconfig | 2 -
+ arch/arm/mach-s3c2440/dma.c | 17 -
+ arch/arm/mach-s3c2443/dma.c | 27 -
+ arch/arm/mach-s3c64xx/cpu.c | 22 +-
+ arch/arm/mach-s3c64xx/include/mach/map.h | 9 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 3 -
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 8 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 +-
+ arch/arm/mach-s5p64x0/dev-spi.c | 8 +-
+ arch/arm/mach-s5p64x0/dma.c | 7 +-
+ arch/arm/mach-s5p64x0/gpiolib.c | 7 +-
+ arch/arm/mach-s5p64x0/irq-eint.c | 3 +-
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 8 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 8 +-
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +-
+ arch/arm/mach-s5pv210/Kconfig | 6 -
+ arch/arm/mach-s5pv210/Makefile | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 8 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 6 +-
+ arch/arm/mach-tegra/board-harmony.c | 5 +-
+ arch/arm/mach-tegra/board-paz00-pinmux.c | 3 +
+ arch/arm/mach-tegra/board-paz00.c | 62 +-
+ arch/arm/mach-tegra/board-paz00.h | 16 +-
+ arch/arm/mach-tegra/board-seaboard-pinmux.c | 6 +-
+ arch/arm/mach-tegra/board-seaboard.c | 81 +-
+ arch/arm/mach-tegra/board-seaboard.h | 12 +-
+ arch/arm/mach-tegra/board-trimslice.c | 3 +-
+ arch/arm/mach-u300/Kconfig | 46 -
+ arch/arm/mach-u300/Makefile.boot | 17 +-
+ arch/arm/mach-u300/core.c | 82 +-
+ arch/arm/mach-u300/include/mach/memory.h | 22 +-
+ arch/arm/mach-u300/u300.c | 16 -
+ arch/arm/mach-ux500/Kconfig | 1 +
+ arch/arm/mach-ux500/Makefile | 3 +-
+ arch/arm/mach-ux500/board-mop500-pins.c | 34 +-
+ arch/arm/mach-ux500/board-mop500-sdi.c | 52 +-
+ arch/arm/mach-ux500/board-mop500.c | 78 +-
+ arch/arm/mach-ux500/board-mop500.h | 3 +
+ arch/arm/mach-ux500/cache-l2x0.c | 95 +
+ arch/arm/mach-ux500/cpu.c | 98 +-
+ arch/arm/mach-ux500/hotplug.c | 2 +-
+ arch/arm/mach-ux500/include/mach/db5500-regs.h | 2 +
+ arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 +
+ arch/arm/mach-ux500/include/mach/uncompress.h | 10 +-
+ arch/arm/mach-ux500/pins-db8500.h | 142 +-
+ arch/arm/mach-ux500/platsmp.c | 2 +-
+ arch/arm/mach-ux500/timer.c | 65 +
+ arch/arm/mach-vexpress/hotplug.c | 2 +-
+ arch/arm/plat-mxc/Kconfig | 39 +-
+ arch/arm/plat-mxc/audmux-v2.c | 18 +-
+ arch/arm/plat-mxc/cpu.c | 9 +
+ arch/arm/plat-mxc/devices.c | 14 -
+ arch/arm/plat-mxc/devices/Kconfig | 5 +-
+ arch/arm/plat-mxc/devices/Makefile | 1 +
+ arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 5 +
+ arch/arm/plat-mxc/devices/platform-imx-i2c.c | 6 +
+ arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 9 +
+ arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 +
+ arch/arm/plat-mxc/include/mach/common.h | 2 +-
+ arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
+ arch/arm/plat-mxc/include/mach/gpio.h | 8 -
+ arch/arm/plat-mxc/include/mach/hardware.h | 6 +
+ arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2270 +++++---------
+ arch/arm/plat-mxc/include/mach/iomux-mx53.h | 3530 +++++++-------------
+ arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 +
+ arch/arm/plat-mxc/include/mach/memory.h | 16 +-
+ arch/arm/plat-mxc/include/mach/mx25.h | 5 +
+ arch/arm/plat-mxc/include/mach/mx35.h | 2 +-
+ arch/arm/plat-mxc/include/mach/mx3x.h | 18 +-
+ arch/arm/plat-mxc/include/mach/mx51.h | 167 +-
+ arch/arm/plat-mxc/pwm.c | 2 +-
+ arch/arm/plat-nomadik/Kconfig | 8 +-
+ arch/arm/plat-nomadik/include/plat/mtu.h | 47 +-
+ arch/arm/plat-nomadik/include/plat/pincfg.h | 5 -
+ arch/arm/plat-nomadik/timer.c | 138 +-
+ arch/arm/plat-omap/devices.c | 46 -
+ arch/arm/plat-omap/dmtimer.c | 713 +++--
+ arch/arm/plat-omap/i2c.c | 8 +-
+ arch/arm/plat-omap/include/plat/clock.h | 2 -
+ arch/arm/plat-omap/include/plat/common.h | 13 +
+ arch/arm/plat-omap/include/plat/cpu.h | 108 +-
+ arch/arm/plat-omap/include/plat/dmtimer.h | 233 +-
+ arch/arm/plat-omap/include/plat/io.h | 2 +-
+ arch/arm/plat-omap/include/plat/mcbsp.h | 208 +-
+ arch/arm/plat-omap/include/plat/omap_device.h | 30 +-
+ arch/arm/plat-omap/include/plat/omap_hwmod.h | 3 -
+ arch/arm/plat-omap/include/plat/voltage.h | 20 +
+ arch/arm/plat-omap/mcbsp.c | 385 +--
+ arch/arm/plat-omap/omap_device.c | 185 +-
+ arch/arm/plat-s3c24xx/cpu.c | 9 +-
+ arch/arm/plat-s3c24xx/include/plat/map.h | 100 -
+ arch/arm/plat-s5p/cpu.c | 37 +-
+ arch/arm/plat-s5p/include/plat/exynos4.h | 5 +-
+ arch/arm/plat-s5p/include/plat/pll.h | 56 +-
+ arch/arm/plat-samsung/Makefile | 2 +-
+ arch/arm/plat-samsung/cpu.c | 58 +
+ arch/arm/plat-samsung/dev-hsmmc.c | 19 +-
+ arch/arm/plat-samsung/dev-hsmmc1.c | 19 +-
+ arch/arm/plat-samsung/dev-hsmmc2.c | 19 +-
+ arch/arm/plat-samsung/dev-hsmmc3.c | 19 +-
+ arch/arm/plat-samsung/dev-ts.c | 9 +
+ arch/arm/plat-samsung/include/plat/cpu.h | 105 +-
+ arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 6 -
+ arch/arm/plat-samsung/include/plat/map-s3c.h | 84 +
+ .../include/plat/map-s5p.h | 6 +-
+ arch/arm/plat-samsung/include/plat/sdhci.h | 7 +
+ arch/arm/plat-samsung/platformdata.c | 22 +
+ arch/arm/plat-versatile/platsmp.c | 2 +-
+ drivers/clocksource/Kconfig | 15 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/clksrc-dbx500-prcmu.c | 104 +
+ drivers/gpio/gpio-mxc.c | 12 +
+ drivers/gpio/gpio-mxs.c | 2 +
+ drivers/misc/Kconfig | 1 -
+ drivers/mmc/host/davinci_mmc.c | 13 +
+ drivers/tty/serial/msm_serial.c | 30 +-
+ drivers/usb/host/ohci-at91.c | 239 ++-
+ include/linux/clksrc-dbx500-prcmu.h | 22 +
+ include/linux/rtc/sirfsoc_rtciobrg.h | 18 +
+ 409 files changed, 13379 insertions(+), 12321 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/picoxcell.txt
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
+ create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
+ create mode 100644 arch/arm/boot/dts/picoxcell-pc3x2.dtsi
+ create mode 100644 arch/arm/boot/dts/picoxcell-pc3x3.dtsi
+ create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
+ create mode 100644 arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
+ create mode 100644 arch/arm/configs/at91sam9g45_defconfig
+ rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
+ delete mode 100644 arch/arm/configs/mx1_defconfig
+ delete mode 100644 arch/arm/configs/mx21_defconfig
+ rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
+ create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
+ delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
+ rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
+ create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
+ create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
+ create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
+ create mode 100644 arch/arm/mach-exynos4/mach-origen.c
+ create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
+ delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
+ create mode 100644 arch/arm/mach-imx/cpu-imx25.c
+ create mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c
+ create mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c
+ delete mode 100644 arch/arm/mach-mx5/devices.c
+ delete mode 100644 arch/arm/mach-mx5/devices.h
+ create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
+ create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
+ delete mode 100644 arch/arm/mach-nuc93x/Kconfig
+ delete mode 100644 arch/arm/mach-nuc93x/Makefile
+ delete mode 100644 arch/arm/mach-nuc93x/Makefile.boot
+ delete mode 100644 arch/arm/mach-nuc93x/clock.c
+ delete mode 100644 arch/arm/mach-nuc93x/clock.h
+ delete mode 100644 arch/arm/mach-nuc93x/cpu.c
+ delete mode 100644 arch/arm/mach-nuc93x/cpu.h
+ delete mode 100644 arch/arm/mach-nuc93x/dev.c
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/map.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/system.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h
+ delete mode 100644 arch/arm/mach-nuc93x/irq.c
+ delete mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c
+ delete mode 100644 arch/arm/mach-nuc93x/nuc932.c
+ delete mode 100644 arch/arm/mach-nuc93x/nuc932.h
+ delete mode 100644 arch/arm/mach-nuc93x/time.c
+ create mode 100644 arch/arm/mach-omap1/timer.c
+ create mode 100644 arch/arm/mach-omap2/clockdomains2420_data.c
+ create mode 100644 arch/arm/mach-omap2/clockdomains2430_data.c
+ create mode 100644 arch/arm/mach-omap2/clockdomains3xxx_data.c
+ create mode 100644 arch/arm/mach-omap2/vc.c
+ create mode 100644 arch/arm/mach-omap2/voltagedomains2xxx_data.c
+ create mode 100644 arch/arm/mach-omap2/vp.c
+ create mode 100644 arch/arm/mach-picoxcell/Makefile
+ create mode 100644 arch/arm/mach-picoxcell/Makefile.boot
+ create mode 100644 arch/arm/mach-picoxcell/common.c
+ create mode 100644 arch/arm/mach-picoxcell/common.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/debug-macro.S
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/entry-macro.S
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/io.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/map.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/memory.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/system.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/timex.h
+ create mode 100644 arch/arm/mach-picoxcell/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-picoxcell/io.c
+ create mode 100644 arch/arm/mach-picoxcell/time.c
+ create mode 100644 arch/arm/mach-prima2/pm.c
+ create mode 100644 arch/arm/mach-prima2/pm.h
+ create mode 100644 arch/arm/mach-prima2/rtciobrg.c
+ create mode 100644 arch/arm/mach-prima2/sleep.S
+ delete mode 100644 arch/arm/mach-s3c2410/gpio.c
+ delete mode 100644 arch/arm/mach-s3c2412/gpio.c
+ create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
+ create mode 100644 arch/arm/mach-ux500/timer.c
+ create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
+ create mode 100644 arch/arm/plat-omap/include/plat/voltage.h
+ delete mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h
+ create mode 100644 arch/arm/plat-samsung/cpu.c
+ create mode 100644 arch/arm/plat-samsung/include/plat/map-s3c.h
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%)
+ create mode 100644 drivers/clocksource/clksrc-dbx500-prcmu.c
+ create mode 100644 include/linux/clksrc-dbx500-prcmu.h
+ create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
+$ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
+Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm/mach-msm/board-msm8x60.c
+$ git add .
+$ git commit -v -a --amend
+[master f2f5c1e] Merge remote-tracking branch 'arm-soc/for-next'
+$ git reset --hard HEAD^
+HEAD is now at 7863d89 Merge remote-tracking branch 'arm-lpae/for-next'
+Merging refs/next/20110930/arm-soc
+$ git merge refs/next/20110930/arm-soc
+Auto-merging Documentation/devicetree/bindings/arm/l2cc.txt
+CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/configs/imx_v4_v5_defconfig
+Removing arch/arm/configs/mx1_defconfig
+Removing arch/arm/configs/mx21_defconfig
+Auto-merging arch/arm/configs/mx5_defconfig
+Auto-merging arch/arm/mach-at91/at91cap9_devices.c
+Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
+Auto-merging arch/arm/mach-at91/board-usb-a926x.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Auto-merging arch/arm/mach-davinci/dm355.c
+Auto-merging arch/arm/mach-davinci/dm644x.c
+Auto-merging arch/arm/mach-davinci/dm646x.c
+Auto-merging arch/arm/mach-exynos4/clock.c
+Removing arch/arm/mach-exynos4/mach-smdkc210.c
+Auto-merging arch/arm/mach-msm/board-msm8x60.c
+CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
+Removing arch/arm/mach-mx5/devices.c
+Removing arch/arm/mach-mx5/devices.h
+Auto-merging arch/arm/mach-mxs/include/mach/gpio.h
+CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
+Removing arch/arm/mach-nuc93x/Kconfig
+Removing arch/arm/mach-nuc93x/Makefile
+CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
+Removing arch/arm/mach-nuc93x/clock.c
+Removing arch/arm/mach-nuc93x/clock.h
+Removing arch/arm/mach-nuc93x/cpu.c
+Removing arch/arm/mach-nuc93x/cpu.h
+Removing arch/arm/mach-nuc93x/dev.c
+Removing arch/arm/mach-nuc93x/include/mach/entry-macro.S
+Removing arch/arm/mach-nuc93x/include/mach/hardware.h
+Removing arch/arm/mach-nuc93x/include/mach/io.h
+Removing arch/arm/mach-nuc93x/include/mach/irqs.h
+Removing arch/arm/mach-nuc93x/include/mach/map.h
+Removing arch/arm/mach-nuc93x/include/mach/memory.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-clock.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-ebi.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-irq.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-serial.h
+Removing arch/arm/mach-nuc93x/include/mach/regs-timer.h
+Removing arch/arm/mach-nuc93x/include/mach/system.h
+Removing arch/arm/mach-nuc93x/include/mach/timex.h
+Removing arch/arm/mach-nuc93x/include/mach/uncompress.h
+Removing arch/arm/mach-nuc93x/include/mach/vmalloc.h
+Removing arch/arm/mach-nuc93x/irq.c
+Removing arch/arm/mach-nuc93x/mach-nuc932evb.c
+Removing arch/arm/mach-nuc93x/nuc932.c
+Removing arch/arm/mach-nuc93x/nuc932.h
+Removing arch/arm/mach-nuc93x/time.c
+Auto-merging arch/arm/mach-omap2/board-generic.c
+Auto-merging arch/arm/mach-omap2/board-h4.c
+Auto-merging arch/arm/mach-omap2/board-ldp.c
+Removing arch/arm/mach-s3c2410/gpio.c
+Removing arch/arm/mach-s3c2412/gpio.c
+Auto-merging arch/arm/mach-tegra/board-harmony.c
+Auto-merging arch/arm/mach-tegra/board-paz00.c
+Auto-merging arch/arm/mach-tegra/board-paz00.h
+CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
+Auto-merging arch/arm/mach-tegra/board-seaboard.h
+CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
+Auto-merging arch/arm/mach-tegra/board-trimslice.c
+Auto-merging arch/arm/mach-u300/Kconfig
+Auto-merging arch/arm/mach-u300/Makefile.boot
+CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
+Auto-merging arch/arm/mach-u300/core.c
+Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+Auto-merging arch/arm/mach-vexpress/hotplug.c
+Auto-merging arch/arm/mm/cache-l2x0.c
+CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
+Auto-merging arch/arm/plat-mxc/include/mach/gpio.h
+CONFLICT (content): Merge cResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
+Resolved 'arch/arm/mach-msm/board-msm8x60.c' using previous resolution.
+Resolved 'arch/arm/mach-mxs/include/mach/gpio.h' using previous resolution.
+Resolved 'arch/arm/mach-tegra/board-paz00.h' using previous resolution.
+Resolved 'arch/arm/mach-tegra/board-seaboard.h' using previous resolution.
+Resolved 'arch/arm/mach-u300/Makefile.boot' using previous resolution.
+Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution.
+Resolved 'arch/arm/plat-mxc/include/mach/gpio.h' using previous resolution.
+onflict in arch/arm/plat-mxc/include/mach/gpio.h
+Removing arch/arm/plat-s3c24xx/include/plat/map.h
+Auto-merging arch/arm/plat-samsung/include/plat/map-s5p.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
+Documentation/devicetree/bindings/arm/l2cc.txt: needs merge
+arch/arm/mach-at91/board-usb-a9260.c: needs merge
+arch/arm/mach-msm/board-msm8x60.c: needs merge
+arch/arm/mach-mxs/include/mach/gpio.h: needs merge
+arch/arm/mach-nuc93x/Makefile.boot: needs merge
+arch/arm/mach-tegra/board-paz00.h: needs merge
+arch/arm/mach-tegra/board-seaboard.h: needs merge
+arch/arm/mach-u300/Makefile.boot: needs merge
+arch/arm/mm/cache-l2x0.c: needs merge
+arch/arm/plat-mxc/include/mach/gpio.h: needs merge
+rm 'arch/arm/mach-at91/board-usb-a9260.c'
+rm 'arch/arm/mach-nuc93x/Makefile.boot'
+$ git commit -v -a
+[master 171c394] Merge commit 'refs/next/20110930/arm-soc'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/tty/serial/msm_serial.txt | 27 +
+ arch/arm/Kconfig | 11 +-
+ arch/arm/Makefile | 5 +-
+ arch/arm/boot/dts/msm8660-surf.dts | 24 +
+ arch/arm/boot/dts/prima2-cb.dts | 9 +-
+ arch/arm/boot/dts/tegra-harmony.dts | 1 +
+ arch/arm/boot/dts/tegra-seaboard.dts | 4 +
+ arch/arm/configs/exynos4_defconfig | 1 +
+ .../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +-
+ arch/arm/configs/mx1_defconfig | 91 -
+ arch/arm/configs/mx21_defconfig | 97 -
+ arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 +-
+ arch/arm/mach-at91/Kconfig | 13 +
+ arch/arm/mach-at91/Makefile | 6 +-
+ arch/arm/mach-at91/at91cap9.c | 2 +
+ arch/arm/mach-at91/at91cap9_devices.c | 6 +
+ arch/arm/mach-at91/at91rm9200.c | 2 +
+ arch/arm/mach-at91/at91rm9200_devices.c | 8 +
+ arch/arm/mach-at91/at91sam9260.c | 2 +
+ arch/arm/mach-at91/at91sam9260_devices.c | 8 +
+ arch/arm/mach-at91/at91sam9261.c | 29 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 8 +
+ arch/arm/mach-at91/at91sam9263.c | 2 +
+ arch/arm/mach-at91/at91sam9263_devices.c | 6 +
+ arch/arm/mach-at91/at91sam9g45.c | 2 +
+ arch/arm/mach-at91/at91sam9g45_devices.c | 6 +
+ arch/arm/mach-at91/board-rsi-ews.c | 233 ++
+ arch/arm/mach-at91/board-usb-a9260.c | 230 --
+ .../{board-usb-a9263.c => board-usb-a926x.c} | 179 +-
+ arch/arm/mach-at91/include/mach/board.h | 5 +
+ arch/arm/mach-at91/include/mach/timex.h | 5 +
+ arch/arm/mach-davinci/Kconfig | 10 +
+ arch/arm/mach-davinci/board-da850-evm.c | 114 +
+ arch/arm/mach-davinci/da850.c | 9 +
+ arch/arm/mach-davinci/devices-da8xx.c | 3 +
+ arch/arm/mach-davinci/devices-tnetv107x.c | 1 +
+ arch/arm/mach-davinci/dm355.c | 1 +
+ arch/arm/mach-davinci/dm644x.c | 1 +
+ arch/arm/mach-davinci/dm646x.c | 1 +
+ arch/arm/mach-davinci/dma.c | 5 +-
+ arch/arm/mach-davinci/include/mach/mmc.h | 3 +
+ arch/arm/mach-davinci/include/mach/mux.h | 10 +
+ arch/arm/mach-exynos4/Kconfig | 57 +-
+ arch/arm/mach-exynos4/Makefile | 11 +-
+ arch/arm/mach-exynos4/clock-exynos4210.c | 139 +
+ arch/arm/mach-exynos4/clock-exynos4212.c | 118 +
+ arch/arm/mach-exynos4/clock.c | 218 +-
+ arch/arm/mach-exynos4/cpu.c | 40 +-
+ arch/arm/mach-exynos4/hotplug.c | 2 +-
+ arch/arm/mach-exynos4/include/mach/exynos4-clock.h | 43 +
+ arch/arm/mach-exynos4/include/mach/map.h | 3 +-
+ arch/arm/mach-exynos4/include/mach/regs-clock.h | 54 +-
+ arch/arm/mach-exynos4/mach-origen.c | 108 +
+ arch/arm/mach-exynos4/mach-smdk4212.c | 292 ++
+ arch/arm/mach-exynos4/mach-smdkc210.c | 309 --
+ arch/arm/mach-exynos4/mach-smdkv310.c | 78 +
+ arch/arm/mach-exynos4/platsmp.c | 10 +-
+ arch/arm/mach-exynos4/pm.c | 79 +-
+ arch/arm/mach-imx/Kconfig | 51 +-
+ arch/arm/mach-imx/Makefile | 10 +-
+ arch/arm/mach-imx/cache-l2x0.c | 2 +-
+ arch/arm/mach-imx/clock-imx25.c | 6 +
+ arch/arm/mach-imx/clock-imx27.c | 6 +-
+ arch/arm/mach-imx/clock-imx31.c | 8 +-
+ arch/arm/mach-imx/clock-imx35.c | 7 +-
+ arch/arm/mach-imx/cpu-imx25.c | 41 +
+ arch/arm/mach-imx/cpu-imx27.c | 28 +-
+ arch/arm/mach-imx/cpu-imx31.c | 49 +-
+ arch/arm/mach-imx/cpu-imx35.c | 30 +-
+ arch/arm/mach-imx/devices-imx27.h | 4 +
+ arch/arm/mach-imx/devices-imx31.h | 4 +
+ arch/arm/mach-imx/devices-imx35.h | 4 +
+ arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
+ arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
+ arch/arm/mach-imx/mach-mx1ads.c | 15 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c | 10 +
+ arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-vpr200.c | 2 +-
+ arch/arm/mach-msm/board-msm8x60.c | 58 +-
+ arch/arm/mach-msm/hotplug.c | 2 +-
+ arch/arm/mach-msm/platsmp.c | 2 +-
+ arch/arm/mach-mx5/Kconfig | 29 +-
+ arch/arm/mach-mx5/Makefile | 2 +-
+ arch/arm/mach-mx5/board-cpuimx51.c | 27 +-
+ arch/arm/mach-mx5/board-cpuimx51sd.c | 25 +-
+ arch/arm/mach-mx5/board-mx51_3ds.c | 1 -
+ arch/arm/mach-mx5/board-mx51_babbage.c | 26 +-
+ arch/arm/mach-mx5/board-mx51_efikamx.c | 13 +-
+ arch/arm/mach-mx5/board-mx51_efikasb.c | 24 +-
+ arch/arm/mach-mx5/board-mx53_ard.c | 4 +-
+ arch/arm/mach-mx5/board-mx53_loco.c | 20 +
+ arch/arm/mach-mx5/clock-mx51-mx53.c | 14 +-
+ arch/arm/mach-mx5/cpu.c | 74 +-
+ arch/arm/mach-mx5/devices-imx51.h | 17 +
+ arch/arm/mach-mx5/devices-imx53.h | 4 +
+ arch/arm/mach-mx5/devices.c | 120 -
+ arch/arm/mach-mx5/devices.h | 5 -
+ arch/arm/mach-mx5/ehci.c | 2 +-
+ arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 3 +-
+ arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +-
+ arch/arm/mach-mx5/mm.c | 8 +-
+ arch/arm/mach-mx5/mx51_efika.c | 20 +-
+ arch/arm/mach-mx5/pm-imx5.c | 15 +-
+ arch/arm/mach-mxs/Kconfig | 6 +
+ arch/arm/mach-mxs/clock-mx28.c | 8 +-
+ arch/arm/mach-mxs/devices-mx23.h | 2 +
+ arch/arm/mach-mxs/devices-mx28.h | 5 +
+ arch/arm/mach-mxs/devices/Kconfig | 6 +
+ arch/arm/mach-mxs/devices/Makefile | 2 +
+ arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 +
+ arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 +
+ arch/arm/mach-mxs/include/mach/devices-common.h | 12 +
+ arch/arm/mach-mxs/include/mach/gpio.h | 4 -
+ arch/arm/mach-mxs/include/mach/mxs.h | 2 +
+ arch/arm/mach-mxs/mach-mx23evk.c | 2 +-
+ arch/arm/mach-mxs/mach-mx28evk.c | 79 +-
+ arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 +-
+ arch/arm/mach-mxs/mach-tx28.c | 1 +
+ arch/arm/mach-nuc93x/Kconfig | 19 -
+ arch/arm/mach-nuc93x/Makefile | 14 -
+ arch/arm/mach-nuc93x/Makefile.boot | 3 -
+ arch/arm/mach-nuc93x/clock.c | 83 -
+ arch/arm/mach-nuc93x/clock.h | 36 -
+ arch/arm/mach-nuc93x/cpu.c | 135 -
+ arch/arm/mach-nuc93x/cpu.h | 48 -
+ arch/arm/mach-nuc93x/dev.c | 42 -
+ arch/arm/mach-nuc93x/include/mach/entry-macro.S | 32 -
+ arch/arm/mach-nuc93x/include/mach/hardware.h | 22 -
+ arch/arm/mach-nuc93x/include/mach/io.h | 28 -
+ arch/arm/mach-nuc93x/include/mach/irqs.h | 59 -
+ arch/arm/mach-nuc93x/include/mach/map.h | 139 -
+ arch/arm/mach-nuc93x/include/mach/memory.h | 21 -
+ arch/arm/mach-nuc93x/include/mach/regs-clock.h | 53 -
+ arch/arm/mach-nuc93x/include/mach/regs-ebi.h | 33 -
+ arch/arm/mach-nuc93x/include/mach/regs-irq.h | 42 -
+ arch/arm/mach-nuc93x/include/mach/regs-serial.h | 52 -
+ arch/arm/mach-nuc93x/include/mach/regs-timer.h | 28 -
+ arch/arm/mach-nuc93x/include/mach/system.h | 28 -
+ arch/arm/mach-nuc93x/include/mach/timex.h | 25 -
+ arch/arm/mach-nuc93x/include/mach/uncompress.h | 50 -
+ arch/arm/mach-nuc93x/include/mach/vmalloc.h | 23 -
+ arch/arm/mach-nuc93x/irq.c | 66 -
+ arch/arm/mach-nuc93x/mach-nuc932evb.c | 42 -
+ arch/arm/mach-nuc93x/nuc932.c | 65 -
+ arch/arm/mach-nuc93x/nuc932.h | 29 -
+ arch/arm/mach-nuc93x/time.c | 100 -
+ arch/arm/mach-omap2/Makefile | 86 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 9 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 9 +-
+ arch/arm/mach-omap2/board-3630sdp.c | 11 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 9 +-
+ arch/arm/mach-omap2/board-am3517crane.c | 9 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 8 +-
+ arch/arm/mach-omap2/board-apollon.c | 9 +-
+ arch/arm/mach-omap2/board-cm-t35.c | 13 +-
+ arch/arm/mach-omap2/board-cm-t3517.c | 9 +-
+ arch/arm/mach-omap2/board-devkit8000.c | 12 +-
+ arch/arm/mach-omap2/board-generic.c | 2 +-
+ arch/arm/mach-omap2/board-h4.c | 9 +-
+ arch/arm/mach-omap2/board-igep0020.c | 13 +-
+ arch/arm/mach-omap2/board-ldp.c | 9 +-
+ arch/arm/mach-omap2/board-n8x0.c | 13 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 4 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 9 +-
+ arch/arm/mach-omap2/board-omap3logic.c | 11 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 11 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 9 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c | 11 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 9 +-
+ arch/arm/mach-omap2/board-overo.c | 11 +-
+ arch/arm/mach-omap2/board-rm680.c | 17 +-
+ arch/arm/mach-omap2/board-rx51.c | 17 +-
+ arch/arm/mach-omap2/board-ti8168evm.c | 9 +-
+ arch/arm/mach-omap2/board-zoom.c | 23 +-
+ arch/arm/mach-omap2/clock3xxx_data.c | 11 +-
+ arch/arm/mach-omap2/clockdomain.c | 147 +-
+ arch/arm/mach-omap2/clockdomain.h | 22 +-
+ arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 4 -
+ arch/arm/mach-omap2/clockdomain44xx.c | 2 -
+ arch/arm/mach-omap2/clockdomains2420_data.c | 154 +
+ arch/arm/mach-omap2/clockdomains2430_data.c | 181 +
+ arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 803 +-----
+ arch/arm/mach-omap2/clockdomains3xxx_data.c | 398 +++
+ arch/arm/mach-omap2/clockdomains44xx_data.c | 409 +--
+ arch/arm/mach-omap2/id.c | 191 +-
+ arch/arm/mach-omap2/io.c | 57 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 3 -
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 37 -
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 45 -
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 173 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 82 -
+ arch/arm/mach-omap2/omap_twl.c | 107 +-
+ arch/arm/mach-omap2/pm.c | 6 +-
+ arch/arm/mach-omap2/powerdomain-common.c | 7 +-
+ arch/arm/mach-omap2/powerdomain.c | 110 +-
+ arch/arm/mach-omap2/powerdomain.h | 19 +-
+ arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 2 +-
+ arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 21 +-
+ arch/arm/mach-omap2/powerdomains2xxx_data.c | 48 +-
+ arch/arm/mach-omap2/powerdomains3xxx_data.c | 97 +-
+ arch/arm/mach-omap2/powerdomains44xx_data.c | 36 +-
+ arch/arm/mach-omap2/prm2xxx_3xxx.c | 56 +
+ arch/arm/mach-omap2/prm2xxx_3xxx.h | 12 +
+ arch/arm/mach-omap2/prm44xx.c | 71 +
+ arch/arm/mach-omap2/prm44xx.h | 12 +
+ arch/arm/mach-omap2/smartreflex-class3.c | 4 +-
+ arch/arm/mach-omap2/smartreflex.c | 29 +-
+ arch/arm/mach-omap2/sr_device.c | 2 +-
+ arch/arm/mach-omap2/vc.c | 367 ++
+ arch/arm/mach-omap2/vc.h | 88 +-
+ arch/arm/mach-omap2/vc3xxx_data.c | 31 +-
+ arch/arm/mach-omap2/vc44xx_data.c | 44 +-
+ arch/arm/mach-omap2/voltage.c | 1088 ++-----
+ arch/arm/mach-omap2/voltage.h | 138 +-
+ arch/arm/mach-omap2/voltagedomains2xxx_data.c | 32 +
+ arch/arm/mach-omap2/voltagedomains3xxx_data.c | 83 +-
+ arch/arm/mach-omap2/voltagedomains44xx_data.c | 99 +-
+ arch/arm/mach-omap2/vp.c | 278 ++
+ arch/arm/mach-omap2/vp.h | 133 +-
+ arch/arm/mach-omap2/vp3xxx_data.c | 35 +-
+ arch/arm/mach-omap2/vp44xx_data.c | 47 +-
+ arch/arm/mach-prima2/Makefile | 2 +
+ arch/arm/mach-prima2/irq.c | 43 +
+ arch/arm/mach-prima2/pm.c | 149 +
+ arch/arm/mach-prima2/pm.h | 29 +
+ arch/arm/mach-prima2/rtciobrg.c | 139 +
+ arch/arm/mach-prima2/sleep.S | 64 +
+ arch/arm/mach-prima2/timer.c | 34 +
+ arch/arm/mach-realview/hotplug.c | 2 +-
+ arch/arm/mach-s3c2410/Kconfig | 6 -
+ arch/arm/mach-s3c2410/Makefile | 1 -
+ arch/arm/mach-s3c2410/dma.c | 14 -
+ arch/arm/mach-s3c2410/gpio.c | 72 -
+ arch/arm/mach-s3c2410/include/mach/map.h | 52 +-
+ arch/arm/mach-s3c2412/Kconfig | 1 -
+ arch/arm/mach-s3c2412/Makefile | 1 -
+ arch/arm/mach-s3c2412/dma.c | 18 -
+ arch/arm/mach-s3c2412/gpio.c | 62 -
+ arch/arm/mach-s3c2440/Kconfig | 2 -
+ arch/arm/mach-s3c2440/dma.c | 17 -
+ arch/arm/mach-s3c2443/dma.c | 27 -
+ arch/arm/mach-s3c64xx/cpu.c | 22 +-
+ arch/arm/mach-s3c64xx/include/mach/map.h | 9 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 3 -
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 8 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 +-
+ arch/arm/mach-s5p64x0/dev-spi.c | 8 +-
+ arch/arm/mach-s5p64x0/dma.c | 7 +-
+ arch/arm/mach-s5p64x0/gpiolib.c | 7 +-
+ arch/arm/mach-s5p64x0/irq-eint.c | 3 +-
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 8 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 8 +-
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 8 +-
+ arch/arm/mach-s5pv210/Kconfig | 6 -
+ arch/arm/mach-s5pv210/Makefile | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 8 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 6 +-
+ arch/arm/mach-tegra/board-harmony.c | 5 +-
+ arch/arm/mach-tegra/board-paz00-pinmux.c | 3 +
+ arch/arm/mach-tegra/board-paz00.c | 62 +-
+ arch/arm/mach-tegra/board-paz00.h | 16 +-
+ arch/arm/mach-tegra/board-seaboard-pinmux.c | 6 +-
+ arch/arm/mach-tegra/board-seaboard.c | 81 +-
+ arch/arm/mach-tegra/board-seaboard.h | 12 +-
+ arch/arm/mach-tegra/board-trimslice.c | 3 +-
+ arch/arm/mach-u300/Kconfig | 46 -
+ arch/arm/mach-u300/Makefile.boot | 17 +-
+ arch/arm/mach-u300/core.c | 82 +-
+ arch/arm/mach-u300/include/mach/memory.h | 22 +-
+ arch/arm/mach-u300/u300.c | 16 -
+ arch/arm/mach-ux500/Kconfig | 1 +
+ arch/arm/mach-ux500/Makefile | 1 +
+ arch/arm/mach-ux500/board-mop500-pins.c | 34 +-
+ arch/arm/mach-ux500/board-mop500-sdi.c | 52 +-
+ arch/arm/mach-ux500/board-mop500.c | 78 +-
+ arch/arm/mach-ux500/board-mop500.h | 3 +
+ arch/arm/mach-ux500/cache-l2x0.c | 95 +
+ arch/arm/mach-ux500/cpu.c | 69 -
+ arch/arm/mach-ux500/hotplug.c | 2 +-
+ arch/arm/mach-ux500/include/mach/uncompress.h | 10 +-
+ arch/arm/mach-ux500/pins-db8500.h | 142 +-
+ arch/arm/mach-ux500/platsmp.c | 2 +-
+ arch/arm/mach-vexpress/hotplug.c | 2 +-
+ arch/arm/plat-mxc/Kconfig | 39 +-
+ arch/arm/plat-mxc/audmux-v2.c | 18 +-
+ arch/arm/plat-mxc/cpu.c | 9 +
+ arch/arm/plat-mxc/devices.c | 14 -
+ arch/arm/plat-mxc/devices/Kconfig | 5 +-
+ arch/arm/plat-mxc/devices/Makefile | 1 +
+ arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 5 +
+ arch/arm/plat-mxc/devices/platform-imx-i2c.c | 6 +
+ arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 9 +
+ arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 +
+ arch/arm/plat-mxc/include/mach/common.h | 2 +-
+ arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
+ arch/arm/plat-mxc/include/mach/gpio.h | 8 -
+ arch/arm/plat-mxc/include/mach/hardware.h | 6 +
+ arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2270 +++++---------
+ arch/arm/plat-mxc/include/mach/iomux-mx53.h | 3530 +++++++-------------
+ arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 +
+ arch/arm/plat-mxc/include/mach/memory.h | 16 +-
+ arch/arm/plat-mxc/include/mach/mx25.h | 5 +
+ arch/arm/plat-mxc/include/mach/mx35.h | 2 +-
+ arch/arm/plat-mxc/include/mach/mx3x.h | 18 +-
+ arch/arm/plat-mxc/include/mach/mx51.h | 167 +-
+ arch/arm/plat-mxc/pwm.c | 2 +-
+ arch/arm/plat-nomadik/include/plat/pincfg.h | 5 -
+ arch/arm/plat-omap/include/plat/clock.h | 2 -
+ arch/arm/plat-omap/include/plat/common.h | 9 +
+ arch/arm/plat-omap/include/plat/cpu.h | 108 +-
+ arch/arm/plat-omap/include/plat/io.h | 2 +-
+ arch/arm/plat-omap/include/plat/omap_hwmod.h | 3 -
+ arch/arm/plat-omap/include/plat/voltage.h | 20 +
+ arch/arm/plat-s3c24xx/cpu.c | 9 +-
+ arch/arm/plat-s3c24xx/include/plat/map.h | 100 -
+ arch/arm/plat-s5p/cpu.c | 37 +-
+ arch/arm/plat-s5p/include/plat/exynos4.h | 5 +-
+ arch/arm/plat-s5p/include/plat/pll.h | 56 +-
+ arch/arm/plat-samsung/Makefile | 2 +-
+ arch/arm/plat-samsung/cpu.c | 58 +
+ arch/arm/plat-samsung/dev-hsmmc.c | 19 +-
+ arch/arm/plat-samsung/dev-hsmmc1.c | 19 +-
+ arch/arm/plat-samsung/dev-hsmmc2.c | 19 +-
+ arch/arm/plat-samsung/dev-hsmmc3.c | 19 +-
+ arch/arm/plat-samsung/dev-ts.c | 9 +
+ arch/arm/plat-samsung/include/plat/cpu.h | 105 +-
+ arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 6 -
+ arch/arm/plat-samsung/include/plat/map-s3c.h | 84 +
+ .../include/plat/map-s5p.h | 6 +-
+ arch/arm/plat-samsung/include/plat/sdhci.h | 7 +
+ arch/arm/plat-samsung/platformdata.c | 22 +
+ arch/arm/plat-versatile/platsmp.c | 2 +-
+ drivers/gpio/gpio-mxc.c | 12 +
+ drivers/gpio/gpio-mxs.c | 2 +
+ drivers/mmc/host/davinci_mmc.c | 13 +
+ drivers/tty/serial/msm_serial.c | 30 +-
+ drivers/usb/host/ohci-at91.c | 239 ++-
+ include/linux/rtc/sirfsoc_rtciobrg.h | 18 +
+ 339 files changed, 9354 insertions(+), 11059 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/msm_serial.txt
+ create mode 100644 arch/arm/boot/dts/msm8660-surf.dts
+ rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
+ delete mode 100644 arch/arm/configs/mx1_defconfig
+ delete mode 100644 arch/arm/configs/mx21_defconfig
+ rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
+ create mode 100644 arch/arm/mach-at91/board-rsi-ews.c
+ delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
+ rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (54%)
+ create mode 100644 arch/arm/mach-exynos4/clock-exynos4210.c
+ create mode 100644 arch/arm/mach-exynos4/clock-exynos4212.c
+ create mode 100644 arch/arm/mach-exynos4/include/mach/exynos4-clock.h
+ create mode 100644 arch/arm/mach-exynos4/mach-origen.c
+ create mode 100644 arch/arm/mach-exynos4/mach-smdk4212.c
+ delete mode 100644 arch/arm/mach-exynos4/mach-smdkc210.c
+ create mode 100644 arch/arm/mach-imx/cpu-imx25.c
+ delete mode 100644 arch/arm/mach-mx5/devices.c
+ delete mode 100644 arch/arm/mach-mx5/devices.h
+ create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
+ create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
+ delete mode 100644 arch/arm/mach-nuc93x/Kconfig
+ delete mode 100644 arch/arm/mach-nuc93x/Makefile
+ delete mode 100644 arch/arm/mach-nuc93x/Makefile.boot
+ delete mode 100644 arch/arm/mach-nuc93x/clock.c
+ delete mode 100644 arch/arm/mach-nuc93x/clock.h
+ delete mode 100644 arch/arm/mach-nuc93x/cpu.c
+ delete mode 100644 arch/arm/mach-nuc93x/cpu.h
+ delete mode 100644 arch/arm/mach-nuc93x/dev.c
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/map.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/system.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h
+ delete mode 100644 arch/arm/mach-nuc93x/irq.c
+ delete mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c
+ delete mode 100644 arch/arm/mach-nuc93x/nuc932.c
+ delete mode 100644 arch/arm/mach-nuc93x/nuc932.h
+ delete mode 100644 arch/arm/mach-nuc93x/time.c
+ create mode 100644 arch/arm/mach-omap2/clockdomains2420_data.c
+ create mode 100644 arch/arm/mach-omap2/clockdomains2430_data.c
+ create mode 100644 arch/arm/mach-omap2/clockdomains3xxx_data.c
+ create mode 100644 arch/arm/mach-omap2/vc.c
+ create mode 100644 arch/arm/mach-omap2/voltagedomains2xxx_data.c
+ create mode 100644 arch/arm/mach-omap2/vp.c
+ create mode 100644 arch/arm/mach-prima2/pm.c
+ create mode 100644 arch/arm/mach-prima2/pm.h
+ create mode 100644 arch/arm/mach-prima2/rtciobrg.c
+ create mode 100644 arch/arm/mach-prima2/sleep.S
+ delete mode 100644 arch/arm/mach-s3c2410/gpio.c
+ delete mode 100644 arch/arm/mach-s3c2412/gpio.c
+ create mode 100644 arch/arm/mach-ux500/cache-l2x0.c
+ create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
+ create mode 100644 arch/arm/plat-omap/include/plat/voltage.h
+ delete mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h
+ create mode 100644 arch/arm/plat-samsung/cpu.c
+ create mode 100644 arch/arm/plat-samsung/include/plat/map-s3c.h
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/map-s5p.h (94%)
+ create mode 100644 include/linux/rtc/sirfsoc_rtciobrg.h
+$ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch
+Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm/mach-msm/board-msm8x60.c
+$ git add .
+$ git commit -v -a --amend
+[master 88b5f56] Merge commit 'refs/next/20110930/arm-soc'
+Merging at91/at91-next
+$ git merge at91/at91-next
+Auto-merging arch/arm/mach-at91/at91cap9.c
+Auto-merging arch/arm/mach-at91/at91cap9_devices.c
+Auto-merging arch/arm/mach-at91/at91rm9200.c
+Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9260.c
+Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9261.c
+Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263.c
+Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9g45.c
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
+Auto-merging arch/arm/mach-at91/board-1arm.c
+Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
+Auto-merging arch/arm/mach-at91/board-cam60.c
+Auto-merging arch/arm/mach-at91/board-cap9adk.c
+Auto-merging arch/arm/mach-at91/board-carmeva.c
+Auto-merging arch/arm/mach-at91/board-cpu9krea.c
+Auto-merging arch/arm/mach-at91/board-cpuat91.c
+Auto-merging arch/arm/mach-at91/board-csb337.c
+Auto-merging arch/arm/mach-at91/board-csb637.c
+Auto-merging arch/arm/mach-at91/board-eb9200.c
+Auto-merging arch/arm/mach-at91/board-ecbat91.c
+Auto-merging arch/arm/mach-at91/board-kafa.c
+Auto-merging arch/arm/mach-at91/board-kb9202.c
+Auto-merging arch/arm/mach-at91/board-neocore926.c
+Auto-merging arch/arm/mach-at91/board-picotux200.c
+Auto-merging arch/arm/mach-at91/board-qil-a9260.c
+Auto-merging arch/arm/mach-at91/board-rm9200dk.c
+Auto-merging arch/arm/mach-at91/board-rm9200ek.c
+Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
+Auto-merging arch/arm/mach-at91/board-sam9260ek.c
+Auto-merging arch/arm/mach-at91/board-sam9261ek.c
+Auto-merging arch/arm/mach-at91/board-sam9263ek.c
+Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
+Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
+Auto-merging arch/arm/mach-at91/board-sam9rlek.c
+Auto-merging arch/arm/mach-at91/board-usb-a926x.c
+Auto-merging arch/arm/mach-at91/board-yl-9200.c
+Auto-merging arch/arm/mach-at91/gpio.c
+Auto-merging arch/arm/mach-at91/include/mach/at91sam9g45.h
+Auto-merging arch/arm/mach-at91/include/mach/gpio.h
+Auto-merging drivers/ata/pata_at91.c
+Auto-merging drivers/ide/at91_ide.c
+Auto-merging drivers/usb/host/ohci-at91.c
+Merge made by recursive.
+ arch/arm/mach-at91/at91cap9.c | 8 +-
+ arch/arm/mach-at91/at91cap9_devices.c | 20 +-
+ arch/arm/mach-at91/at91rm9200.c | 8 +-
+ arch/arm/mach-at91/at91rm9200_devices.c | 22 +-
+ arch/arm/mach-at91/at91sam9260.c | 6 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 26 +-
+ arch/arm/mach-at91/at91sam9261.c | 6 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 14 +-
+ arch/arm/mach-at91/at91sam9263.c | 10 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 26 +-
+ arch/arm/mach-at91/at91sam9g45.c | 10 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 20 +-
+ arch/arm/mach-at91/at91sam9rl.c | 8 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 16 +-
+ arch/arm/mach-at91/board-1arm.c | 1 +
+ arch/arm/mach-at91/board-afeb-9260v1.c | 7 +-
+ arch/arm/mach-at91/board-cam60.c | 3 +-
+ arch/arm/mach-at91/board-cap9adk.c | 14 +-
+ arch/arm/mach-at91/board-carmeva.c | 6 +-
+ arch/arm/mach-at91/board-cpu9krea.c | 7 +-
+ arch/arm/mach-at91/board-cpuat91.c | 4 +
+ arch/arm/mach-at91/board-csb337.c | 4 +-
+ arch/arm/mach-at91/board-csb637.c | 1 +
+ arch/arm/mach-at91/board-eb9200.c | 8 +-
+ arch/arm/mach-at91/board-ecbat91.c | 4 +
+ arch/arm/mach-at91/board-eco920.c | 4 +
+ arch/arm/mach-at91/board-flexibity.c | 4 +-
+ arch/arm/mach-at91/board-foxg20.c | 6 +-
+ arch/arm/mach-at91/board-gsia18s.c | 4 +-
+ arch/arm/mach-at91/board-kafa.c | 1 +
+ arch/arm/mach-at91/board-kb9202.c | 5 +-
+ arch/arm/mach-at91/board-neocore926.c | 4 +-
+ arch/arm/mach-at91/board-pcontrol-g20.c | 1 +
+ arch/arm/mach-at91/board-picotux200.c | 2 +
+ arch/arm/mach-at91/board-qil-a9260.c | 11 +-
+ arch/arm/mach-at91/board-rm9200dk.c | 10 +-
+ arch/arm/mach-at91/board-rm9200ek.c | 2 +
+ arch/arm/mach-at91/board-sam9-l9260.c | 7 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 11 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 8 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 7 +-
+ arch/arm/mach-at91/board-sam9g20ek.c | 8 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 3 +
+ arch/arm/mach-at91/board-sam9rlek.c | 7 +-
+ arch/arm/mach-at91/board-snapper9260.c | 5 +
+ arch/arm/mach-at91/board-stamp9g20.c | 11 +-
+ arch/arm/mach-at91/board-usb-a926x.c | 5 +-
+ arch/arm/mach-at91/board-yl-9200.c | 6 +-
+ arch/arm/mach-at91/generic.h | 2 +-
+ arch/arm/mach-at91/gpio.c | 62 +++--
+ arch/arm/mach-at91/include/mach/at91cap9.h | 9 +-
+ arch/arm/mach-at91/include/mach/at91rm9200.h | 9 +-
+ arch/arm/mach-at91/include/mach/at91sam9260.h | 7 +-
+ arch/arm/mach-at91/include/mach/at91sam9261.h | 7 +-
+ arch/arm/mach-at91/include/mach/at91sam9263.h | 11 +-
+ arch/arm/mach-at91/include/mach/at91sam9g45.h | 11 +-
+ arch/arm/mach-at91/include/mach/at91sam9rl.h | 9 +-
+ arch/arm/mach-at91/include/mach/gpio.h | 336 ++++++++++++-------------
+ drivers/ata/pata_at91.c | 6 +-
+ drivers/ide/at91_ide.c | 2 +-
+ drivers/mmc/host/at91_mci.c | 30 ++--
+ drivers/mtd/nand/atmel_nand.c | 8 +-
+ drivers/usb/gadget/at91_udc.c | 14 +-
+ drivers/usb/host/ohci-at91.c | 4 +-
+ 64 files changed, 510 insertions(+), 408 deletions(-)
+Merging davinci/davinci-next
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging i.MX/for-next
+$ git merge i.MX/for-next
+Resolved 'arch/arm/mach-imx/Makefile' using previous resolution.
+Auto-merging arch/arm/mach-imx/Makefile
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
+Removing arch/arm/mach-mx5/mm-mx50.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3bb8a9c] Merge remote-tracking branch 'i.MX/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-imx/Kconfig | 1 +
+ arch/arm/mach-imx/Makefile | 2 +-
+ arch/arm/mach-mx5/Makefile | 1 -
+ arch/arm/mach-mx5/mm-mx50.c | 72 ---------------------------
+ arch/arm/mach-mx5/mm.c | 76 ++++++++++++++++++-----------
+ arch/arm/mach-mxs/clock-mx28.c | 6 ++-
+ arch/arm/plat-mxc/include/mach/hardware.h | 7 ++-
+ arch/arm/plat-mxc/include/mach/mx51.h | 16 +------
+ arch/arm/plat-mxc/include/mach/mx53.h | 1 +
+ 9 files changed, 62 insertions(+), 120 deletions(-)
+ delete mode 100644 arch/arm/mach-mx5/mm-mx50.c
+Merging linux-spec/for-next
+$ git merge linux-spec/for-next
+Already up-to-date.
+Merging omap/for-next
+$ git merge omap/for-next
+Already up-to-date.
+Merging pxa/for-next
+$ git merge pxa/for-next
+Already up-to-date.
+Merging samsung/next-samsung
+$ git merge samsung/next-samsung
+Already up-to-date.
+Merging s5p/for-next
+$ git merge s5p/for-next
+Auto-merging arch/arm/Kconfig
+Removing arch/arm/mach-exynos4/include/mach/clkdev.h
+Auto-merging arch/arm/mach-exynos4/mach-nuri.c
+Auto-merging arch/arm/mach-exynos4/mach-origen.c
+Auto-merging arch/arm/mach-exynos4/mach-smdk4x12.c
+Auto-merging arch/arm/mach-exynos4/mach-smdkv310.c
+Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos4/platsmp.c
+Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
+Auto-merging arch/arm/mach-s3c64xx/cpu.c
+Removing arch/arm/mach-s3c64xx/gpiolib.c
+Removing arch/arm/mach-s3c64xx/include/mach/clkdev.h
+Removing arch/arm/mach-s3c64xx/include/mach/pll.h
+Removing arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
+Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
+Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
+Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smartq5.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smartq7.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smdk6400.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
+Auto-merging arch/arm/mach-s5p64x0/cpu.c
+Removing arch/arm/mach-s5p64x0/include/mach/clkdev.h
+Removing arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
+Removing arch/arm/mach-s5pc100/include/mach/clkdev.h
+Removing arch/arm/mach-s5pc100/include/mach/pwm-clock.h
+Auto-merging arch/arm/mach-s5pv210/cpu.c
+Removing arch/arm/mach-s5pv210/include/mach/clkdev.h
+Removing arch/arm/mach-s5pv210/include/mach/pwm-clock.h
+Auto-merging arch/arm/mach-s5pv210/mach-goni.c
+Removing arch/arm/mach-s5pv210/sleep.S
+Removing arch/arm/plat-s3c24xx/gpio.c
+Removing arch/arm/plat-s3c24xx/gpiolib.c
+Removing arch/arm/plat-s3c24xx/include/mach/clkdev.h
+Removing arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
+Removing arch/arm/plat-s3c24xx/include/plat/pll.h
+Removing arch/arm/plat-s3c24xx/include/plat/regs-iis.h
+Removing arch/arm/plat-s3c24xx/include/plat/regs-spi.h
+Auto-merging arch/arm/plat-s5p/sleep.S
+Removing arch/arm/plat-samsung/gpio-config.c
+Removing arch/arm/plat-samsung/gpio.c
+Auto-merging arch/arm/plat-samsung/include/plat/audio-simtec.h
+Auto-merging arch/arm/plat-samsung/include/plat/camport.h
+Auto-merging arch/arm/plat-samsung/include/plat/common-smdk.h
+Auto-merging arch/arm/plat-samsung/include/plat/cpu-freq-core.h
+Auto-merging arch/arm/plat-samsung/include/plat/dma-pl330.h
+Auto-merging arch/arm/plat-samsung/include/plat/ehci.h
+Auto-merging arch/arm/plat-samsung/include/plat/exynos4.h
+Auto-merging arch/arm/plat-samsung/include/plat/fiq.h
+Auto-merging arch/arm/plat-samsung/include/plat/irq.h
+Auto-merging arch/arm/plat-samsung/include/plat/irqs.h
+Auto-merging arch/arm/plat-samsung/include/plat/mci.h
+Auto-merging arch/arm/plat-samsung/include/plat/mfc.h
+Auto-merging arch/arm/plat-samsung/include/plat/mipi_csis.h
+Auto-merging arch/arm/plat-samsung/include/plat/pll.h
+Removing arch/arm/plat-samsung/include/plat/pll6553x.h
+Auto-merging arch/arm/plat-samsung/include/plat/pwm-clock.h
+Auto-merging arch/arm/plat-samsung/include/plat/regs-dma.h
+Auto-merging arch/arm/plat-samsung/include/plat/regs-srom.h
+Auto-merging arch/arm/plat-samsung/include/plat/regs-udc.h
+Auto-merging arch/arm/plat-samsung/include/plat/reset.h
+Removing arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
+Auto-merging arch/arm/plat-samsung/include/plat/s3c2410.h
+Auto-merging arch/arm/plat-samsung/include/plat/s3c2412.h
+Auto-merging arch/arm/plat-samsung/include/plat/s3c2416.h
+Auto-merging arch/arm/plat-samsung/include/plat/s3c2443.h
+Auto-merging arch/arm/plat-samsung/include/plat/s3c244x.h
+Auto-merging arch/arm/plat-samsung/include/plat/s3c6400.h
+Auto-merging arch/arm/plat-samsung/include/plat/s3c6410.h
+Auto-merging arch/arm/plat-samsung/include/plat/s5p-clock.h
+Auto-merging arch/arm/plat-samsung/include/plat/s5p-time.h
+Auto-merging arch/arm/plat-samsung/include/plat/s5p6440.h
+Auto-merging arch/arm/plat-samsung/include/plat/s5p6450.h
+AutResolved 'drivers/gpio/Makefile' using previous resolution.
+o-merging arch/arm/plat-samsung/include/plat/s5pc100.h
+Auto-merging arch/arm/plat-samsung/include/plat/s5pv210.h
+Auto-merging arch/arm/plat-samsung/include/plat/sysmmu.h
+Auto-merging arch/arm/plat-samsung/include/plat/system-reset.h
+Auto-merging arch/arm/plat-samsung/include/plat/udc.h
+Auto-merging arch/arm/plat-samsung/include/plat/usb-phy.h
+Removing arch/arm/plat-samsung/s3c-pl330.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/gpio/Makefile
+CONFLICT (content): Merge conflict in drivers/gpio/Makefile
+Removing drivers/gpio/gpio-exynos4.c
+Removing drivers/gpio/gpio-plat-samsung.c
+Removing drivers/gpio/gpio-s5pc100.c
+Removing drivers/gpio/gpio-s5pv210.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bdeb3d7] Merge remote-tracking branch 's5p/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 5 +-
+ arch/arm/include/asm/hardware/pl080.h | 4 +
+ arch/arm/mach-exynos4/Kconfig | 53 +-
+ arch/arm/mach-exynos4/Makefile | 5 +-
+ arch/arm/mach-exynos4/clock.c | 224 ++-
+ arch/arm/mach-exynos4/cpu.c | 23 +-
+ arch/arm/mach-exynos4/dma.c | 300 ++-
+ arch/arm/mach-exynos4/include/mach/clkdev.h | 7 -
+ arch/arm/mach-exynos4/include/mach/dma.h | 4 +-
+ arch/arm/mach-exynos4/include/mach/entry-macro.S | 29 +-
+ arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h | 16 +
+ arch/arm/mach-exynos4/include/mach/irqs.h | 6 +
+ arch/arm/mach-exynos4/include/mach/map.h | 13 +-
+ arch/arm/mach-exynos4/include/mach/pm-core.h | 8 +-
+ arch/arm/mach-exynos4/include/mach/pmu.h | 7 +
+ arch/arm/mach-exynos4/include/mach/regs-mct.h | 5 +-
+ arch/arm/mach-exynos4/include/mach/regs-pmu.h | 74 +-
+ arch/arm/mach-exynos4/mach-nuri.c | 34 +
+ arch/arm/mach-exynos4/mach-origen.c | 577 +++++-
+ .../{mach-smdk4212.c => mach-smdk4x12.c} | 126 +-
+ arch/arm/mach-exynos4/mach-smdkv310.c | 49 +
+ arch/arm/mach-exynos4/mach-universal_c210.c | 312 +++-
+ arch/arm/mach-exynos4/mct.c | 166 +-
+ arch/arm/mach-exynos4/platsmp.c | 5 +-
+ arch/arm/mach-exynos4/pm.c | 7 +
+ arch/arm/mach-exynos4/pmu.c | 353 ++--
+ arch/arm/mach-exynos4/setup-sdhci.c | 47 -
+ arch/arm/mach-s3c2410/Kconfig | 1 -
+ arch/arm/mach-s3c2410/include/mach/dma.h | 20 +-
+ arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 99 +-
+ arch/arm/mach-s3c2410/include/mach/gpio-track.h | 6 +-
+ arch/arm/mach-s3c2410/include/mach/pm-core.h | 2 +-
+ .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 +
+ arch/arm/mach-s3c2410/mach-h1940.c | 6 +-
+ arch/arm/mach-s3c2410/s3c2410.c | 4 +-
+ arch/arm/mach-s3c2412/dma.c | 4 +-
+ arch/arm/mach-s3c2412/gpio.c | 62 +
+ arch/arm/mach-s3c2416/Kconfig | 1 -
+ arch/arm/mach-s3c2416/clock.c | 29 +-
+ arch/arm/mach-s3c2416/s3c2416.c | 4 +-
+ arch/arm/mach-s3c2416/setup-sdhci.c | 37 -
+ arch/arm/mach-s3c2440/Kconfig | 2 -
+ arch/arm/mach-s3c2440/s3c2440.c | 4 +-
+ arch/arm/mach-s3c2440/s3c2442.c | 4 +-
+ arch/arm/mach-s3c2443/Kconfig | 1 -
+ arch/arm/mach-s3c2443/clock.c | 55 +-
+ arch/arm/mach-s3c2443/s3c2443.c | 4 +-
+ arch/arm/mach-s3c64xx/Kconfig | 1 +
+ arch/arm/mach-s3c64xx/Makefile | 3 +-
+ arch/arm/mach-s3c64xx/clock.c | 13 +-
+ arch/arm/mach-s3c64xx/cpu.c | 4 +-
+ arch/arm/mach-s3c64xx/dma.c | 12 +-
+ arch/arm/mach-s3c64xx/gpiolib.c | 290 ---
+ arch/arm/mach-s3c64xx/include/mach/clkdev.h | 7 -
+ arch/arm/mach-s3c64xx/include/mach/crag6410.h | 23 +
+ arch/arm/mach-s3c64xx/include/mach/dma.h | 8 +-
+ arch/arm/mach-s3c64xx/include/mach/pll.h | 45 -
+ arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 +-
+ arch/arm/mach-s3c64xx/include/mach/pwm-clock.h | 56 -
+ arch/arm/mach-s3c64xx/include/mach/regs-sys.h | 3 +
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 182 ++
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 108 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s3c64xx/pm.c | 4 +
+ arch/arm/mach-s3c64xx/s3c6400.c | 2 +-
+ arch/arm/mach-s3c64xx/s3c6410.c | 4 +-
+ arch/arm/mach-s3c64xx/setup-sdhci.c | 48 -
+ arch/arm/mach-s5p64x0/Kconfig | 18 +-
+ arch/arm/mach-s5p64x0/Makefile | 4 +-
+ arch/arm/mach-s5p64x0/clock-s5p6440.c | 10 +-
+ arch/arm/mach-s5p64x0/clock-s5p6450.c | 10 +-
+ arch/arm/mach-s5p64x0/cpu.c | 3 +
+ arch/arm/mach-s5p64x0/dma.c | 269 ++-
+ arch/arm/mach-s5p64x0/include/mach/clkdev.h | 7 -
+ arch/arm/mach-s5p64x0/include/mach/dma.h | 4 +-
+ arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 +
+ arch/arm/mach-s5p64x0/include/mach/map.h | 4 +
+ arch/arm/mach-s5p64x0/include/mach/pm-core.h | 117 +
+ arch/arm/mach-s5p64x0/include/mach/pwm-clock.h | 68 -
+ arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 33 +
+ arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 21 +
+ arch/arm/mach-s5p64x0/irq-eint.c | 2 +
+ arch/arm/mach-s5p64x0/irq-pm.c | 92 +
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 74 +
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 75 +
+ arch/arm/mach-s5p64x0/pm.c | 204 ++
+ arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 +
+ arch/arm/mach-s5pc100/Kconfig | 2 +-
+ arch/arm/mach-s5pc100/clock.c | 15 +-
+ arch/arm/mach-s5pc100/dma.c | 324 ++-
+ arch/arm/mach-s5pc100/include/mach/clkdev.h | 7 -
+ arch/arm/mach-s5pc100/include/mach/dma.h | 4 +-
+ arch/arm/mach-s5pc100/include/mach/pwm-clock.h | 56 -
+ arch/arm/mach-s5pc100/setup-sdhci.c | 42 -
+ arch/arm/mach-s5pv210/Kconfig | 6 +-
+ arch/arm/mach-s5pv210/Makefile | 2 +-
+ arch/arm/mach-s5pv210/clock.c | 151 +-
+ arch/arm/mach-s5pv210/cpu.c | 4 +
+ arch/arm/mach-s5pv210/dma.c | 317 ++-
+ arch/arm/mach-s5pv210/include/mach/clkdev.h | 7 -
+ arch/arm/mach-s5pv210/include/mach/dma.h | 4 +-
+ arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h | 16 +
+ arch/arm/mach-s5pv210/include/mach/irqs.h | 4 +-
+ arch/arm/mach-s5pv210/include/mach/map.h | 13 +
+ arch/arm/mach-s5pv210/include/mach/pm-core.h | 2 +-
+ arch/arm/mach-s5pv210/include/mach/pwm-clock.h | 70 -
+ arch/arm/mach-s5pv210/include/mach/regs-clock.h | 3 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 62 +
+ arch/arm/mach-s5pv210/setup-sdhci.c | 41 -
+ arch/arm/mach-s5pv210/sleep.S | 52 -
+ arch/arm/plat-s3c24xx/Kconfig | 1 -
+ arch/arm/plat-s3c24xx/Makefile | 2 -
+ arch/arm/plat-s3c24xx/dma.c | 10 +-
+ arch/arm/plat-s3c24xx/gpio.c | 96 -
+ arch/arm/plat-s3c24xx/gpiolib.c | 229 --
+ arch/arm/plat-s3c24xx/include/mach/clkdev.h | 7 -
+ arch/arm/plat-s3c24xx/include/mach/pwm-clock.h | 55 -
+ arch/arm/plat-s3c24xx/include/plat/pll.h | 62 -
+ arch/arm/plat-s3c24xx/include/plat/regs-iis.h | 68 -
+ arch/arm/plat-s3c24xx/include/plat/regs-spi.h | 81 -
+ arch/arm/plat-s3c24xx/s3c2443-clock.c | 57 +
+ arch/arm/plat-s5p/Kconfig | 25 +-
+ arch/arm/plat-s5p/Makefile | 6 +-
+ arch/arm/plat-s5p/cpu.c | 9 +
+ arch/arm/plat-s5p/dev-i2c-hdmiphy.c | 59 +
+ arch/arm/plat-s5p/dev-tv.c | 98 +
+ arch/arm/plat-s5p/irq-gpioint.c | 10 +-
+ arch/arm/{mach-exynos4 => plat-s5p}/sleep.S | 13 +-
+ arch/arm/plat-samsung/Kconfig | 36 +-
+ arch/arm/plat-samsung/Makefile | 6 +-
+ arch/arm/plat-samsung/dma-ops.c | 131 +
+ arch/arm/plat-samsung/gpio-config.c | 431 ----
+ arch/arm/plat-samsung/gpio.c | 167 --
+ .../include/plat/audio-simtec.h | 2 +-
+ .../include/plat/camport.h | 6 +-
+ .../include/plat/common-smdk.h | 2 +-
+ .../include/plat/cpu-freq-core.h | 5 +-
+ arch/arm/plat-samsung/include/plat/cpu.h | 8 +
+ arch/arm/plat-samsung/include/plat/devs.h | 6 +
+ arch/arm/plat-samsung/include/plat/dma-ops.h | 63 +
+ .../include/plat/{s3c-dma-pl330.h => dma-pl330.h} | 24 +-
+ arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 2 +-
+ arch/arm/plat-samsung/include/plat/dma.h | 10 +-
+ .../{plat-s5p => plat-samsung}/include/plat/ehci.h | 6 +-
+ .../include/plat/exynos4.h | 2 +-
+ arch/arm/plat-samsung/include/plat/fb.h | 7 +
+ .../include/plat/fiq.h | 2 +-
+ .../plat-samsung/include/plat/gpio-cfg-helpers.h | 172 +-
+ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 34 +-
+ arch/arm/plat-samsung/include/plat/gpio-core.h | 97 +-
+ arch/arm/plat-samsung/include/plat/gpio-fns.h | 98 +
+ arch/arm/plat-samsung/include/plat/iic.h | 1 +
+ .../include/plat/irq.h | 25 +-
+ .../{plat-s5p => plat-samsung}/include/plat/irqs.h | 8 +-
+ .../include/plat/mci.h | 10 +-
+ .../{plat-s5p => plat-samsung}/include/plat/mfc.h | 6 +-
+ .../include/plat/mipi_csis.h | 6 +-
+ .../{plat-s5p => plat-samsung}/include/plat/pll.h | 134 +-
+ arch/arm/plat-samsung/include/plat/pll6553x.h | 51 -
+ arch/arm/plat-samsung/include/plat/pm.h | 10 +-
+ .../mach => plat-samsung/include/plat}/pwm-clock.h | 39 +-
+ .../include/plat/regs-dma.h | 112 +-
+ arch/arm/plat-samsung/include/plat/regs-iis.h | 70 +
+ arch/arm/plat-samsung/include/plat/regs-spi.h | 48 +
+ .../include/plat/regs-srom.h | 8 +-
+ .../include/plat/regs-udc.h | 132 +-
+ .../include/plat/reset.h | 8 +-
+ .../plat-samsung/include/plat/s3c-pl330-pdata.h | 32 -
+ .../include/plat/s3c2410.h | 2 +-
+ .../include/plat/s3c2412.h | 2 +-
+ .../include/plat/s3c2416.h | 2 +-
+ .../include/plat/s3c2443.h | 2 +-
+ .../include/plat/s3c244x.h | 2 +-
+ .../mach => plat-samsung/include/plat}/s3c6400.h | 2 +-
+ .../mach => plat-samsung/include/plat}/s3c6410.h | 2 +-
+ .../include/plat/s5p-clock.h | 2 +-
+ .../include/plat/s5p-time.h | 2 +-
+ .../include/plat/s5p6440.h | 2 +-
+ .../include/plat/s5p6450.h | 2 +-
+ .../include/plat/s5pc100.h | 2 +-
+ .../include/plat/s5pv210.h | 2 +-
+ arch/arm/plat-samsung/include/plat/sdhci.h | 57 -
+ .../include/plat/sysmmu.h | 6 +-
+ .../include/plat/system-reset.h | 2 +-
+ arch/arm/plat-samsung/include/plat/tv-core.h | 44 +
+ .../include/plat/udc.h | 4 +-
+ .../include/plat/usb-phy.h | 6 +-
+ arch/arm/plat-samsung/platformdata.c | 2 -
+ arch/arm/plat-samsung/pm-gpio.c | 72 +-
+ arch/arm/plat-samsung/pm.c | 6 +-
+ arch/arm/plat-samsung/pwm-clock.c | 13 +-
+ arch/arm/plat-samsung/s3c-dma-ops.c | 130 +
+ arch/arm/plat-samsung/s3c-pl330.c | 1244 ---------
+ drivers/dma/Kconfig | 3 +-
+ drivers/dma/amba-pl08x.c | 455 ++--
+ drivers/dma/at_hdmac.c | 159 +-
+ drivers/dma/at_hdmac_regs.h | 24 +
+ drivers/dma/dmatest.c | 23 +-
+ drivers/dma/imx-sdma.c | 47 +-
+ drivers/dma/mxs-dma.c | 45 +-
+ drivers/dma/pl330.c | 229 ++-
+ drivers/gpio/Kconfig | 16 -
+ drivers/gpio/Makefile | 6 +-
+ drivers/gpio/gpio-exynos4.c | 385 ---
+ drivers/gpio/gpio-plat-samsung.c | 205 --
+ drivers/gpio/gpio-s5pc100.c | 354 ---
+ drivers/gpio/gpio-s5pv210.c | 287 ---
+ drivers/gpio/gpio-samsung.c | 2688 ++++++++++++++++++++
+ drivers/mmc/host/s3cmci.c | 6 +-
+ drivers/spi/spi-s3c64xx.c | 175 +-
+ include/linux/amba/pl08x.h | 14 +-
+ include/linux/amba/pl330.h | 6 +-
+ include/linux/dmaengine.h | 13 +-
+ sound/soc/samsung/ac97.c | 10 +-
+ sound/soc/samsung/dma.c | 148 +-
+ sound/soc/samsung/dma.h | 4 +-
+ 224 files changed, 8821 insertions(+), 6888 deletions(-)
+ delete mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-exynos4/include/mach/i2c-hdmiphy.h
+ rename arch/arm/mach-exynos4/{mach-smdk4212.c => mach-smdk4x12.c} (61%)
+ create mode 100644 arch/arm/mach-s3c2412/gpio.c
+ delete mode 100644 arch/arm/mach-s3c64xx/gpiolib.c
+ delete mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h
+ delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pll.h
+ delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
+ create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c
+ delete mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h
+ delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
+ create mode 100644 arch/arm/mach-s5p64x0/irq-pm.c
+ create mode 100644 arch/arm/mach-s5p64x0/pm.c
+ create mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c
+ delete mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h
+ delete mode 100644 arch/arm/mach-s5pc100/include/mach/pwm-clock.h
+ delete mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-s5pv210/include/mach/i2c-hdmiphy.h
+ delete mode 100644 arch/arm/mach-s5pv210/include/mach/pwm-clock.h
+ delete mode 100644 arch/arm/mach-s5pv210/sleep.S
+ delete mode 100644 arch/arm/plat-s3c24xx/gpio.c
+ delete mode 100644 arch/arm/plat-s3c24xx/gpiolib.c
+ delete mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h
+ delete mode 100644 arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
+ delete mode 100644 arch/arm/plat-s3c24xx/include/plat/pll.h
+ delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-iis.h
+ delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-spi.h
+ create mode 100644 arch/arm/plat-s5p/dev-i2c-hdmiphy.c
+ create mode 100644 arch/arm/plat-s5p/dev-tv.c
+ rename arch/arm/{mach-exynos4 => plat-s5p}/sleep.S (81%)
+ create mode 100644 arch/arm/plat-samsung/dma-ops.c
+ delete mode 100644 arch/arm/plat-samsung/gpio-config.c
+ delete mode 100644 arch/arm/plat-samsung/gpio.c
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/audio-simtec.h (95%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/camport.h (86%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/common-smdk.h (87%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/cpu-freq-core.h (98%)
+ create mode 100644 arch/arm/plat-samsung/include/plat/dma-ops.h
+ rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h => dma-pl330.h} (84%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/ehci.h (84%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/exynos4.h (94%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/fiq.h (88%)
+ create mode 100644 arch/arm/plat-samsung/include/plat/gpio-fns.h
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/irq.h (81%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/irqs.h (96%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/mci.h (90%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mfc.h (90%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mipi_csis.h (90%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/pll.h (57%)
+ delete mode 100644 arch/arm/plat-samsung/include/plat/pll6553x.h
+ rename arch/arm/{mach-exynos4/include/mach => plat-samsung/include/plat}/pwm-clock.h (68%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-dma.h (58%)
+ create mode 100644 arch/arm/plat-samsung/include/plat/regs-iis.h
+ create mode 100644 arch/arm/plat-samsung/include/plat/regs-spi.h
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/regs-srom.h (89%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-udc.h (51%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/reset.h (66%)
+ delete mode 100644 arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2410.h (93%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2412.h (92%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2416.h (92%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2443.h (96%)
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c244x.h (94%)
+ rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6400.h (94%)
+ rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6410.h (93%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-clock.h (96%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-time.h (94%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6440.h (94%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6450.h (94%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pc100.h (94%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pv210.h (94%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/sysmmu.h (96%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/system-reset.h (92%)
+ create mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h
+ rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/udc.h (95%)
+ rename arch/arm/{plat-s5p => plat-samsung}/include/plat/usb-phy.h (83%)
+ create mode 100644 arch/arm/plat-samsung/s3c-dma-ops.c
+ delete mode 100644 arch/arm/plat-samsung/s3c-pl330.c
+ delete mode 100644 drivers/gpio/gpio-exynos4.c
+ delete mode 100644 drivers/gpio/gpio-plat-samsung.c
+ delete mode 100644 drivers/gpio/gpio-s5pc100.c
+ delete mode 100644 drivers/gpio/gpio-s5pv210.c
+ create mode 100644 drivers/gpio/gpio-samsung.c
+Merging tegra/for-next
+$ git merge tegra/for-next
+Already up-to-date.
+Merging xilinx/arm-next
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Removing arch/blackfin/include/asm/mutex.h
+Merge made by recursive.
+ arch/blackfin/include/asm/Kbuild | 1 +
+ arch/blackfin/include/asm/bfin_serial.h | 2 +
+ arch/blackfin/include/asm/mutex.h | 1 -
+ arch/blackfin/include/asm/uaccess.h | 6 ++--
+ arch/blackfin/mach-bf518/boards/ezbrd.c | 14 +++++++++++-
+ arch/blackfin/mach-bf518/boards/tcm-bf518.c | 14 +++++++++++-
+ arch/blackfin/mach-bf527/boards/ad7160eval.c | 14 +++++++++++-
+ arch/blackfin/mach-bf527/boards/cm_bf527.c | 14 +++++++++++-
+ arch/blackfin/mach-bf527/boards/ezbrd.c | 14 +++++++++++-
+ arch/blackfin/mach-bf527/boards/ezkit.c | 14 +++++++++++-
+ arch/blackfin/mach-bf527/boards/tll6527m.c | 14 +++++++++++-
+ arch/blackfin/mach-bf533/boards/H8606.c | 10 +++++++-
+ arch/blackfin/mach-bf533/boards/blackstamp.c | 7 +++++-
+ arch/blackfin/mach-bf533/boards/cm_bf533.c | 7 +++++-
+ arch/blackfin/mach-bf533/boards/ezkit.c | 7 +++++-
+ arch/blackfin/mach-bf533/boards/ip0x.c | 7 +++++-
+ arch/blackfin/mach-bf533/boards/stamp.c | 7 +++++-
+ arch/blackfin/mach-bf537/boards/cm_bf537e.c | 14 +++++++++++-
+ arch/blackfin/mach-bf537/boards/cm_bf537u.c | 14 +++++++++++-
+ arch/blackfin/mach-bf537/boards/dnp5370.c | 14 +++++++++++-
+ arch/blackfin/mach-bf537/boards/minotaur.c | 14 +++++++++++-
+ arch/blackfin/mach-bf537/boards/pnav10.c | 14 +++++++++++-
+ arch/blackfin/mach-bf537/boards/stamp.c | 14 +++++++++++-
+ arch/blackfin/mach-bf537/boards/tcm_bf537.c | 14 +++++++++++-
+ arch/blackfin/mach-bf538/boards/ezkit.c | 21 ++++++++++++++++--
+ arch/blackfin/mach-bf548/boards/cm_bf548.c | 28 ++++++++++++++++++++++---
+ arch/blackfin/mach-bf548/boards/ezkit.c | 28 ++++++++++++++++++++++---
+ arch/blackfin/mach-bf561/boards/acvilon.c | 7 +++++-
+ arch/blackfin/mach-bf561/boards/cm_bf561.c | 7 +++++-
+ arch/blackfin/mach-bf561/boards/ezkit.c | 7 +++++-
+ arch/blackfin/mach-bf561/boards/tepla.c | 7 +++++-
+ 31 files changed, 302 insertions(+), 54 deletions(-)
+ delete mode 100644 arch/blackfin/include/asm/mutex.h
+Merging cris/for-next
+$ git merge cris/for-next
+Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
+Auto-merging drivers/net/cris/eth_v10.c
+Merge made by recursive.
+ Documentation/cris/README | 62 +++++++++++++++---------------
+ arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
+ arch/cris/arch-v32/kernel/ptrace.c | 2 -
+ arch/cris/include/arch-v32/arch/cache.h | 2 +-
+ drivers/net/cris/eth_v10.c | 1 -
+ 5 files changed, 34 insertions(+), 39 deletions(-)
+Merging quilt/hexagon
+$ git merge quilt/hexagon
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ MAINTAINERS | 6 +
+ arch/hexagon/Kconfig | 220 ++++++++++++
+ arch/hexagon/Makefile | 59 +++
+ arch/hexagon/configs/comet_defconfig | 85 +++++
+ arch/hexagon/include/asm/Kbuild | 60 ++++
+ arch/hexagon/include/asm/asm-offsets.h | 1 +
+ arch/hexagon/include/asm/atomic.h | 164 +++++++++
+ arch/hexagon/include/asm/bitops.h | 301 ++++++++++++++++
+ arch/hexagon/include/asm/bitsperlong.h | 26 ++
+ arch/hexagon/include/asm/byteorder.h | 28 ++
+ arch/hexagon/include/asm/cache.h | 34 ++
+ arch/hexagon/include/asm/cacheflush.h | 99 ++++++
+ arch/hexagon/include/asm/checksum.h | 50 +++
+ arch/hexagon/include/asm/delay.h | 28 ++
+ arch/hexagon/include/asm/dma-mapping.h | 101 ++++++
+ arch/hexagon/include/asm/dma.h | 29 ++
+ arch/hexagon/include/asm/elf.h | 229 ++++++++++++
+ arch/hexagon/include/asm/fixmap.h | 73 ++++
+ arch/hexagon/include/asm/fpu.h | 4 +
+ arch/hexagon/include/asm/futex.h | 137 ++++++++
+ arch/hexagon/include/asm/hexagon_vm.h | 281 +++++++++++++++
+ arch/hexagon/include/asm/intrinsics.h | 26 ++
+ arch/hexagon/include/asm/io.h | 326 +++++++++++++++++
+ arch/hexagon/include/asm/irq.h | 36 ++
+ arch/hexagon/include/asm/irqflags.h | 62 ++++
+ arch/hexagon/include/asm/kgdb.h | 43 +++
+ arch/hexagon/include/asm/linkage.h | 25 ++
+ arch/hexagon/include/asm/mem-layout.h | 112 ++++++
+ arch/hexagon/include/asm/mmu.h | 37 ++
+ arch/hexagon/include/asm/mmu_context.h | 100 ++++++
+ arch/hexagon/include/asm/module.h | 26 ++
+ arch/hexagon/include/asm/mutex.h | 8 +
+ arch/hexagon/include/asm/page.h | 157 +++++++++
+ arch/hexagon/include/asm/param.h | 26 ++
+ arch/hexagon/include/asm/perf_event.h | 24 ++
+ arch/hexagon/include/asm/pgalloc.h | 146 ++++++++
+ arch/hexagon/include/asm/pgtable.h | 518 +++++++++++++++++++++++++++
+ arch/hexagon/include/asm/processor.h | 123 +++++++
+ arch/hexagon/include/asm/ptrace.h | 48 +++
+ arch/hexagon/include/asm/registers.h | 236 +++++++++++++
+ arch/hexagon/include/asm/setup.h | 29 ++
+ arch/hexagon/include/asm/sigcontext.h | 33 ++
+ arch/hexagon/include/asm/signal.h | 26 ++
+ arch/hexagon/include/asm/smp.h | 44 +++
+ arch/hexagon/include/asm/spinlock.h | 186 ++++++++++
+ arch/hexagon/include/asm/spinlock_types.h | 42 +++
+ arch/hexagon/include/asm/string.h | 32 ++
+ arch/hexagon/include/asm/suspend.h | 27 ++
+ arch/hexagon/include/asm/swab.h | 24 ++
+ arch/hexagon/include/asm/syscall.h | 54 +++
+ arch/hexagon/include/asm/system.h | 126 +++++++
+ arch/hexagon/include/asm/thread_info.h | 154 ++++++++
+ arch/hexagon/include/asm/time.h | 29 ++
+ arch/hexagon/include/asm/timer-regs.h | 39 ++
+ arch/hexagon/include/asm/timex.h | 37 ++
+ arch/hexagon/include/asm/tlb.h | 39 ++
+ arch/hexagon/include/asm/tlbflush.h | 58 +++
+ arch/hexagon/include/asm/traps.h | 29 ++
+ arch/hexagon/include/asm/uaccess.h | 116 ++++++
+ arch/hexagon/include/asm/unistd.h | 36 ++
+ arch/hexagon/include/asm/user.h | 83 +++++
+ arch/hexagon/include/asm/vdso.h | 31 ++
+ arch/hexagon/include/asm/vm_fault.h | 26 ++
+ arch/hexagon/include/asm/vm_mmu.h | 111 ++++++
+ arch/hexagon/kernel/Makefile | 19 +
+ arch/hexagon/kernel/asm-offsets.c | 104 ++++++
+ arch/hexagon/kernel/dma.c | 220 ++++++++++++
+ arch/hexagon/kernel/head.S | 162 +++++++++
+ arch/hexagon/kernel/hexagon_ksyms.c | 42 +++
+ arch/hexagon/kernel/init_task.c | 54 +++
+ arch/hexagon/kernel/irq_cpu.c | 90 +++++
+ arch/hexagon/kernel/kgdb.c | 247 +++++++++++++
+ arch/hexagon/kernel/module.c | 162 +++++++++
+ arch/hexagon/kernel/process.c | 279 +++++++++++++++
+ arch/hexagon/kernel/ptrace.c | 178 ++++++++++
+ arch/hexagon/kernel/reset.c | 38 ++
+ arch/hexagon/kernel/setup.c | 145 ++++++++
+ arch/hexagon/kernel/signal.c | 345 ++++++++++++++++++
+ arch/hexagon/kernel/smp.c | 280 +++++++++++++++
+ arch/hexagon/kernel/stacktrace.c | 66 ++++
+ arch/hexagon/kernel/syscall.c | 90 +++++
+ arch/hexagon/kernel/syscalltab.c | 32 ++
+ arch/hexagon/kernel/time.c | 258 ++++++++++++++
+ arch/hexagon/kernel/topology.c | 52 +++
+ arch/hexagon/kernel/trampoline.S | 35 ++
+ arch/hexagon/kernel/traps.c | 370 ++++++++++++++++++++
+ arch/hexagon/kernel/vdso.c | 101 ++++++
+ arch/hexagon/kernel/vm_entry.S | 269 ++++++++++++++
+ arch/hexagon/kernel/vm_events.c | 101 ++++++
+ arch/hexagon/kernel/vm_init_segtable.S | 442 +++++++++++++++++++++++
+ arch/hexagon/kernel/vm_ops.S | 102 ++++++
+ arch/hexagon/kernel/vm_switch.S | 95 +++++
+ arch/hexagon/kernel/vm_vectors.S | 50 +++
+ arch/hexagon/kernel/vmlinux.lds.S | 93 +++++
+ arch/hexagon/lib/Makefile | 4 +
+ arch/hexagon/lib/checksum.c | 203 +++++++++++
+ arch/hexagon/lib/io.c | 91 +++++
+ arch/hexagon/lib/memcpy.S | 543 +++++++++++++++++++++++++++++
+ arch/hexagon/lib/memset.S | 316 +++++++++++++++++
+ arch/hexagon/mm/Makefile | 7 +
+ arch/hexagon/mm/cache.c | 128 +++++++
+ arch/hexagon/mm/copy_from_user.S | 114 ++++++
+ arch/hexagon/mm/copy_to_user.S | 92 +++++
+ arch/hexagon/mm/copy_user_template.S | 185 ++++++++++
+ arch/hexagon/mm/init.c | 276 +++++++++++++++
+ arch/hexagon/mm/ioremap.c | 56 +++
+ arch/hexagon/mm/pgalloc.c | 25 ++
+ arch/hexagon/mm/strnlen_user.S | 140 ++++++++
+ arch/hexagon/mm/uaccess.c | 59 +++
+ arch/hexagon/mm/vm_fault.c | 187 ++++++++++
+ arch/hexagon/mm/vm_tlb.c | 93 +++++
+ include/asm-generic/checksum.h | 4 +
+ include/asm-generic/rwsem.h | 132 +++++++
+ 113 files changed, 12681 insertions(+), 0 deletions(-)
+ create mode 100644 arch/hexagon/Kconfig
+ create mode 100644 arch/hexagon/Makefile
+ create mode 100644 arch/hexagon/configs/comet_defconfig
+ create mode 100644 arch/hexagon/include/asm/Kbuild
+ create mode 100644 arch/hexagon/include/asm/asm-offsets.h
+ create mode 100644 arch/hexagon/include/asm/atomic.h
+ create mode 100644 arch/hexagon/include/asm/bitops.h
+ create mode 100644 arch/hexagon/include/asm/bitsperlong.h
+ create mode 100644 arch/hexagon/include/asm/byteorder.h
+ create mode 100644 arch/hexagon/include/asm/cache.h
+ create mode 100644 arch/hexagon/include/asm/cacheflush.h
+ create mode 100644 arch/hexagon/include/asm/checksum.h
+ create mode 100644 arch/hexagon/include/asm/delay.h
+ create mode 100644 arch/hexagon/include/asm/dma-mapping.h
+ create mode 100644 arch/hexagon/include/asm/dma.h
+ create mode 100644 arch/hexagon/include/asm/elf.h
+ create mode 100644 arch/hexagon/include/asm/fixmap.h
+ create mode 100644 arch/hexagon/include/asm/fpu.h
+ create mode 100644 arch/hexagon/include/asm/futex.h
+ create mode 100644 arch/hexagon/include/asm/hexagon_vm.h
+ create mode 100644 arch/hexagon/include/asm/intrinsics.h
+ create mode 100644 arch/hexagon/include/asm/io.h
+ create mode 100644 arch/hexagon/include/asm/irq.h
+ create mode 100644 arch/hexagon/include/asm/irqflags.h
+ create mode 100644 arch/hexagon/include/asm/kgdb.h
+ create mode 100644 arch/hexagon/include/asm/linkage.h
+ create mode 100644 arch/hexagon/include/asm/mem-layout.h
+ create mode 100644 arch/hexagon/include/asm/mmu.h
+ create mode 100644 arch/hexagon/include/asm/mmu_context.h
+ create mode 100644 arch/hexagon/include/asm/module.h
+ create mode 100644 arch/hexagon/include/asm/mutex.h
+ create mode 100644 arch/hexagon/include/asm/page.h
+ create mode 100644 arch/hexagon/include/asm/param.h
+ create mode 100644 arch/hexagon/include/asm/perf_event.h
+ create mode 100644 arch/hexagon/include/asm/pgalloc.h
+ create mode 100644 arch/hexagon/include/asm/pgtable.h
+ create mode 100644 arch/hexagon/include/asm/processor.h
+ create mode 100644 arch/hexagon/include/asm/ptrace.h
+ create mode 100644 arch/hexagon/include/asm/registers.h
+ create mode 100644 arch/hexagon/include/asm/setup.h
+ create mode 100644 arch/hexagon/include/asm/sigcontext.h
+ create mode 100644 arch/hexagon/include/asm/signal.h
+ create mode 100644 arch/hexagon/include/asm/smp.h
+ create mode 100644 arch/hexagon/include/asm/spinlock.h
+ create mode 100644 arch/hexagon/include/asm/spinlock_types.h
+ create mode 100644 arch/hexagon/include/asm/string.h
+ create mode 100644 arch/hexagon/include/asm/suspend.h
+ create mode 100644 arch/hexagon/include/asm/swab.h
+ create mode 100644 arch/hexagon/include/asm/syscall.h
+ create mode 100644 arch/hexagon/include/asm/system.h
+ create mode 100644 arch/hexagon/include/asm/thread_info.h
+ create mode 100644 arch/hexagon/include/asm/time.h
+ create mode 100644 arch/hexagon/include/asm/timer-regs.h
+ create mode 100644 arch/hexagon/include/asm/timex.h
+ create mode 100644 arch/hexagon/include/asm/tlb.h
+ create mode 100644 arch/hexagon/include/asm/tlbflush.h
+ create mode 100644 arch/hexagon/include/asm/traps.h
+ create mode 100644 arch/hexagon/include/asm/uaccess.h
+ create mode 100644 arch/hexagon/include/asm/unistd.h
+ create mode 100644 arch/hexagon/include/asm/user.h
+ create mode 100644 arch/hexagon/include/asm/vdso.h
+ create mode 100644 arch/hexagon/include/asm/vm_fault.h
+ create mode 100644 arch/hexagon/include/asm/vm_mmu.h
+ create mode 100644 arch/hexagon/kernel/Makefile
+ create mode 100644 arch/hexagon/kernel/asm-offsets.c
+ create mode 100644 arch/hexagon/kernel/dma.c
+ create mode 100644 arch/hexagon/kernel/head.S
+ create mode 100644 arch/hexagon/kernel/hexagon_ksyms.c
+ create mode 100644 arch/hexagon/kernel/init_task.c
+ create mode 100644 arch/hexagon/kernel/irq_cpu.c
+ create mode 100644 arch/hexagon/kernel/kgdb.c
+ create mode 100644 arch/hexagon/kernel/module.c
+ create mode 100644 arch/hexagon/kernel/process.c
+ create mode 100644 arch/hexagon/kernel/ptrace.c
+ create mode 100644 arch/hexagon/kernel/reset.c
+ create mode 100644 arch/hexagon/kernel/setup.c
+ create mode 100644 arch/hexagon/kernel/signal.c
+ create mode 100644 arch/hexagon/kernel/smp.c
+ create mode 100644 arch/hexagon/kernel/stacktrace.c
+ create mode 100644 arch/hexagon/kernel/syscall.c
+ create mode 100644 arch/hexagon/kernel/syscalltab.c
+ create mode 100644 arch/hexagon/kernel/time.c
+ create mode 100644 arch/hexagon/kernel/topology.c
+ create mode 100644 arch/hexagon/kernel/trampoline.S
+ create mode 100644 arch/hexagon/kernel/traps.c
+ create mode 100644 arch/hexagon/kernel/vdso.c
+ create mode 100644 arch/hexagon/kernel/vm_entry.S
+ create mode 100644 arch/hexagon/kernel/vm_events.c
+ create mode 100644 arch/hexagon/kernel/vm_init_segtable.S
+ create mode 100644 arch/hexagon/kernel/vm_ops.S
+ create mode 100644 arch/hexagon/kernel/vm_switch.S
+ create mode 100644 arch/hexagon/kernel/vm_vectors.S
+ create mode 100644 arch/hexagon/kernel/vmlinux.lds.S
+ create mode 100644 arch/hexagon/lib/Makefile
+ create mode 100644 arch/hexagon/lib/checksum.c
+ create mode 100644 arch/hexagon/lib/io.c
+ create mode 100644 arch/hexagon/lib/memcpy.S
+ create mode 100644 arch/hexagon/lib/memset.S
+ create mode 100644 arch/hexagon/mm/Makefile
+ create mode 100644 arch/hexagon/mm/cache.c
+ create mode 100644 arch/hexagon/mm/copy_from_user.S
+ create mode 100644 arch/hexagon/mm/copy_to_user.S
+ create mode 100644 arch/hexagon/mm/copy_user_template.S
+ create mode 100644 arch/hexagon/mm/init.c
+ create mode 100644 arch/hexagon/mm/ioremap.c
+ create mode 100644 arch/hexagon/mm/pgalloc.c
+ create mode 100644 arch/hexagon/mm/strnlen_user.S
+ create mode 100644 arch/hexagon/mm/uaccess.c
+ create mode 100644 arch/hexagon/mm/vm_fault.c
+ create mode 100644 arch/hexagon/mm/vm_tlb.c
+ create mode 100644 include/asm-generic/rwsem.h
+Merging ia64/test
+$ git merge ia64/test
+Merge made by recursive.
+ arch/ia64/configs/generic_defconfig | 1 +
+ arch/ia64/configs/gensparse_defconfig | 1 +
+ arch/ia64/configs/tiger_defconfig | 1 +
+ arch/ia64/configs/xen_domu_defconfig | 1 +
+ arch/ia64/configs/zx1_defconfig | 1 +
+ arch/ia64/sn/kernel/sn2/sn_hwperf.c | 12 +++--
+ drivers/acpi/apei/erst.c | 2 +-
+ drivers/char/agp/hp-agp.c | 6 ++-
+ drivers/firmware/efivars.c | 2 +-
+ fs/pstore/inode.c | 40 ++++++++++++++--
+ fs/pstore/internal.h | 2 +-
+ fs/pstore/platform.c | 82 ++++++++++++++++++++++++++------
+ include/linux/pstore.h | 2 +-
+ 13 files changed, 123 insertions(+), 30 deletions(-)
+Merging m68k/for-next
+$ git merge m68k/for-next
+Merge made by recursive.
+ arch/m68k/mac/macints.c | 2 +-
+ arch/m68k/mac/misc.c | 40 +++++++++++++++++++++++-----------------
+ drivers/zorro/zorro-driver.c | 8 ++++----
+ 3 files changed, 28 insertions(+), 22 deletions(-)
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Auto-merging arch/m68k/Kconfig.machine
+Removing arch/m68k/Kconfig.mmu
+Removing arch/m68k/Makefile_mm
+Removing arch/m68k/Makefile_no
+Removing arch/m68k/include/asm/entry_mm.h
+Removing arch/m68k/include/asm/entry_no.h
+Removing arch/m68k/kernel/Makefile_mm
+Removing arch/m68k/kernel/Makefile_no
+Removing arch/m68k/kernel/traps_mm.c
+Removing arch/m68k/kernel/traps_no.c
+Merge made by recursive.
+ arch/m68k/Kconfig | 195 +----
+ arch/m68k/Kconfig.bus | 55 ++
+ arch/m68k/Kconfig.cpu | 429 +++++++++
+ arch/m68k/Kconfig.devices | 171 ++++
+ arch/m68k/{Kconfig.nommu => Kconfig.machine} | 543 ++++--------
+ arch/m68k/Kconfig.mmu | 411 ---------
+ arch/m68k/Makefile | 168 ++++-
+ arch/m68k/Makefile_mm | 121 ---
+ arch/m68k/Makefile_no | 124 ---
+ arch/m68k/include/asm/entry.h | 255 ++++++-
+ arch/m68k/include/asm/entry_mm.h | 128 ---
+ arch/m68k/include/asm/entry_no.h | 181 ----
+ arch/m68k/include/asm/m520xsim.h | 26 +-
+ arch/m68k/include/asm/mcfqspi.h | 8 +-
+ arch/m68k/include/asm/page_no.h | 3 +
+ arch/m68k/include/asm/processor.h | 6 +
+ arch/m68k/include/asm/sections.h | 2 +
+ arch/m68k/kernel/Makefile | 24 +-
+ arch/m68k/kernel/Makefile_mm | 17 -
+ arch/m68k/kernel/Makefile_no | 10 -
+ arch/m68k/kernel/entry_no.S | 6 +-
+ arch/m68k/kernel/setup_no.c | 4 +-
+ arch/m68k/kernel/traps.c | 1108 +++++++++++++++++++++++-
+ arch/m68k/kernel/traps_mm.c | 1207 --------------------------
+ arch/m68k/kernel/traps_no.c | 361 --------
+ arch/m68k/kernel/vectors.c | 145 +++
+ arch/m68k/lib/memcpy.c | 9 +
+ arch/m68k/mm/init_no.c | 21 +-
+ arch/m68k/platform/520x/config.c | 6 +-
+ arch/m68k/platform/520x/gpio.c | 50 +-
+ arch/m68k/platform/68328/Makefile | 5 +-
+ arch/m68k/platform/68328/entry.S | 18 +-
+ arch/m68k/platform/68360/Makefile | 6 +-
+ arch/m68k/platform/68360/entry.S | 4 +-
+ arch/m68k/platform/coldfire/entry.S | 6 +-
+ 35 files changed, 2656 insertions(+), 3177 deletions(-)
+ create mode 100644 arch/m68k/Kconfig.bus
+ create mode 100644 arch/m68k/Kconfig.cpu
+ create mode 100644 arch/m68k/Kconfig.devices
+ rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (62%)
+ delete mode 100644 arch/m68k/Kconfig.mmu
+ delete mode 100644 arch/m68k/Makefile_mm
+ delete mode 100644 arch/m68k/Makefile_no
+ delete mode 100644 arch/m68k/include/asm/entry_mm.h
+ delete mode 100644 arch/m68k/include/asm/entry_no.h
+ delete mode 100644 arch/m68k/kernel/Makefile_mm
+ delete mode 100644 arch/m68k/kernel/Makefile_no
+ delete mode 100644 arch/m68k/kernel/traps_mm.c
+ delete mode 100644 arch/m68k/kernel/traps_no.c
+ create mode 100644 arch/m68k/kernel/vectors.c
+Merging microblaze/next
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Auto-merging arch/mips/alchemy/common/gpiolib.c
+Removing arch/mips/alchemy/common/pci.c
+Removing arch/mips/include/asm/mach-au1x00/au1xxx.h
+Removing arch/mips/pci/fixup-au1000.c
+Removing arch/mips/pci/ops-au1000.c
+Merge made by recursive.
+ arch/mips/Kconfig | 11 +-
+ arch/mips/alchemy/Kconfig | 50 +-
+ arch/mips/alchemy/common/Makefile | 6 +-
+ arch/mips/alchemy/common/dbdma.c | 203 ++--
+ arch/mips/alchemy/common/dma.c | 72 +-
+ .../alchemy/common/{gpiolib-au1000.c => gpiolib.c} | 35 +-
+ arch/mips/alchemy/common/pci.c | 104 --
+ arch/mips/alchemy/common/platform.c | 372 ++-----
+ arch/mips/alchemy/common/power.c | 68 +-
+ arch/mips/alchemy/common/setup.c | 6 +-
+ arch/mips/alchemy/devboards/bcsr.c | 4 +
+ arch/mips/alchemy/devboards/db1200/platform.c | 153 ++-
+ arch/mips/alchemy/devboards/db1200/setup.c | 7 -
+ arch/mips/alchemy/devboards/db1x00/board_setup.c | 28 +-
+ arch/mips/alchemy/devboards/db1x00/platform.c | 199 +++-
+ arch/mips/alchemy/devboards/pb1100/platform.c | 49 +-
+ arch/mips/alchemy/devboards/pb1200/platform.c | 190 +++-
+ arch/mips/alchemy/devboards/pb1500/board_setup.c | 33 +-
+ arch/mips/alchemy/devboards/pb1500/platform.c | 71 +-
+ arch/mips/alchemy/devboards/pb1550/board_setup.c | 6 -
+ arch/mips/alchemy/devboards/pb1550/platform.c | 119 ++-
+ arch/mips/alchemy/gpr/board_setup.c | 12 -
+ arch/mips/alchemy/gpr/platform.c | 47 +
+ arch/mips/alchemy/mtx-1/board_setup.c | 40 -
+ arch/mips/alchemy/mtx-1/platform.c | 62 +
+ arch/mips/alchemy/xxs1500/board_setup.c | 8 -
+ arch/mips/alchemy/xxs1500/platform.c | 12 +-
+ arch/mips/ar7/irq.c | 3 +-
+ arch/mips/bcm63xx/irq.c | 1 +
+ arch/mips/cobalt/irq.c | 1 +
+ arch/mips/dec/setup.c | 4 +
+ arch/mips/emma/markeins/irq.c | 2 +-
+ arch/mips/include/asm/cpu.h | 3 +
+ arch/mips/include/asm/mach-au1x00/au1000.h | 559 ++++------
+ arch/mips/include/asm/mach-au1x00/au1xxx.h | 43 -
+ arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 114 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 1 +
+ arch/mips/include/asm/mach-au1x00/au1xxx_psc.h | 26 -
+ arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 31 +-
+ arch/mips/include/asm/mach-au1x00/gpio.h | 79 ++-
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 -
+ arch/mips/include/asm/mach-db1x00/db1200.h | 2 -
+ arch/mips/include/asm/mach-db1x00/db1x00.h | 16 +-
+ arch/mips/include/asm/mach-pb1x00/pb1200.h | 18 +-
+ arch/mips/include/asm/mach-pb1x00/pb1550.h | 16 +-
+ arch/mips/include/asm/mach-powertv/dma-coherence.h | 1 -
+ arch/mips/include/asm/mipsregs.h | 8 +
+ arch/mips/include/asm/regdef.h | 6 +
+ arch/mips/include/asm/stackframe.h | 4 +-
+ arch/mips/jz4740/gpio.c | 148 +--
+ arch/mips/jz4740/irq.c | 92 +-
+ arch/mips/jz4740/irq.h | 6 +-
+ arch/mips/jz4740/pm.c | 3 -
+ arch/mips/kernel/Makefile | 5 +-
+ arch/mips/kernel/cpu-probe.c | 3 +
+ arch/mips/kernel/ftrace.c | 39 +-
+ arch/mips/kernel/i8259.c | 3 +-
+ arch/mips/kernel/linux32.c | 7 +
+ arch/mips/kernel/perf_event.c | 519 +--------
+ arch/mips/kernel/perf_event_mipsxx.c | 1265 ++++++++++++++------
+ arch/mips/kernel/scall64-n32.S | 2 +-
+ arch/mips/kernel/scall64-o32.S | 2 +-
+ arch/mips/kernel/signal.c | 3 +
+ arch/mips/kernel/traps.c | 6 +-
+ arch/mips/kernel/vpe.c | 2 +-
+ arch/mips/lantiq/irq.c | 6 +-
+ arch/mips/lantiq/xway/ebu.c | 1 -
+ arch/mips/lantiq/xway/pmu.c | 1 -
+ arch/mips/lasat/interrupt.c | 1 +
+ arch/mips/loongson/fuloong-2e/irq.c | 1 +
+ arch/mips/loongson/lemote-2f/irq.c | 3 +-
+ arch/mips/mm/mmap.c | 48 +-
+ arch/mips/mm/tlb-r3k.c | 4 +-
+ arch/mips/mm/tlb-r4k.c | 4 +-
+ arch/mips/mm/tlbex.c | 6 +-
+ arch/mips/mti-malta/malta-int.c | 6 +-
+ arch/mips/netlogic/xlr/Makefile | 2 +-
+ arch/mips/netlogic/xlr/smp.c | 4 +
+ arch/mips/pci/Makefile | 3 +-
+ arch/mips/pci/fixup-au1000.c | 43 -
+ arch/mips/pci/ops-au1000.c | 308 -----
+ arch/mips/pci/pci-alchemy.c | 516 ++++++++
+ arch/mips/pci/pci-lantiq.c | 9 +-
+ arch/mips/pci/pci-rc32434.c | 2 +-
+ arch/mips/pmc-sierra/msp71xx/msp_irq.c | 6 +-
+ arch/mips/pnx8550/common/int.c | 2 +-
+ arch/mips/sgi-ip22/ip22-int.c | 10 +-
+ arch/mips/sni/rm200.c | 1 +
+ arch/mips/vr41xx/common/irq.c | 1 +
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/i2c/busses/i2c-au1550.c | 2 +-
+ drivers/ide/Kconfig | 6 +-
+ drivers/ide/au1xxx-ide.c | 46 +-
+ drivers/mmc/host/Kconfig | 2 +-
+ drivers/mmc/host/au1xmmc.c | 93 +-
+ drivers/mtd/nand/Kconfig | 2 +-
+ drivers/mtd/nand/au1550nd.c | 6 +-
+ drivers/net/au1000_eth.c | 48 +-
+ drivers/net/au1000_eth.h | 2 +-
+ drivers/net/irda/Kconfig | 2 +-
+ drivers/spi/Kconfig | 2 +-
+ drivers/staging/octeon/ethernet-rx.c | 3 +-
+ drivers/tty/serial/lantiq.c | 4 +-
+ drivers/usb/Kconfig | 1 -
+ drivers/usb/host/Makefile | 1 +
+ drivers/usb/host/alchemy-common.c | 337 ++++++
+ drivers/usb/host/ehci-au1xxx.c | 77 +-
+ drivers/usb/host/ehci-hcd.c | 2 +-
+ drivers/usb/host/ohci-au1xxx.c | 110 +--
+ drivers/video/Kconfig | 4 +-
+ sound/mips/Kconfig | 2 +-
+ sound/soc/au1x/Kconfig | 2 +-
+ 112 files changed, 3571 insertions(+), 3184 deletions(-)
+ rename arch/mips/alchemy/common/{gpiolib-au1000.c => gpiolib.c} (83%)
+ delete mode 100644 arch/mips/alchemy/common/pci.c
+ delete mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx.h
+ delete mode 100644 arch/mips/pci/fixup-au1000.c
+ delete mode 100644 arch/mips/pci/ops-au1000.c
+ create mode 100644 arch/mips/pci/pci-alchemy.c
+ create mode 100644 drivers/usb/host/alchemy-common.c
+Merging openrisc/for-upstream
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next
+$ git merge parisc/for-next
+Already up-to-date.
+Merging powerpc/next
+$ git merge powerpc/next
+Removing arch/powerpc/boot/dts/hcu4.dts
+Removing arch/powerpc/configs/40x/hcu4_defconfig
+Removing arch/powerpc/platforms/40x/hcu4.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/gpio/Makefile
+Auto-merging kernel/sched.c
+Merge made by recursive.
+ arch/powerpc/Kconfig | 7 +-
+ arch/powerpc/Kconfig.debug | 46 +-
+ arch/powerpc/boot/Makefile | 3 +-
+ arch/powerpc/boot/dts/digsy_mtc.dts | 59 +-
+ arch/powerpc/boot/dts/hcu4.dts | 168 ---
+ arch/powerpc/boot/dts/mpc5200b.dtsi | 2 +
+ arch/powerpc/boot/dts/yosemite.dts | 36 +
+ arch/powerpc/configs/40x/hcu4_defconfig | 80 --
+ arch/powerpc/configs/85xx/p1023rds_defconfig | 2 +-
+ arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 2 +-
+ arch/powerpc/configs/mpc512x_defconfig | 19 +-
+ arch/powerpc/configs/mpc5200_defconfig | 12 +
+ arch/powerpc/configs/mpc85xx_defconfig | 2 +-
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 2 +-
+ arch/powerpc/configs/ppc40x_defconfig | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 2 +-
+ arch/powerpc/include/asm/device.h | 2 +
+ arch/powerpc/include/asm/firmware.h | 10 +
+ arch/powerpc/include/asm/hugetlb.h | 63 ++-
+ arch/powerpc/include/asm/kexec.h | 2 +-
+ arch/powerpc/include/asm/machdep.h | 3 +-
+ arch/powerpc/include/asm/mmu-book3e.h | 7 +
+ arch/powerpc/include/asm/mmu-hash64.h | 3 +-
+ arch/powerpc/include/asm/mmu.h | 18 +-
+ arch/powerpc/include/asm/mpic.h | 2 -
+ arch/powerpc/include/asm/opal.h | 443 ++++++++
+ arch/powerpc/include/asm/paca.h | 8 +
+ arch/powerpc/include/asm/page.h | 31 +-
+ arch/powerpc/include/asm/page_64.h | 11 -
+ arch/powerpc/include/asm/pte-book3e.h | 3 +
+ arch/powerpc/include/asm/rtas.h | 6 +-
+ arch/powerpc/include/asm/smp.h | 1 +
+ arch/powerpc/include/asm/sparsemem.h | 2 +-
+ arch/powerpc/include/asm/topology.h | 14 +-
+ arch/powerpc/include/asm/udbg.h | 3 +
+ arch/powerpc/include/asm/xics.h | 19 +
+ arch/powerpc/kernel/asm-offsets.c | 10 +
+ arch/powerpc/kernel/dma-iommu.c | 28 +-
+ arch/powerpc/kernel/dma-swiotlb.c | 16 +
+ arch/powerpc/kernel/dma.c | 44 +-
+ arch/powerpc/kernel/exceptions-64s.S | 27 +-
+ arch/powerpc/kernel/head_32.S | 7 +-
+ arch/powerpc/kernel/head_40x.S | 15 +-
+ arch/powerpc/kernel/head_44x.S | 16 +-
+ arch/powerpc/kernel/head_64.S | 22 +-
+ arch/powerpc/kernel/head_8xx.S | 13 +-
+ arch/powerpc/kernel/head_fsl_booke.S | 175 +++-
+ arch/powerpc/kernel/ibmebus.c | 22 +-
+ arch/powerpc/kernel/iommu.c | 8 +
+ arch/powerpc/kernel/legacy_serial.c | 25 +
+ arch/powerpc/kernel/machine_kexec_64.c | 3 +-
+ arch/powerpc/kernel/misc_32.S | 171 +++
+ arch/powerpc/kernel/pci-common.c | 11 +
+ arch/powerpc/kernel/power6-pmu.c | 4 +-
+ arch/powerpc/kernel/power7-pmu.c | 2 +
+ arch/powerpc/kernel/prom.c | 14 +
+ arch/powerpc/kernel/prom_init.c | 383 ++++++-
+ arch/powerpc/kernel/prom_init_check.sh | 4 +-
+ arch/powerpc/kernel/ptrace.c | 18 +-
+ arch/powerpc/kernel/setup_32.c | 2 +-
+ arch/powerpc/kernel/setup_64.c | 22 +-
+ arch/powerpc/kernel/smp.c | 30 +-
+ arch/powerpc/kernel/swsusp.c | 2 +-
+ arch/powerpc/kernel/udbg.c | 6 +
+ arch/powerpc/kernel/vio.c | 21 +-
+ arch/powerpc/mm/Makefile | 1 +
+ arch/powerpc/mm/hash_utils_64.c | 9 +-
+ arch/powerpc/mm/hugetlbpage-book3e.c | 121 +++
+ arch/powerpc/mm/hugetlbpage.c | 379 ++++++-
+ arch/powerpc/mm/init_32.c | 9 +
+ arch/powerpc/mm/mem.c | 8 +-
+ arch/powerpc/mm/mmu_context_hash64.c | 12 +-
+ arch/powerpc/mm/mmu_context_nohash.c | 5 +
+ arch/powerpc/mm/numa.c | 20 +-
+ arch/powerpc/mm/pgtable.c | 3 +-
+ arch/powerpc/mm/tlb_low_64e.S | 24 +-
+ arch/powerpc/mm/tlb_nohash.c | 46 +-
+ arch/powerpc/platforms/40x/Kconfig | 8 -
+ arch/powerpc/platforms/40x/Makefile | 1 -
+ arch/powerpc/platforms/40x/hcu4.c | 61 --
+ arch/powerpc/platforms/512x/Kconfig | 1 +
+ arch/powerpc/platforms/83xx/Kconfig | 9 +-
+ arch/powerpc/platforms/85xx/Kconfig | 12 +-
+ arch/powerpc/platforms/86xx/Kconfig | 1 +
+ arch/powerpc/platforms/Kconfig | 11 +-
+ arch/powerpc/platforms/Kconfig.cputype | 4 +-
+ arch/powerpc/platforms/Makefile | 1 +
+ arch/powerpc/platforms/cell/iommu.c | 21 +
+ arch/powerpc/platforms/powernv/Kconfig | 16 +
+ arch/powerpc/platforms/powernv/Makefile | 5 +
+ arch/powerpc/platforms/powernv/opal-nvram.c | 88 ++
+ arch/powerpc/platforms/powernv/opal-rtc.c | 97 ++
+ arch/powerpc/platforms/powernv/opal-takeover.S | 140 +++
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 101 ++
+ arch/powerpc/platforms/powernv/opal.c | 322 ++++++
+ arch/powerpc/platforms/powernv/pci-p5ioc2.c | 234 ++++
+ arch/powerpc/platforms/powernv/pci.c | 427 ++++++++
+ arch/powerpc/platforms/powernv/pci.h | 48 +
+ arch/powerpc/platforms/powernv/powernv.h | 16 +
+ arch/powerpc/platforms/powernv/setup.c | 196 ++++
+ arch/powerpc/platforms/powernv/smp.c | 182 ++++
+ arch/powerpc/platforms/ps3/Kconfig | 12 +
+ arch/powerpc/platforms/ps3/Makefile | 1 +
+ arch/powerpc/platforms/ps3/gelic_udbg.c | 273 +++++
+ arch/powerpc/platforms/ps3/system-bus.c | 7 +
+ arch/powerpc/platforms/pseries/Kconfig | 1 +
+ arch/powerpc/platforms/pseries/dlpar.c | 4 +
+ arch/powerpc/platforms/pseries/eeh.c | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 34 +-
+ arch/powerpc/platforms/pseries/nvram.c | 171 +++-
+ arch/powerpc/platforms/wsp/Kconfig | 11 +-
+ arch/powerpc/platforms/wsp/Makefile | 2 +
+ arch/powerpc/platforms/wsp/ics.c | 48 +
+ arch/powerpc/platforms/wsp/ics.h | 5 +
+ arch/powerpc/platforms/wsp/msi.c | 102 ++
+ arch/powerpc/platforms/wsp/msi.h | 19 +
+ arch/powerpc/platforms/wsp/psr2.c | 4 +
+ arch/powerpc/platforms/wsp/wsp.h | 3 +
+ arch/powerpc/platforms/wsp/wsp_pci.c | 1133 ++++++++++++++++++++
+ arch/powerpc/platforms/wsp/wsp_pci.h | 268 +++++
+ arch/powerpc/sysdev/Makefile | 1 -
+ arch/powerpc/sysdev/mpic.c | 24 +-
+ arch/powerpc/sysdev/ppc4xx_pci.c | 101 ++-
+ arch/powerpc/sysdev/ppc4xx_pci.h | 12 +
+ arch/powerpc/sysdev/xics/Makefile | 1 +
+ arch/powerpc/sysdev/xics/icp-native.c | 2 +-
+ arch/powerpc/sysdev/xics/ics-opal.c | 244 +++++
+ arch/powerpc/sysdev/xics/xics-common.c | 8 +-
+ arch/powerpc/xmon/xmon.c | 4 +-
+ drivers/edac/cpc925_edac.c | 67 ++-
+ drivers/edac/ppc4xx_edac.c | 2 +-
+ drivers/gpio/Kconfig | 8 +
+ drivers/gpio/Makefile | 1 +
+ .../mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c | 0
+ drivers/net/ps3_gelic_net.c | 3 +
+ drivers/net/ps3_gelic_net.h | 6 +
+ drivers/of/fdt.c | 7 +-
+ drivers/tty/hvc/Kconfig | 9 +
+ drivers/tty/hvc/Makefile | 1 +
+ drivers/tty/hvc/hvc_opal.c | 424 ++++++++
+ drivers/tty/hvc/hvcs.c | 6 +-
+ drivers/tty/hvc/hvsi_lib.c | 4 +-
+ drivers/tty/serial/8250.c | 23 -
+ include/linux/dma-mapping.h | 3 +
+ include/linux/topology.h | 4 +
+ kernel/sched.c | 2 -
+ 146 files changed, 7176 insertions(+), 745 deletions(-)
+ delete mode 100644 arch/powerpc/boot/dts/hcu4.dts
+ delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig
+ create mode 100644 arch/powerpc/include/asm/opal.h
+ create mode 100644 arch/powerpc/mm/hugetlbpage-book3e.c
+ delete mode 100644 arch/powerpc/platforms/40x/hcu4.c
+ create mode 100644 arch/powerpc/platforms/powernv/Kconfig
+ create mode 100644 arch/powerpc/platforms/powernv/Makefile
+ create mode 100644 arch/powerpc/platforms/powernv/opal-nvram.c
+ create mode 100644 arch/powerpc/platforms/powernv/opal-rtc.c
+ create mode 100644 arch/powerpc/platforms/powernv/opal-takeover.S
+ create mode 100644 arch/powerpc/platforms/powernv/opal-wrappers.S
+ create mode 100644 arch/powerpc/platforms/powernv/opal.c
+ create mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c
+ create mode 100644 arch/powerpc/platforms/powernv/pci.c
+ create mode 100644 arch/powerpc/platforms/powernv/pci.h
+ create mode 100644 arch/powerpc/platforms/powernv/powernv.h
+ create mode 100644 arch/powerpc/platforms/powernv/setup.c
+ create mode 100644 arch/powerpc/platforms/powernv/smp.c
+ create mode 100644 arch/powerpc/platforms/ps3/gelic_udbg.c
+ create mode 100644 arch/powerpc/platforms/wsp/msi.c
+ create mode 100644 arch/powerpc/platforms/wsp/msi.h
+ create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.c
+ create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.h
+ create mode 100644 arch/powerpc/sysdev/xics/ics-opal.c
+ rename arch/powerpc/sysdev/mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c (100%)
+ create mode 100644 drivers/tty/hvc/hvc_opal.c
+Merging 4xx/next
+$ git merge 4xx/next
+Already up-to-date.
+Merging 52xx-and-virtex/powerpc/next
+$ git merge 52xx-and-virtex/powerpc/next
+Merge made by recursive.
+ arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++
+ arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
+ arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
+ 3 files changed, 249 insertions(+), 8 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/charon.dts
+Merging galak/next
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features
+$ git merge s390/features
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 6 +-
+ arch/s390/Kconfig | 10 +
+ arch/s390/defconfig | 2 +-
+ arch/s390/include/asm/ccwdev.h | 3 +
+ arch/s390/include/asm/compat.h | 13 +-
+ arch/s390/include/asm/ipl.h | 1 +
+ arch/s390/include/asm/irq.h | 3 +-
+ arch/s390/include/asm/kexec.h | 6 +
+ arch/s390/include/asm/lowcore.h | 10 +-
+ arch/s390/include/asm/processor.h | 46 +++--
+ arch/s390/include/asm/ptrace.h | 29 ++--
+ arch/s390/include/asm/reset.h | 2 +-
+ arch/s390/include/asm/setup.h | 9 +
+ arch/s390/include/asm/smp.h | 5 +
+ arch/s390/include/asm/syscall.h | 5 +-
+ arch/s390/include/asm/system.h | 8 +-
+ arch/s390/include/asm/thread_info.h | 3 +-
+ arch/s390/kernel/Makefile | 1 +
+ arch/s390/kernel/asm-offsets.c | 4 +-
+ arch/s390/kernel/base.S | 6 +
+ arch/s390/kernel/compat_linux.c | 9 +-
+ arch/s390/kernel/compat_signal.c | 20 ++-
+ arch/s390/kernel/crash_dump.c | 39 ++++
+ arch/s390/kernel/early.c | 2 +-
+ arch/s390/kernel/entry.S | 30 ++--
+ arch/s390/kernel/entry64.S | 29 ++--
+ arch/s390/kernel/head.S | 16 ++
+ arch/s390/kernel/head_kdump.S | 116 ++++++++++++
+ arch/s390/kernel/ipl.c | 17 ++-
+ arch/s390/kernel/irq.c | 3 +-
+ arch/s390/kernel/machine_kexec.c | 313 ++++++++++++++++++++++++++++++++-
+ arch/s390/kernel/mem_detect.c | 69 +++++++
+ arch/s390/kernel/process.c | 3 +-
+ arch/s390/kernel/processor.c | 2 +-
+ arch/s390/kernel/ptrace.c | 155 ++++++++++++++---
+ arch/s390/kernel/reipl.S | 6 +
+ arch/s390/kernel/reipl64.S | 9 +-
+ arch/s390/kernel/setup.c | 275 +++++++++++++++++++++++++----
+ arch/s390/kernel/signal.c | 123 +++++++------
+ arch/s390/kernel/smp.c | 37 ++++-
+ arch/s390/kernel/traps.c | 2 +-
+ arch/s390/kernel/vtime.c | 9 +-
+ arch/s390/lib/delay.c | 3 +-
+ arch/s390/mm/fault.c | 4 +-
+ arch/s390/mm/maccess.c | 56 ++++++
+ arch/s390/mm/vmem.c | 6 +
+ drivers/s390/block/dasd.c | 2 -
+ drivers/s390/block/dasd_eckd.c | 1 +
+ drivers/s390/block/dasd_fba.c | 1 +
+ drivers/s390/char/con3215.c | 3 +-
+ drivers/s390/char/raw3270.c | 3 +-
+ drivers/s390/char/sclp_cmd.c | 4 +-
+ drivers/s390/char/sclp_quiesce.c | 3 +-
+ drivers/s390/char/tape_34xx.c | 1 +
+ drivers/s390/char/tape_3590.c | 1 +
+ drivers/s390/char/tape_core.c | 2 -
+ drivers/s390/char/vmur.c | 3 +-
+ drivers/s390/char/zcore.c | 20 +--
+ drivers/s390/cio/ccwgroup.c | 333 ++++++++++++++--------------------
+ drivers/s390/cio/ccwreq.c | 23 ++-
+ drivers/s390/cio/chsc_sch.c | 5 +-
+ drivers/s390/cio/cio.c | 19 ++-
+ drivers/s390/cio/device.c | 13 ++
+ drivers/s390/cio/device.h | 13 ++-
+ drivers/s390/cio/io_sch.h | 2 +
+ drivers/s390/cio/qdio_main.c | 2 -
+ drivers/s390/net/claw.c | 3 +-
+ drivers/s390/net/ctcm_main.c | 3 +-
+ drivers/s390/net/lcs.c | 3 +-
+ include/linux/crash_dump.h | 1 +
+ include/linux/elf.h | 1 +
+ include/linux/kexec.h | 10 +
+ kernel/crash_dump.c | 11 ++
+ kernel/kexec.c | 41 +++--
+ 74 files changed, 1545 insertions(+), 507 deletions(-)
+ create mode 100644 arch/s390/kernel/crash_dump.c
+ create mode 100644 arch/s390/kernel/head_kdump.S
+Merging sh/sh-latest
+$ git merge sh/sh-latest
+Merge made by recursive.
+ arch/sh/boards/mach-ecovec24/setup.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+Merging rmobile/rmobile-latest
+$ git merge rmobile/rmobile-latest
+Merge made by recursive.
+ arch/arm/mach-shmobile/include/mach/sh73a0.h | 13 ++++
+ arch/arm/mach-shmobile/pfc-sh73a0.c | 77 +++++++++++++++++++++-----
+ 2 files changed, 75 insertions(+), 15 deletions(-)
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging tile/master
+$ git merge tile/master
+Merge made by recursive.
+ arch/tile/kernel/intvec_32.S | 2 +-
+ arch/tile/lib/atomic_asm_32.S | 2 +-
+ fs/nfs/nfs4filelayout.c | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+Merging unicore32/unicore32
+$ git merge unicore32/unicore32
+Merge made by recursive.
+ arch/unicore32/boot/compressed/Makefile | 4 ++--
+ arch/unicore32/include/asm/bitops.h | 12 ++++++------
+ arch/unicore32/kernel/ksyms.c | 4 ++--
+ arch/unicore32/lib/findbit.S | 14 ++++++++------
+ 4 files changed, 18 insertions(+), 16 deletions(-)
+Merging xtensa/master
+$ git merge xtensa/master
+Merge made by recursive.
+ arch/xtensa/include/asm/irqflags.h | 1 +
+ arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++---------------
+ arch/xtensa/include/asm/timex.h | 4 +-
+ arch/xtensa/include/asm/uaccess.h | 2 +-
+ arch/xtensa/kernel/align.S | 14 +++---
+ arch/xtensa/kernel/coprocessor.S | 10 ++--
+ arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------
+ arch/xtensa/kernel/head.S | 12 ++--
+ arch/xtensa/kernel/irq.c | 5 ++
+ arch/xtensa/kernel/traps.c | 4 +-
+ arch/xtensa/kernel/vectors.S | 22 ++++----
+ arch/xtensa/kernel/vmlinux.lds.S | 1 +
+ 12 files changed, 139 insertions(+), 125 deletions(-)
+Merging ceph/for-next
+$ git merge ceph/for-next
+Auto-merging fs/ceph/caps.c
+Auto-merging fs/ceph/inode.c
+Auto-merging fs/ceph/super.h
+Auto-merging include/linux/ceph/libceph.h
+Auto-merging net/ceph/ceph_common.c
+Auto-merging net/ceph/messenger.c
+Auto-merging net/ceph/osd_client.c
+Merge made by recursive.
+ drivers/block/rbd.c | 2 +-
+ fs/ceph/addr.c | 192 +++++++++++++++++++++++++---------------
+ fs/ceph/caps.c | 2 +-
+ fs/ceph/inode.c | 46 +---------
+ fs/ceph/ioctl.c | 34 ++++++--
+ fs/ceph/ioctl.h | 55 +++++++++++-
+ fs/ceph/mds_client.c | 11 ++-
+ fs/ceph/super.c | 61 ++++++++-----
+ fs/ceph/super.h | 8 +-
+ include/linux/ceph/libceph.h | 4 +-
+ include/linux/ceph/messenger.h | 3 +-
+ net/ceph/ceph_common.c | 47 +++++-----
+ net/ceph/messenger.c | 16 +++-
+ net/ceph/mon_client.c | 79 +++++++++--------
+ net/ceph/msgpool.c | 4 +-
+ net/ceph/osd_client.c | 8 +-
+ 16 files changed, 344 insertions(+), 228 deletions(-)
+Merging cifs/master
+$ git merge cifs/master
+Already up-to-date.
+Merging configfs/linux-next
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev
+$ git merge ext4/dev
+Already up-to-date.
+Merging fatfs/master
+$ git merge fatfs/master
+Already up-to-date.
+Merging fuse/for-next
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master
+$ git merge gfs2/master
+Auto-merging fs/gfs2/acl.c
+Auto-merging fs/gfs2/quota.c
+Merge made by recursive.
+ fs/gfs2/acl.c | 5 +-
+ fs/gfs2/aops.c | 6 ---
+ fs/gfs2/dir.c | 42 +++++---------------
+ fs/gfs2/file.c | 50 ++++++++++++++++++------
+ fs/gfs2/glops.c | 29 +++++++++++---
+ fs/gfs2/incore.h | 1 +
+ fs/gfs2/inode.c | 85 +++++++++++++++--------------------------
+ fs/gfs2/inode.h | 2 +-
+ fs/gfs2/quota.c | 13 +-----
+ fs/gfs2/super.c | 111 +++++++++++++++++++++++++++++++++++-------------------
+ fs/gfs2/xattr.c | 5 +-
+ 11 files changed, 182 insertions(+), 167 deletions(-)
+Merging hfsplus/for-next
+$ git merge hfsplus/for-next
+Already up-to-date.
+Merging jfs/next
+$ git merge jfs/next
+Already up-to-date.
+Merging logfs/master
+$ git merge logfs/master
+Auto-merging fs/logfs/logfs.h
+Merge made by recursive.
+ fs/logfs/dev_mtd.c | 26 ++++++++++++--------------
+ fs/logfs/logfs.h | 1 +
+ fs/logfs/readwrite.c | 4 ++++
+ fs/logfs/segment.c | 14 ++++++++++----
+ fs/logfs/super.c | 1 +
+ 5 files changed, 28 insertions(+), 18 deletions(-)
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Auto-merging fs/compat.c
+Auto-merging fs/nfs/nfs4_fs.h
+Auto-merging include/linux/fs.h
+Removing include/linux/nfsd/const.h
+Removing include/linux/nfsd/syscall.h
+Merge made by recursive.
+ arch/alpha/include/asm/fcntl.h | 2 -
+ fs/compat.c | 1 -
+ fs/lockd/host.c | 25 +-
+ fs/lockd/svc.c | 2 +-
+ fs/locks.c | 223 ++++---
+ fs/nfs/callback.c | 4 +-
+ fs/nfs/nfs4_fs.h | 24 -
+ fs/nfsd/export.c | 16 +-
+ fs/nfsd/nfs4callback.c | 2 +-
+ fs/nfsd/nfs4proc.c | 346 ++++++++--
+ fs/nfsd/nfs4recover.c | 53 ++-
+ fs/nfsd/nfs4state.c | 1431 ++++++++++++++++++----------------------
+ fs/nfsd/nfs4xdr.c | 227 ++++---
+ fs/nfsd/nfsctl.c | 1 -
+ fs/nfsd/nfsd.h | 33 +
+ fs/nfsd/nfsfh.c | 39 +-
+ fs/nfsd/state.h | 128 ++--
+ fs/nfsd/vfs.c | 29 +-
+ fs/nfsd/vfs.h | 27 +-
+ fs/nfsd/xdr4.h | 15 +-
+ include/asm-generic/fcntl.h | 5 -
+ include/linux/fs.h | 8 +-
+ include/linux/nfs4.h | 16 +
+ include/linux/nfsd/Kbuild | 2 -
+ include/linux/nfsd/const.h | 55 --
+ include/linux/nfsd/export.h | 2 +-
+ include/linux/nfsd/nfsfh.h | 7 +-
+ include/linux/nfsd/syscall.h | 116 ----
+ include/linux/sunrpc/clnt.h | 8 +-
+ include/linux/sunrpc/svc.h | 32 +-
+ net/sunrpc/svc.c | 33 +-
+ net/sunrpc/svc_xprt.c | 13 +-
+ net/sunrpc/svcsock.c | 23 +-
+ 33 files changed, 1512 insertions(+), 1436 deletions(-)
+ delete mode 100644 include/linux/nfsd/const.h
+ delete mode 100644 include/linux/nfsd/syscall.h
+Merging nilfs2/for-next
+$ git merge nilfs2/for-next
+Already up-to-date.
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ocfs2/move_extents.c
+Merge made by recursive.
+ fs/ocfs2/aops.c | 69 +++++++++++++--
+ fs/ocfs2/aops.h | 14 +++
+ fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++----------------
+ fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++-------
+ fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++--------------
+ fs/ocfs2/cluster/tcp.h | 2 +
+ fs/ocfs2/dir.c | 3 +-
+ fs/ocfs2/dlm/dlmcommon.h | 56 +++----------
+ fs/ocfs2/dlm/dlmdomain.c | 44 +++++-----
+ fs/ocfs2/dlm/dlmlock.c | 54 ++++++------
+ fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++-------------------
+ fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------
+ fs/ocfs2/dlm/dlmthread.c | 16 ++--
+ fs/ocfs2/dlmglue.c | 21 +++--
+ fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++
+ fs/ocfs2/extent_map.h | 2 +
+ fs/ocfs2/file.c | 93 ++++++++++++++++++++-
+ fs/ocfs2/inode.h | 3 +
+ fs/ocfs2/ioctl.c | 8 +-
+ fs/ocfs2/journal.c | 23 +++++-
+ fs/ocfs2/mmap.c | 53 +++++------
+ fs/ocfs2/move_extents.c | 2 +-
+ fs/ocfs2/ocfs2.h | 4 +-
+ fs/ocfs2/quota_local.c | 13 ++-
+ fs/ocfs2/slot_map.c | 4 +-
+ fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++--
+ fs/ocfs2/super.c | 23 +++--
+ fs/ocfs2/xattr.c | 9 ++-
+ 28 files changed, 932 insertions(+), 524 deletions(-)
+Merging omfs/for-next
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master
+$ git merge squashfs/master
+Already up-to-date.
+Merging udf/for_next
+$ git merge udf/for_next
+Already up-to-date.
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Merge made by recursive.
+ Documentation/filesystems/9p.txt | 2 +-
+ fs/9p/v9fs.c | 33 ++-
+ fs/9p/vfs_dir.c | 14 +-
+ fs/9p/vfs_inode.c | 2 -
+ include/net/9p/9p.h | 14 +-
+ include/net/9p/client.h | 8 +-
+ include/net/9p/transport.h | 10 +-
+ include/trace/events/9p.h | 176 ++++++++++++++
+ net/9p/client.c | 469 +++++++++++++++++++++++++++-----------
+ net/9p/protocol.c | 99 +-------
+ net/9p/protocol.h | 4 +-
+ net/9p/trans_common.c | 53 ++---
+ net/9p/trans_common.h | 21 +--
+ net/9p/trans_virtio.c | 319 +++++++++++++++-----------
+ 14 files changed, 772 insertions(+), 452 deletions(-)
+ create mode 100644 include/trace/events/9p.h
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/master
+$ git merge xfs/master
+Resolved 'fs/xfs/xfs_aops.c' using previous resolution.
+Resolved 'fs/xfs/xfs_super.c' using previous resolution.
+Auto-merging fs/xfs/xfs_aops.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
+Auto-merging fs/xfs/xfs_iops.c
+Auto-merging fs/xfs/xfs_super.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8bc90d3] Merge remote-tracking branch 'xfs/master'
+$ git diff -M --stat --summary HEAD^..
+ fs/xfs/xfs_aops.c | 118 +--
+ fs/xfs/xfs_aops.h | 4 +-
+ fs/xfs/xfs_attr.c | 88 +-
+ fs/xfs/xfs_attr_leaf.c | 7 +-
+ fs/xfs/xfs_bmap.c | 2531 +++++++++++++++++++++++-----------------------
+ fs/xfs/xfs_bmap.h | 318 ++-----
+ fs/xfs/xfs_btree.c | 3 +-
+ fs/xfs/xfs_buf.c | 161 ++--
+ fs/xfs/xfs_buf.h | 15 +-
+ fs/xfs/xfs_buf_item.c | 4 +-
+ fs/xfs/xfs_da_btree.c | 43 +-
+ fs/xfs/xfs_dfrag.c | 6 +-
+ fs/xfs/xfs_dir2_leaf.c | 6 +-
+ fs/xfs/xfs_discard.c | 20 +-
+ fs/xfs/xfs_dquot.c | 30 +-
+ fs/xfs/xfs_export.c | 12 +-
+ fs/xfs/xfs_file.c | 168 +++-
+ fs/xfs/xfs_filestream.c | 4 +-
+ fs/xfs/xfs_fsops.c | 60 +-
+ fs/xfs/xfs_ialloc.c | 13 +-
+ fs/xfs/xfs_iget.c | 2 -
+ fs/xfs/xfs_inode.c | 33 +-
+ fs/xfs/xfs_inode.h | 1 -
+ fs/xfs/xfs_inode_item.c | 4 +-
+ fs/xfs/xfs_ioctl.c | 2 +-
+ fs/xfs/xfs_iomap.c | 39 +-
+ fs/xfs/xfs_iops.c | 14 +-
+ fs/xfs/xfs_log_recover.c | 18 +-
+ fs/xfs/xfs_mount.c | 31 +-
+ fs/xfs/xfs_qm.c | 10 +-
+ fs/xfs/xfs_qm_syscalls.c | 2 +-
+ fs/xfs/xfs_rename.c | 8 +-
+ fs/xfs/xfs_rtalloc.c | 48 +-
+ fs/xfs/xfs_rw.c | 2 +-
+ fs/xfs/xfs_super.c | 9 +-
+ fs/xfs/xfs_sync.c | 14 +-
+ fs/xfs/xfs_trace.h | 2 +-
+ fs/xfs/xfs_trans.c | 13 +-
+ fs/xfs/xfs_trans.h | 8 +-
+ fs/xfs/xfs_trans_ail.c | 33 +-
+ fs/xfs/xfs_trans_buf.c | 5 +-
+ fs/xfs/xfs_trans_inode.c | 25 +-
+ fs/xfs/xfs_trans_priv.h | 1 +
+ fs/xfs/xfs_vnodeops.c | 98 +-
+ 44 files changed, 1893 insertions(+), 2140 deletions(-)
+Merging vfs/for-next
+$ git merge vfs/for-next
+Already up-to-date.
+Merging vfs-scale/vfs-scale-working
+$ git merge vfs-scale/vfs-scale-working
+Already up-to-date.
+Merging pci/linux-next
+$ git merge pci/linux-next
+Already up-to-date.
+Merging hid/for-next
+$ git merge hid/for-next
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 7 +
+ MAINTAINERS | 6 +
+ drivers/hid/Kconfig | 29 +-
+ drivers/hid/Makefile | 3 +-
+ drivers/hid/hid-apple.c | 15 +
+ drivers/hid/hid-axff.c | 36 +-
+ drivers/hid/hid-core.c | 75 ++-
+ drivers/hid/hid-debug.c | 5 +
+ drivers/hid/hid-ids.h | 15 +
+ drivers/hid/hid-input.c | 11 +
+ drivers/hid/hid-lg.c | 29 +-
+ drivers/hid/hid-lg.h | 4 +-
+ drivers/hid/hid-lg4ff.c | 403 ++++++++-
+ drivers/hid/hid-lgff.c | 13 -
+ drivers/hid/hid-logitech-dj.c | 922 ++++++++++++++++++++
+ drivers/hid/hid-logitech-dj.h | 123 +++
+ drivers/hid/hid-multitouch.c | 93 ++-
+ drivers/hid/hid-prodikeys.c | 8 +-
+ drivers/hid/hid-roccat-kone.c | 63 +-
+ drivers/hid/hid-roccat-kovaplus.c | 17 +-
+ drivers/hid/hid-roccat-pyra.c | 23 +-
+ drivers/hid/hid-sjoy.c | 68 +-
+ drivers/hid/hid-wiimote.c | 800 +++++++++++++++++-
+ drivers/hid/hid-zydacron.c | 4 +-
+ drivers/hid/hidraw.c | 11 +-
+ drivers/hid/usbhid/hid-quirks.c | 1 -
+ drivers/hid/usbhid/hiddev.c | 2 +
+ include/linux/hid.h | 3 +
+ 28 files changed, 2606 insertions(+), 183 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
+ create mode 100644 drivers/hid/hid-logitech-dj.c
+ create mode 100644 drivers/hid/hid-logitech-dj.h
+Merging quilt/i2c
+$ git merge quilt/i2c
+Auto-merging drivers/i2c/busses/Kconfig
+Merge made by recursive.
+ drivers/i2c/busses/Kconfig | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging bjdooks-i2c/next-i2c
+$ git merge bjdooks-i2c/next-i2c
+Merge made by recursive.
+ .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 25 ++++
+ .../devicetree/bindings/i2c/samsung-i2c.txt | 39 ++++++
+ arch/arm/plat-mxc/include/mach/i2c.h | 4 -
+ arch/arm/plat-omap/i2c.c | 27 ++++
+ drivers/i2c/busses/i2c-imx.c | 46 ++++----
+ drivers/i2c/busses/i2c-omap.c | 99 ++++++++-------
+ drivers/i2c/busses/i2c-s3c2410.c | 128 ++++++++++++++++++--
+ include/linux/i2c-omap.h | 2 +
+ 8 files changed, 289 insertions(+), 81 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/samsung-i2c.txt
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Merge made by recursive.
+ drivers/hwmon/Kconfig | 15 ++++-
+ drivers/hwmon/ibmaem.c | 60 ++++++++++--------
+ drivers/hwmon/lm90.c | 146 +++++++++++++++++++++----------------------
+ drivers/hwmon/smsc47b397.c | 13 +++--
+ 4 files changed, 126 insertions(+), 108 deletions(-)
+Merging hwmon-staging/hwmon-next
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/hwmon/Kconfig
+Merge made by recursive.
+ Documentation/hwmon/ad7314 | 25 ++
+ Documentation/hwmon/adm1275 | 40 ++-
+ Documentation/hwmon/exynos4_tmu | 81 +++++
+ Documentation/hwmon/ltc2978 | 103 ++++++
+ Documentation/hwmon/pmbus | 13 +-
+ Documentation/hwmon/pmbus-core | 283 ++++++++++++++++
+ Documentation/hwmon/zl6100 | 125 +++++++
+ drivers/hwmon/Kconfig | 20 ++
+ drivers/hwmon/Makefile | 2 +
+ drivers/hwmon/ad7314.c | 186 ++++++++++
+ drivers/hwmon/exynos4_tmu.c | 524 +++++++++++++++++++++++++++++
+ drivers/hwmon/f71882fg.c | 231 +++++++------
+ drivers/hwmon/pmbus/Kconfig | 28 ++-
+ drivers/hwmon/pmbus/Makefile | 2 +
+ drivers/hwmon/pmbus/adm1275.c | 159 ++++++++-
+ drivers/hwmon/pmbus/lm25066.c | 17 +-
+ drivers/hwmon/pmbus/ltc2978.c | 408 ++++++++++++++++++++++
+ drivers/hwmon/pmbus/max16064.c | 3 +-
+ drivers/hwmon/pmbus/max34440.c | 13 +-
+ drivers/hwmon/pmbus/max8688.c | 9 +-
+ drivers/hwmon/pmbus/pmbus.c | 10 +-
+ drivers/hwmon/pmbus/pmbus.h | 23 ++-
+ drivers/hwmon/pmbus/pmbus_core.c | 85 +++--
+ drivers/hwmon/pmbus/ucd9000.c | 13 +-
+ drivers/hwmon/pmbus/ucd9200.c | 5 +-
+ drivers/hwmon/pmbus/zl6100.c | 256 ++++++++++++++
+ drivers/hwmon/w83627ehf.c | 62 ++++
+ include/linux/platform_data/exynos4_tmu.h | 83 +++++
+ 28 files changed, 2593 insertions(+), 216 deletions(-)
+ create mode 100644 Documentation/hwmon/ad7314
+ create mode 100644 Documentation/hwmon/exynos4_tmu
+ create mode 100644 Documentation/hwmon/ltc2978
+ create mode 100644 Documentation/hwmon/pmbus-core
+ create mode 100644 Documentation/hwmon/zl6100
+ create mode 100644 drivers/hwmon/ad7314.c
+ create mode 100644 drivers/hwmon/exynos4_tmu.c
+ create mode 100644 drivers/hwmon/pmbus/ltc2978.c
+ create mode 100644 drivers/hwmon/pmbus/zl6100.c
+ create mode 100644 include/linux/platform_data/exynos4_tmu.h
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Merge made by recursive.
+ Documentation/CodingStyle | 4 ++--
+ Documentation/PCI/pci.txt | 4 ++--
+ Documentation/block/switching-sched.txt | 4 ++--
+ Documentation/cgroups/cgroups.txt | 4 ++--
+ Documentation/filesystems/hfs.txt | 9 ++++-----
+ Documentation/filesystems/inotify.txt | 3 ++-
+ Documentation/laptops/thinkpad-acpi.txt | 4 ++--
+ Documentation/leds/leds-class.txt | 4 ++--
+ Documentation/serial/computone.txt | 2 --
+ 9 files changed, 18 insertions(+), 20 deletions(-)
+Merging docs/docs-move
+$ git merge docs/docs-move
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Merge made by recursive.
+ Documentation/DocBook/drm.tmpl | 308 +++++++++++++++++++++------------------
+ drivers/gpu/drm/i915/i915_drv.c | 4 +-
+ 2 files changed, 170 insertions(+), 142 deletions(-)
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/media/dvb/frontends/a8293.h
+Auto-merging drivers/media/rc/ati_remote.c
+Auto-merging drivers/media/video/tm6000/tm6000-alsa.c
+Auto-merging drivers/media/video/tm6000/tm6000-cards.c
+Auto-merging drivers/media/video/tm6000/tm6000-core.c
+Auto-merging drivers/media/video/tm6000/tm6000-dvb.c
+Auto-merging drivers/media/video/tm6000/tm6000-i2c.c
+Auto-merging drivers/media/video/tm6000/tm6000-input.c
+Auto-merging drivers/media/video/tm6000/tm6000-regs.h
+Auto-merging drivers/media/video/tm6000/tm6000-usb-isoc.h
+Auto-merging drivers/media/video/tm6000/tm6000-video.c
+Auto-merging drivers/media/video/tm6000/tm6000.h
+Auto-merging drivers/misc/altera-stapl/Kconfig
+Auto-merging drivers/misc/altera-stapl/altera-jtag.c
+Auto-merging drivers/misc/altera-stapl/altera.c
+Removing drivers/staging/altera-stapl/Makefile
+Removing drivers/staging/tm6000/README
+Removing drivers/staging/tm6000/TODO
+Removing drivers/staging/tm6000/tm6000-stds.c
+Merge made by recursive.
+ Documentation/DocBook/media/dvb/dvbproperty.xml | 24 +-
+ Documentation/DocBook/media/dvb/intro.xml | 2 +-
+ Documentation/DocBook/media/v4l/compat.xml | 8 +
+ Documentation/DocBook/media/v4l/v4l2.xml | 9 +-
+ Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 129 +
+ .../DocBook/media/v4l/vidioc-queryctrl.xml | 9 +
+ .../DocBook/media/v4l/vidioc-subscribe-event.xml | 123 +-
+ Documentation/dvb/get_dvb_firmware | 38 +-
+ Documentation/dvb/it9137.txt | 9 +
+ Documentation/feature-removal-schedule.txt | 23 -
+ .../video4linux/CARDLIST.tm6000 | 0
+ Documentation/video4linux/gspca.txt | 4 +
+ Documentation/video4linux/omap3isp.txt | 9 +-
+ Documentation/video4linux/v4l2-controls.txt | 43 +-
+ MAINTAINERS | 18 +
+ drivers/input/misc/Kconfig | 16 -
+ drivers/input/misc/Makefile | 1 -
+ drivers/media/common/saa7146_core.c | 74 +-
+ drivers/media/common/saa7146_fops.c | 118 +-
+ drivers/media/common/saa7146_hlp.c | 14 +-
+ drivers/media/common/saa7146_i2c.c | 60 +-
+ drivers/media/common/saa7146_vbi.c | 48 +-
+ drivers/media/common/saa7146_video.c | 183 +-
+ drivers/media/common/tuners/Makefile | 4 +-
+ drivers/media/common/tuners/mt20xx.c | 24 +-
+ drivers/media/common/tuners/mxl5005s.c | 22 +-
+ drivers/media/common/tuners/tda18212.c | 31 +-
+ drivers/media/common/tuners/tda18271-common.c | 32 +-
+ drivers/media/common/tuners/tda18271-fe.c | 2 +-
+ drivers/media/common/tuners/tda18271-priv.h | 39 +-
+ drivers/media/common/tuners/tda827x.c | 8 +-
+ drivers/media/common/tuners/tuner-xc2028.c | 18 +-
+ drivers/media/common/tuners/tuner-xc2028.h | 1 +
+ drivers/media/dvb/b2c2/Makefile | 4 +-
+ drivers/media/dvb/bt8xx/Makefile | 8 +-
+ drivers/media/dvb/ddbridge/Makefile | 8 +-
+ drivers/media/dvb/ddbridge/ddbridge-core.c | 43 +-
+ drivers/media/dvb/dm1105/Makefile | 2 +-
+ drivers/media/dvb/dvb-core/dvb_frontend.c | 95 +-
+ drivers/media/dvb/dvb-core/dvb_frontend.h | 1 +
+ drivers/media/dvb/dvb-usb/Kconfig | 28 +
+ drivers/media/dvb/dvb-usb/Makefile | 15 +-
+ drivers/media/dvb/dvb-usb/a800.c | 4 +-
+ drivers/media/dvb/dvb-usb/af9005-fe.c | 2 -
+ drivers/media/dvb/dvb-usb/af9005.c | 5 +-
+ drivers/media/dvb/dvb-usb/af9015.c | 70 +-
+ drivers/media/dvb/dvb-usb/anysee.c | 337 +-
+ drivers/media/dvb/dvb-usb/anysee.h | 1 +
+ drivers/media/dvb/dvb-usb/au6610.c | 9 +-
+ drivers/media/dvb/dvb-usb/az6027.c | 26 +-
+ drivers/media/dvb/dvb-usb/ce6230.c | 9 +-
+ drivers/media/dvb/dvb-usb/cinergyT2-core.c | 5 +-
+ drivers/media/dvb/dvb-usb/cxusb.c | 142 +-
+ drivers/media/dvb/dvb-usb/dib0700_core.c | 99 +-
+ drivers/media/dvb/dvb-usb/dib0700_devices.c | 377 +-
+ drivers/media/dvb/dvb-usb/dibusb-common.c | 27 +-
+ drivers/media/dvb/dvb-usb/dibusb-mb.c | 31 +-
+ drivers/media/dvb/dvb-usb/dibusb-mc.c | 3 +
+ drivers/media/dvb/dvb-usb/digitv.c | 16 +-
+ drivers/media/dvb/dvb-usb/dtt200u.c | 14 +-
+ drivers/media/dvb/dvb-usb/dtv5100.c | 11 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 153 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 4 +
+ drivers/media/dvb/dvb-usb/dvb-usb-init.c | 41 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 28 +-
+ drivers/media/dvb/dvb-usb/dvb-usb.h | 37 +-
+ drivers/media/dvb/dvb-usb/dw2102.c | 115 +-
+ drivers/media/dvb/dvb-usb/ec168.c | 9 +-
+ drivers/media/dvb/dvb-usb/friio.c | 7 +-
+ drivers/media/dvb/dvb-usb/gl861.c | 9 +-
+ drivers/media/dvb/dvb-usb/gp8psk-fe.c | 17 +-
+ drivers/media/dvb/dvb-usb/gp8psk.c | 5 +-
+ drivers/media/dvb/dvb-usb/it913x.c | 651 +++
+ drivers/media/dvb/dvb-usb/lmedm04.c | 60 +-
+ drivers/media/dvb/dvb-usb/m920x.c | 58 +-
+ drivers/media/dvb/dvb-usb/mxl111sf-gpio.c | 763 +++
+ drivers/media/dvb/dvb-usb/mxl111sf-gpio.h | 56 +
+ drivers/media/dvb/dvb-usb/mxl111sf-i2c.c | 851 ++++
+ drivers/media/dvb/dvb-usb/mxl111sf-i2c.h | 35 +
+ drivers/media/dvb/dvb-usb/mxl111sf-phy.c | 342 ++
+ drivers/media/dvb/dvb-usb/mxl111sf-phy.h | 53 +
+ drivers/media/dvb/dvb-usb/mxl111sf-reg.h | 179 +
+ drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | 476 ++
+ drivers/media/dvb/dvb-usb/mxl111sf-tuner.h | 89 +
+ drivers/media/dvb/dvb-usb/mxl111sf.c | 864 ++++
+ drivers/media/dvb/dvb-usb/mxl111sf.h | 158 +
+ drivers/media/dvb/dvb-usb/nova-t-usb2.c | 4 +-
+ drivers/media/dvb/dvb-usb/opera1.c | 13 +-
+ drivers/media/dvb/dvb-usb/pctv452e.c | 1093 +++++
+ drivers/media/dvb/dvb-usb/technisat-usb2.c | 28 +-
+ drivers/media/dvb/dvb-usb/ttusb2.c | 407 ++-
+ drivers/media/dvb/dvb-usb/umt-010.c | 8 +-
+ drivers/media/dvb/dvb-usb/usb-urb.c | 4 +-
+ drivers/media/dvb/dvb-usb/vp702x.c | 5 +-
+ drivers/media/dvb/dvb-usb/vp7045.c | 5 +-
+ drivers/media/dvb/frontends/Kconfig | 30 +
+ drivers/media/dvb/frontends/Makefile | 8 +-
+ drivers/media/dvb/frontends/a8293.c | 184 +
+ .../tda18212_priv.h => dvb/frontends/a8293.h} | 39 +-
+ drivers/media/dvb/frontends/cxd2820r.h | 9 -
+ drivers/media/dvb/frontends/cxd2820r_c.c | 1 -
+ drivers/media/dvb/frontends/cxd2820r_core.c | 80 +-
+ drivers/media/dvb/frontends/cxd2820r_priv.h | 1 -
+ drivers/media/dvb/frontends/cxd2820r_t.c | 1 -
+ drivers/media/dvb/frontends/cxd2820r_t2.c | 1 -
+ drivers/media/dvb/frontends/dib0070.c | 37 +-
+ drivers/media/dvb/frontends/dib0090.c | 70 +-
+ drivers/media/dvb/frontends/dib7000m.c | 27 +-
+ drivers/media/dvb/frontends/dib7000p.c | 34 +-
+ drivers/media/dvb/frontends/dib8000.c | 72 +-
+ drivers/media/dvb/frontends/dib9000.c | 166 +-
+ drivers/media/dvb/frontends/dibx000_common.c | 76 +-
+ drivers/media/dvb/frontends/dibx000_common.h | 1 +
+ drivers/media/dvb/frontends/drxd_hard.c | 24 +-
+ drivers/media/dvb/frontends/drxk_hard.c | 10 +-
+ drivers/media/dvb/frontends/it913x-fe-priv.h | 328 ++
+ drivers/media/dvb/frontends/it913x-fe.c | 824 ++++
+ drivers/media/dvb/frontends/it913x-fe.h | 196 +
+ drivers/media/dvb/frontends/lnbp22.c | 148 +
+ drivers/media/dvb/frontends/lnbp22.h | 57 +
+ drivers/media/dvb/frontends/stb0899_drv.c | 6 +-
+ drivers/media/dvb/frontends/stv0288.c | 29 +-
+ drivers/media/dvb/frontends/stv090x.c | 35 +-
+ drivers/media/dvb/frontends/tda10048.c | 37 +-
+ drivers/media/dvb/frontends/tda10048.h | 8 +
+ drivers/media/dvb/frontends/tda10071.c | 1269 +++++
+ drivers/media/dvb/frontends/tda10071.h | 81 +
+ drivers/media/dvb/frontends/tda10071_priv.h | 122 +
+ drivers/media/dvb/frontends/tda18271c2dd.c | 4 +-
+ drivers/media/dvb/mantis/Makefile | 2 +-
+ drivers/media/dvb/mantis/hopper_cards.c | 6 +-
+ drivers/media/dvb/mantis/mantis_cards.c | 6 +-
+ drivers/media/dvb/mantis/mantis_common.h | 5 +-
+ drivers/media/dvb/mantis/mantis_dma.c | 92 +-
+ drivers/media/dvb/mantis/mantis_vp1041.c | 1 -
+ drivers/media/dvb/ngene/Makefile | 8 +-
+ drivers/media/dvb/pluto2/Makefile | 2 +-
+ drivers/media/dvb/pt1/Makefile | 2 +-
+ drivers/media/dvb/siano/Makefile | 4 +-
+ drivers/media/dvb/ttpci/Makefile | 4 +-
+ drivers/media/dvb/ttpci/av7110_v4l.c | 32 +-
+ drivers/media/dvb/ttpci/budget-av.c | 47 +-
+ drivers/media/dvb/ttpci/budget-ci.c | 1 -
+ drivers/media/dvb/ttpci/budget-core.c | 2 +
+ drivers/media/dvb/ttpci/budget.h | 1 +
+ drivers/media/dvb/ttpci/ttpci-eeprom.c | 29 +
+ drivers/media/dvb/ttpci/ttpci-eeprom.h | 1 +
+ drivers/media/dvb/ttusb-budget/Makefile | 2 +-
+ drivers/media/dvb/ttusb-dec/Makefile | 2 +-
+ drivers/media/radio/Makefile | 2 +-
+ drivers/media/radio/radio-si4713.c | 4 -
+ drivers/media/radio/radio-wl1273.c | 2 +-
+ drivers/media/radio/si470x/radio-si470x-usb.c | 2 -
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 6 +-
+ drivers/media/rc/Kconfig | 23 +-
+ drivers/media/rc/Makefile | 1 +
+ drivers/{input/misc => media/rc}/ati_remote.c | 301 +-
+ drivers/media/rc/ene_ir.c | 73 +-
+ drivers/media/rc/ene_ir.h | 19 +-
+ drivers/media/rc/imon.c | 36 +-
+ drivers/media/rc/keymaps/Makefile | 3 +
+ drivers/media/rc/keymaps/rc-ati-x10.c | 104 +
+ drivers/media/rc/keymaps/rc-medion-x10.c | 117 +
+ drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
+ drivers/media/rc/keymaps/rc-snapstream-firefly.c | 107 +
+ drivers/media/rc/mceusb.c | 410 ++-
+ drivers/media/rc/rc-core-priv.h | 14 +-
+ drivers/media/rc/rc-main.c | 29 +-
+ drivers/media/rc/redrat3.c | 7 -
+ drivers/media/rc/winbond-cir.c | 6 +-
+ drivers/media/video/Kconfig | 49 +-
+ drivers/media/video/Makefile | 9 +-
+ drivers/media/video/adp1653.c | 20 +-
+ drivers/media/video/atmel-isi.c | 24 +-
+ drivers/media/video/au0828/Makefile | 8 +-
+ drivers/media/video/bt819.c | 2 +-
+ drivers/media/video/bt8xx/Makefile | 6 +-
+ drivers/media/video/bt8xx/bttv-cards.c | 242 +-
+ drivers/media/video/bt8xx/bttv-driver.c | 294 +-
+ drivers/media/video/bt8xx/bttv-gpio.c | 4 +-
+ drivers/media/video/bt8xx/bttv-i2c.c | 56 +-
+ drivers/media/video/bt8xx/bttv-input.c | 37 +-
+ drivers/media/video/bt8xx/bttv-risc.c | 25 +-
+ drivers/media/video/bt8xx/bttv-vbi.c | 9 +-
+ drivers/media/video/bt8xx/bttvp.h | 18 +-
+ drivers/media/video/cx18/Makefile | 6 +-
+ drivers/media/video/cx18/cx18-driver.h | 5 +-
+ drivers/media/video/cx18/cx18-fileops.c | 2 -
+ drivers/media/video/cx18/cx18-ioctl.c | 18 +-
+ drivers/media/video/cx18/cx18-mailbox.c | 2 +-
+ drivers/media/video/cx18/cx18-streams.c | 13 +
+ drivers/media/video/cx231xx/Makefile | 10 +-
+ drivers/media/video/cx23885/Kconfig | 2 +-
+ drivers/media/video/cx23885/Makefile | 10 +-
+ drivers/media/video/cx23885/cx23885-cards.c | 2 +-
+ drivers/media/video/cx23885/cx23885-dvb.c | 2 +-
+ drivers/media/video/cx23885/cx23888-ir.c | 12 +-
+ drivers/media/video/cx25840/Makefile | 2 +-
+ drivers/media/video/cx25840/cx25840-ir.c | 12 +-
+ drivers/media/video/cx88/Makefile | 8 +-
+ drivers/media/video/cx88/cx88-core.c | 3 -
+ drivers/media/video/cx88/cx88-video.c | 2 +-
+ drivers/media/video/davinci/vpbe_display.c | 1 -
+ drivers/media/video/davinci/vpbe_osd.c | 2 +-
+ drivers/media/video/em28xx/Kconfig | 2 +
+ drivers/media/video/em28xx/Makefile | 8 +-
+ drivers/media/video/em28xx/em28xx-cards.c | 155 +-
+ drivers/media/video/em28xx/em28xx-core.c | 45 +-
+ drivers/media/video/em28xx/em28xx-dvb.c | 117 +-
+ drivers/media/video/em28xx/em28xx-input.c | 6 +-
+ drivers/media/video/em28xx/em28xx-video.c | 1 +
+ drivers/media/video/em28xx/em28xx.h | 3 +-
+ drivers/media/video/et61x251/et61x251.h | 66 +-
+ drivers/media/video/et61x251/et61x251_core.c | 2 +
+ drivers/media/video/et61x251/et61x251_tas5130d1b.c | 2 +
+ drivers/media/video/gspca/Kconfig | 10 +
+ drivers/media/video/gspca/Makefile | 2 +
+ drivers/media/video/gspca/benq.c | 31 +-
+ drivers/media/video/gspca/conex.c | 6 +-
+ drivers/media/video/gspca/cpia1.c | 7 +-
+ drivers/media/video/gspca/etoms.c | 6 +-
+ drivers/media/video/gspca/finepix.c | 8 +-
+ drivers/media/video/gspca/gl860/Makefile | 2 +-
+ drivers/media/video/gspca/gl860/gl860.c | 8 +-
+ drivers/media/video/gspca/gspca.c | 287 +-
+ drivers/media/video/gspca/gspca.h | 22 +-
+ drivers/media/video/gspca/jeilinj.c | 20 +-
+ drivers/media/video/gspca/kinect.c | 41 +-
+ drivers/media/video/gspca/konica.c | 16 +-
+ drivers/media/video/gspca/m5602/Makefile | 2 +-
+ drivers/media/video/gspca/m5602/m5602_core.c | 9 +-
+ drivers/media/video/gspca/m5602/m5602_mt9m111.c | 28 +-
+ drivers/media/video/gspca/m5602/m5602_ov7660.c | 21 +-
+ drivers/media/video/gspca/m5602/m5602_ov9650.c | 19 +-
+ drivers/media/video/gspca/m5602/m5602_po1030.c | 21 +-
+ drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 35 +-
+ drivers/media/video/gspca/m5602/m5602_s5k83a.c | 30 +-
+ drivers/media/video/gspca/mars.c | 6 +-
+ drivers/media/video/gspca/mr97310a.c | 24 +-
+ drivers/media/video/gspca/nw80x.c | 9 +-
+ drivers/media/video/gspca/ov519.c | 41 +-
+ drivers/media/video/gspca/ov534.c | 12 +-
+ drivers/media/video/gspca/ov534_9.c | 516 +--
+ drivers/media/video/gspca/pac207.c | 14 +-
+ drivers/media/video/gspca/pac7302.c | 15 +-
+ drivers/media/video/gspca/pac7311.c | 15 +-
+ drivers/media/video/gspca/se401.c | 46 +-
+ drivers/media/video/gspca/sn9c2028.c | 14 +-
+ drivers/media/video/gspca/sn9c20x.c | 76 +-
+ drivers/media/video/gspca/sonixj.c | 45 +-
+ drivers/media/video/gspca/spca1528.c | 34 +-
+ drivers/media/video/gspca/spca500.c | 6 +-
+ drivers/media/video/gspca/spca501.c | 4 +-
+ drivers/media/video/gspca/spca505.c | 8 +-
+ drivers/media/video/gspca/spca508.c | 6 +-
+ drivers/media/video/gspca/spca561.c | 4 +-
+ drivers/media/video/gspca/sq905.c | 17 +-
+ drivers/media/video/gspca/sq905c.c | 10 +-
+ drivers/media/video/gspca/sq930x.c | 21 +-
+ drivers/media/video/gspca/stk014.c | 16 +-
+ drivers/media/video/gspca/stv0680.c | 6 +-
+ drivers/media/video/gspca/stv06xx/Makefile | 2 +-
+ drivers/media/video/gspca/stv06xx/stv06xx.c | 18 +-
+ drivers/media/video/gspca/stv06xx/stv06xx.h | 6 +-
+ drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 10 +-
+ drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 4 +-
+ drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 4 +-
+ drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 32 +-
+ drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 56 +-
+ drivers/media/video/gspca/sunplus.c | 10 +-
+ drivers/media/video/gspca/t613.c | 12 +-
+ drivers/media/video/gspca/topro.c | 4989 ++++++++++++++++++++
+ drivers/media/video/gspca/vc032x.c | 13 +-
+ drivers/media/video/gspca/vicam.c | 12 +-
+ drivers/media/video/gspca/w996Xcf.c | 8 +-
+ drivers/media/video/gspca/xirlink_cit.c | 14 +-
+ drivers/media/video/gspca/zc3xx.c | 15 +-
+ drivers/media/video/hdpvr/Makefile | 4 +-
+ drivers/media/video/hexium_gemini.c | 44 +-
+ drivers/media/video/hexium_orion.c | 38 +-
+ drivers/media/video/ivtv/Makefile | 8 +-
+ drivers/media/video/ivtv/ivtv-ioctl.c | 15 +-
+ drivers/media/video/m5mols/m5mols_core.c | 6 +-
+ drivers/media/video/marvell-ccic/mcam-core.c | 12 +-
+ drivers/media/video/marvell-ccic/mmp-driver.c | 1 +
+ drivers/media/video/mem2mem_testdev.c | 16 +-
+ drivers/media/video/mt9m111.c | 9 +-
+ drivers/media/video/mt9p031.c | 963 ++++
+ drivers/media/video/mt9t001.c | 835 ++++
+ drivers/media/video/mx3_camera.c | 4 +-
+ drivers/media/video/mxb.c | 80 +-
+ drivers/media/video/noon010pc30.c | 263 +-
+ drivers/media/video/omap3isp/Makefile | 4 +-
+ drivers/media/video/omap3isp/isp.c | 6 +-
+ drivers/media/video/omap3isp/isp.h | 85 +-
+ drivers/media/video/omap3isp/ispccdc.c | 11 +-
+ drivers/media/video/omap3isp/ispccp2.c | 4 +-
+ drivers/media/video/omap3isp/ispqueue.c | 4 +
+ drivers/media/video/omap3isp/ispvideo.c | 22 +-
+ drivers/media/video/pvrusb2/Makefile | 8 +-
+ drivers/media/video/pwc/pwc-if.c | 4 +-
+ drivers/media/video/pwc/pwc-v4l.c | 136 +-
+ drivers/media/video/s5p-fimc/Makefile | 2 +-
+ drivers/media/video/s5p-fimc/fimc-capture.c | 1462 ++++--
+ drivers/media/video/s5p-fimc/fimc-core.c | 1134 +++---
+ drivers/media/video/s5p-fimc/fimc-core.h | 221 +-
+ drivers/media/video/s5p-fimc/fimc-mdevice.c | 858 ++++
+ drivers/media/video/s5p-fimc/fimc-mdevice.h | 118 +
+ drivers/media/video/s5p-fimc/fimc-reg.c | 90 +-
+ drivers/media/video/s5p-fimc/mipi-csis.c | 90 +-
+ drivers/media/video/s5p-fimc/regs-fimc.h | 9 +-
+ drivers/media/video/s5p-mfc/s5p_mfc.c | 15 +-
+ drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 18 +-
+ drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 36 +-
+ drivers/media/video/s5p-mfc/s5p_mfc_opr.c | 14 +-
+ drivers/media/video/s5p-tv/Kconfig | 2 +-
+ drivers/media/video/s5p-tv/hdmi_drv.c | 15 +-
+ drivers/media/video/s5p-tv/mixer.h | 2 -
+ drivers/media/video/s5p-tv/mixer_grp_layer.c | 2 +-
+ drivers/media/video/s5p-tv/mixer_reg.c | 11 +-
+ drivers/media/video/s5p-tv/mixer_video.c | 24 +-
+ drivers/media/video/s5p-tv/mixer_vp_layer.c | 4 +-
+ drivers/media/video/s5p-tv/regs-hdmi.h | 4 +
+ drivers/media/video/s5p-tv/regs-mixer.h | 1 +
+ drivers/media/video/s5p-tv/sdo_drv.c | 1 +
+ drivers/media/video/saa7115.c | 5 +-
+ drivers/media/video/saa7134/Makefile | 8 +-
+ drivers/media/video/saa7164/Makefile | 10 +-
+ drivers/media/video/saa7164/saa7164-cards.c | 128 +
+ drivers/media/video/saa7164/saa7164-dvb.c | 2 +
+ drivers/media/video/saa7164/saa7164.h | 2 +
+ drivers/media/video/sh_mobile_ceu_camera.c | 6 +-
+ drivers/media/video/sr030pc30.c | 6 -
+ drivers/media/video/stk-webcam.c | 29 +-
+ drivers/media/video/tlg2300/Makefile | 8 +-
+ drivers/{staging => media/video}/tm6000/Kconfig | 0
+ drivers/{staging => media/video}/tm6000/Makefile | 0
+ .../{staging => media/video}/tm6000/tm6000-alsa.c | 9 +-
+ .../{staging => media/video}/tm6000/tm6000-cards.c | 44 +-
+ .../{staging => media/video}/tm6000/tm6000-core.c | 108 +-
+ .../{staging => media/video}/tm6000/tm6000-dvb.c | 18 +-
+ .../{staging => media/video}/tm6000/tm6000-i2c.c | 21 +-
+ .../{staging => media/video}/tm6000/tm6000-input.c | 2 +-
+ .../{staging => media/video}/tm6000/tm6000-regs.h | 6 +-
+ drivers/media/video/tm6000/tm6000-stds.c | 659 +++
+ .../video}/tm6000/tm6000-usb-isoc.h | 2 +-
+ .../{staging => media/video}/tm6000/tm6000-video.c | 122 +-
+ drivers/{staging => media/video}/tm6000/tm6000.h | 15 +-
+ drivers/media/video/tvaudio.c | 9 +-
+ drivers/media/video/tvp7002.c | 14 +-
+ drivers/media/video/usbvision/Makefile | 4 +-
+ drivers/media/video/uvc/uvc_driver.c | 13 +
+ drivers/media/video/uvc/uvc_v4l2.c | 54 +-
+ drivers/media/video/uvc/uvc_video.c | 17 +-
+ drivers/media/video/uvc/uvcvideo.h | 104 +-
+ drivers/media/video/v4l2-ctrls.c | 104 +-
+ drivers/media/video/v4l2-ioctl.c | 517 +--
+ drivers/media/video/v4l2-mem2mem.c | 18 +-
+ drivers/media/video/v4l2-subdev.c | 19 +
+ drivers/media/video/videobuf2-core.c | 205 +-
+ drivers/media/video/videobuf2-dma-contig.c | 16 +-
+ drivers/media/video/videobuf2-dma-sg.c | 6 -
+ drivers/media/video/videobuf2-memops.c | 6 +-
+ drivers/media/video/vivi.c | 23 +-
+ drivers/media/video/vpx3220.c | 2 +-
+ drivers/media/video/zr364xx.c | 3 +
+ drivers/misc/Kconfig | 1 +
+ drivers/misc/Makefile | 1 +
+ drivers/{staging => misc}/altera-stapl/Kconfig | 2 +
+ drivers/misc/altera-stapl/Makefile | 3 +
+ .../{staging => misc}/altera-stapl/altera-comp.c | 0
+ .../{staging => misc}/altera-stapl/altera-exprt.h | 0
+ .../{staging => misc}/altera-stapl/altera-jtag.c | 2 +-
+ .../{staging => misc}/altera-stapl/altera-jtag.h | 0
+ .../{staging => misc}/altera-stapl/altera-lpt.c | 0
+ drivers/{staging => misc}/altera-stapl/altera.c | 2 +-
+ drivers/staging/Kconfig | 4 -
+ drivers/staging/Makefile | 2 -
+ drivers/staging/altera-stapl/Makefile | 3 -
+ drivers/staging/dt3155v4l/dt3155v4l.c | 4 +-
+ drivers/staging/tm6000/README | 22 -
+ drivers/staging/tm6000/TODO | 8 -
+ drivers/staging/tm6000/tm6000-stds.c | 679 ---
+ include/linux/dvb/frontend.h | 1 +
+ include/linux/dvb/version.h | 2 +-
+ include/linux/omap3isp.h | 2 -
+ include/linux/usb/Kbuild | 1 +
+ include/linux/videodev2.h | 13 +-
+ include/media/m5mols.h | 4 +-
+ include/media/mt9p031.h | 19 +
+ include/media/mt9t001.h | 8 +
+ include/media/omap3isp.h | 140 +
+ include/media/rc-core.h | 7 +-
+ include/media/rc-map.h | 3 +
+ include/media/s5p_fimc.h | 18 +-
+ include/media/saa7146.h | 36 +-
+ include/media/v4l2-chip-ident.h | 3 -
+ include/media/v4l2-ctrls.h | 15 +-
+ include/media/v4l2-mediabus.h | 12 +-
+ include/media/videobuf2-core.h | 23 +-
+ include/media/videobuf2-dma-contig.h | 6 +-
+ .../staging/altera-stapl => include/misc}/altera.h | 0
+ 402 files changed, 26444 insertions(+), 6479 deletions(-)
+ create mode 100644 Documentation/dvb/it9137.txt
+ rename drivers/staging/tm6000/CARDLIST => Documentation/video4linux/CARDLIST.tm6000 (100%)
+ create mode 100644 drivers/media/dvb/dvb-usb/it913x.c
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-gpio.c
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-gpio.h
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-i2c.c
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-i2c.h
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-phy.c
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-phy.h
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-reg.h
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-tuner.h
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
+ create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.h
+ create mode 100644 drivers/media/dvb/dvb-usb/pctv452e.c
+ create mode 100644 drivers/media/dvb/frontends/a8293.c
+ rename drivers/media/{common/tuners/tda18212_priv.h => dvb/frontends/a8293.h} (58%)
+ create mode 100644 drivers/media/dvb/frontends/it913x-fe-priv.h
+ create mode 100644 drivers/media/dvb/frontends/it913x-fe.c
+ create mode 100644 drivers/media/dvb/frontends/it913x-fe.h
+ create mode 100644 drivers/media/dvb/frontends/lnbp22.c
+ create mode 100644 drivers/media/dvb/frontends/lnbp22.h
+ create mode 100644 drivers/media/dvb/frontends/tda10071.c
+ create mode 100644 drivers/media/dvb/frontends/tda10071.h
+ create mode 100644 drivers/media/dvb/frontends/tda10071_priv.h
+ rename drivers/{input/misc => media/rc}/ati_remote.c (77%)
+ create mode 100644 drivers/media/rc/keymaps/rc-ati-x10.c
+ create mode 100644 drivers/media/rc/keymaps/rc-medion-x10.c
+ create mode 100644 drivers/media/rc/keymaps/rc-snapstream-firefly.c
+ create mode 100644 drivers/media/video/gspca/topro.c
+ create mode 100644 drivers/media/video/mt9p031.c
+ create mode 100644 drivers/media/video/mt9t001.c
+ create mode 100644 drivers/media/video/s5p-fimc/fimc-mdevice.c
+ create mode 100644 drivers/media/video/s5p-fimc/fimc-mdevice.h
+ rename drivers/{staging => media/video}/tm6000/Kconfig (100%)
+ rename drivers/{staging => media/video}/tm6000/Makefile (100%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-alsa.c (97%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-cards.c (97%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-core.c (91%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-dvb.c (95%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-i2c.c (95%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-input.c (99%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-regs.h (99%)
+ create mode 100644 drivers/media/video/tm6000/tm6000-stds.c
+ rename drivers/{staging => media/video}/tm6000/tm6000-usb-isoc.h (97%)
+ rename drivers/{staging => media/video}/tm6000/tm6000-video.c (96%)
+ rename drivers/{staging => media/video}/tm6000/tm6000.h (98%)
+ rename drivers/{staging => misc}/altera-stapl/Kconfig (77%)
+ create mode 100644 drivers/misc/altera-stapl/Makefile
+ rename drivers/{staging => misc}/altera-stapl/altera-comp.c (100%)
+ rename drivers/{staging => misc}/altera-stapl/altera-exprt.h (100%)
+ rename drivers/{staging => misc}/altera-stapl/altera-jtag.c (99%)
+ rename drivers/{staging => misc}/altera-stapl/altera-jtag.h (100%)
+ rename drivers/{staging => misc}/altera-stapl/altera-lpt.c (100%)
+ rename drivers/{staging => misc}/altera-stapl/altera.c (99%)
+ delete mode 100644 drivers/staging/altera-stapl/Makefile
+ delete mode 100644 drivers/staging/tm6000/README
+ delete mode 100644 drivers/staging/tm6000/TODO
+ delete mode 100644 drivers/staging/tm6000/tm6000-stds.c
+ create mode 100644 include/media/mt9p031.h
+ create mode 100644 include/media/mt9t001.h
+ create mode 100644 include/media/omap3isp.h
+ rename {drivers/staging/altera-stapl => include/misc}/altera.h (100%)
+Merging kbuild/for-next
+$ git merge kbuild/for-next
+Auto-merging Makefile
+Auto-merging scripts/checkpatch.pl
+Merge made by recursive.
+ Makefile | 3 +-
+ scripts/Makefile.build | 2 +-
+ scripts/Makefile.lib | 4 ++
+ scripts/basic/fixdep.c | 1 +
+ scripts/checkpatch.pl | 14 ++++++
+ scripts/extract-vmlinux | 62 ++++++++++++++++++++++++
+ scripts/kconfig/Makefile | 28 +----------
+ scripts/kconfig/confdata.c | 49 ++++++++++++++-----
+ scripts/kconfig/lxdialog/textbox.c | 3 +-
+ scripts/kconfig/mconf.c | 86 ++++++++++++++++++++-------------
+ scripts/kconfig/menu.c | 13 ++---
+ scripts/kconfig/nconf.c | 23 ++++-----
+ scripts/kconfig/nconf.gui.c | 59 ++++++++++++++++++-----
+ scripts/kconfig/nconf.h | 2 +-
+ scripts/kconfig/streamline_config.pl | 22 +++++++-
+ scripts/tags.sh | 4 +-
+ 16 files changed, 258 insertions(+), 117 deletions(-)
+ create mode 100755 scripts/extract-vmlinux
+Merging kconfig/for-next
+$ git merge kconfig/for-next
+Already up-to-date!
+Merge made by recursive.
+Merging ide/master
+$ git merge ide/master
+Already up-to-date.
+Merging libata/NEXT
+$ git merge libata/NEXT
+Merge made by recursive.
+ drivers/ata/libata-eh.c | 5 ++---
+ drivers/ata/sata_sil24.c | 4 ++--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Merge made by recursive.
+ drivers/infiniband/core/cma.c | 52 ++++++++++++++++++--------
+ drivers/infiniband/core/mad.c | 3 +
+ drivers/infiniband/core/ucm.c | 2 +-
+ drivers/infiniband/core/ucma.c | 2 +-
+ drivers/infiniband/core/user_mad.c | 5 +-
+ drivers/infiniband/core/uverbs_main.c | 3 +-
+ drivers/infiniband/hw/amso1100/c2_provider.c | 5 +--
+ drivers/infiniband/hw/cxgb4/device.c | 41 ++++++++++++++++----
+ drivers/infiniband/hw/ehca/ehca_eq.c | 4 +-
+ drivers/infiniband/hw/mthca/mthca_mr.c | 2 +-
+ drivers/infiniband/hw/qib/qib.h | 4 ++
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +
+ drivers/infiniband/hw/qib/qib_init.c | 1 +
+ drivers/infiniband/hw/qib/qib_sysfs.c | 3 +-
+ drivers/net/mlx4/eq.c | 2 +-
+ drivers/net/mlx4/mr.c | 2 +-
+ drivers/net/mlx4/port.c | 30 ++++++++------
+ 17 files changed, 108 insertions(+), 55 deletions(-)
+Merging acpi/acpi
+$ git merge acpi/acpi
+Already up-to-date.
+Merging idle-test/idle-test
+$ git merge idle-test/idle-test
+Already up-to-date.
+Merging powertools/tools-test
+$ git merge powertools/tools-test
+Already up-to-date.
+Merging cpupowerutils/master
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Merge made by recursive.
+ drivers/firewire/ohci.c | 203 +++++++++++++++++++++++++++++++++++--
+ drivers/firewire/sbp2.c | 256 +++++++++++++++++++++--------------------------
+ 2 files changed, 305 insertions(+), 154 deletions(-)
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/master
+$ git merge swiotlb/master
+Merge made by recursive.
+Merging ibft/master
+$ git merge ibft/master
+Merge made by recursive.
+Merging scsi/master
+$ git merge scsi/master
+Auto-merging drivers/s390/cio/qdio_main.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging drivers/scsi/Makefile
+Auto-merging drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+Auto-merging drivers/scsi/fcoe/fcoe.c
+Auto-merging drivers/scsi/libfc/fc_exch.c
+Auto-merging drivers/scsi/libfc/fc_fcp.c
+Auto-merging drivers/scsi/libsas/sas_expander.c
+Auto-merging drivers/scsi/qla2xxx/qla_isr.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/qla4xxx/Kconfig
+Merge made by recursive.
+ Documentation/ABI/testing/sysfs-block | 13 +
+ Documentation/scsi/bnx2fc.txt | 75 +
+ arch/s390/include/asm/qdio.h | 5 +
+ block/genhd.c | 71 +
+ drivers/ata/libata-core.c | 1 +
+ drivers/ata/libata-scsi.c | 44 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 80 +-
+ drivers/message/fusion/mptbase.c | 92 ++-
+ drivers/message/fusion/mptbase.h | 72 +-
+ drivers/message/fusion/mptsas.c | 47 +-
+ drivers/message/fusion/mptscsih.c | 18 +-
+ drivers/message/fusion/mptscsih.h | 1 +
+ drivers/s390/cio/qdio_main.c | 11 +-
+ drivers/s390/cio/qdio_setup.c | 1 +
+ drivers/s390/scsi/zfcp_dbf.c | 36 +
+ drivers/s390/scsi/zfcp_def.h | 7 +
+ drivers/s390/scsi/zfcp_ext.h | 1 +
+ drivers/s390/scsi/zfcp_fsf.c | 80 +-
+ drivers/s390/scsi/zfcp_qdio.c | 58 +-
+ drivers/s390/scsi/zfcp_qdio.h | 66 +-
+ drivers/s390/scsi/zfcp_scsi.c | 15 +-
+ drivers/scsi/Kconfig | 14 +-
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/aic94xx/aic94xx_scb.c | 1 +
+ drivers/scsi/be2iscsi/be_iscsi.c | 60 +-
+ drivers/scsi/be2iscsi/be_iscsi.h | 2 +
+ drivers/scsi/be2iscsi/be_main.c | 101 +-
+ drivers/scsi/be2iscsi/be_main.h | 3 +
+ drivers/scsi/bnx2fc/bnx2fc.h | 3 +-
+ drivers/scsi/bnx2fc/bnx2fc_els.c | 26 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 204 ++-
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 16 +-
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 32 +-
+ drivers/scsi/bnx2fc/bnx2fc_tgt.c | 23 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c | 80 +-
+ drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 20 +-
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 20 +-
+ drivers/scsi/cxgbi/libcxgbi.c | 56 +
+ drivers/scsi/cxgbi/libcxgbi.h | 1 +
+ drivers/scsi/device_handler/scsi_dh.c | 61 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 92 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 6 +-
+ drivers/scsi/fcoe/fcoe.c | 82 +-
+ drivers/scsi/fcoe/fcoe.h | 11 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 72 +
+ drivers/scsi/ipr.c | 17 +-
+ drivers/scsi/ipr.h | 1 +
+ drivers/scsi/isci/host.c | 69 +
+ drivers/scsi/isci/host.h | 15 +
+ drivers/scsi/isci/init.c | 3 +
+ drivers/scsi/isci/isci.h | 2 +-
+ drivers/scsi/isci/phy.c | 11 +
+ drivers/scsi/isci/port.c | 2 +-
+ drivers/scsi/isci/port_config.c | 2 +-
+ drivers/scsi/isci/registers.h | 122 +--
+ drivers/scsi/isci/remote_device.c | 24 +
+ drivers/scsi/isci/remote_device.h | 9 +
+ drivers/scsi/isci/request.c | 380 +++++-
+ drivers/scsi/isci/request.h | 31 +-
+ drivers/scsi/isci/sas.h | 2 -
+ drivers/scsi/isci/task.c | 29 +-
+ drivers/scsi/isci/task.h | 19 +
+ drivers/scsi/iscsi_tcp.c | 83 +-
+ drivers/scsi/libfc/fc_exch.c | 11 +-
+ drivers/scsi/libfc/fc_fcp.c | 2 -
+ drivers/scsi/libiscsi.c | 9 -
+ drivers/scsi/libsas/sas_expander.c | 22 +-
+ drivers/scsi/libsas/sas_host_smp.c | 103 ++-
+ drivers/scsi/libsas/sas_init.c | 43 +-
+ drivers/scsi/libsas/sas_scsi_host.c | 147 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 42 +-
+ drivers/scsi/lpfc/lpfc_els.c | 11 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 2 +
+ drivers/scsi/lpfc/lpfc_init.c | 63 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 11 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 13 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/mac_esp.c | 9 -
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 447 +++++--
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 46 +-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c | 28 +
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 +
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 2 +-
+ drivers/scsi/mvsas/mv_94xx.c | 35 +
+ drivers/scsi/mvsas/mv_defs.h | 2 +
+ drivers/scsi/mvsas/mv_init.c | 13 +-
+ drivers/scsi/mvsas/mv_sas.c | 79 +-
+ drivers/scsi/mvsas/mv_sas.h | 4 +-
+ drivers/scsi/mvumi.c | 2018 +++++++++++++++++++++++++
+ drivers/scsi/mvumi.h | 505 +++++++
+ drivers/scsi/pm8001/pm8001_hwi.c | 73 +-
+ drivers/scsi/pm8001/pm8001_init.c | 4 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 93 +-
+ drivers/scsi/pm8001/pm8001_sas.h | 2 -
+ drivers/scsi/qla2xxx/qla_attr.c | 111 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 152 ++
+ drivers/scsi/qla2xxx/qla_bsg.h | 42 +
+ drivers/scsi/qla2xxx/qla_dbg.c | 6 +-
+ drivers/scsi/qla2xxx/qla_def.h | 9 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 18 +
+ drivers/scsi/qla2xxx/qla_init.c | 36 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 5 +
+ drivers/scsi/qla2xxx/qla_mbx.c | 127 ++
+ drivers/scsi/qla2xxx/qla_nx.c | 970 ++++++++++++-
+ drivers/scsi/qla2xxx/qla_nx.h | 255 ++++-
+ drivers/scsi/qla2xxx/qla_os.c | 46 +-
+ drivers/scsi/qla4xxx/Kconfig | 1 +
+ drivers/scsi/qla4xxx/Makefile | 2 +-
+ drivers/scsi/qla4xxx/ql4_attr.c | 76 +
+ drivers/scsi/qla4xxx/ql4_bsg.c | 513 +++++++
+ drivers/scsi/qla4xxx/ql4_bsg.h | 19 +
+ drivers/scsi/qla4xxx/ql4_def.h | 201 ++-
+ drivers/scsi/qla4xxx/ql4_fw.h | 192 +++-
+ drivers/scsi/qla4xxx/ql4_glbl.h | 71 +-
+ drivers/scsi/qla4xxx/ql4_init.c | 786 ++---------
+ drivers/scsi/qla4xxx/ql4_iocb.c | 68 +-
+ drivers/scsi/qla4xxx/ql4_isr.c | 83 +-
+ drivers/scsi/qla4xxx/ql4_mbx.c | 752 +++++++++--
+ drivers/scsi/qla4xxx/ql4_nvram.c | 21 +
+ drivers/scsi/qla4xxx/ql4_nx.c | 9 +
+ drivers/scsi/qla4xxx/ql4_os.c | 2199 ++++++++++++++++++++++++----
+ drivers/scsi/scsi_error.c | 12 +-
+ drivers/scsi/scsi_sysfs.c | 38 +
+ drivers/scsi/scsi_transport_iscsi.c | 683 ++++++++--
+ drivers/scsi/scsi_transport_sas.c | 10 +-
+ drivers/scsi/sd.c | 7 +-
+ include/linux/genhd.h | 4 +
+ include/linux/libata.h | 2 +
+ include/scsi/iscsi_if.h | 134 ++-
+ include/scsi/libfc.h | 76 +-
+ include/scsi/libfcoe.h | 3 +
+ include/scsi/libsas.h | 52 +-
+ include/scsi/sas.h | 24 +-
+ include/scsi/scsi_bsg_iscsi.h | 110 ++
+ include/scsi/scsi_device.h | 6 +
+ include/scsi/scsi_host.h | 16 +-
+ include/scsi/scsi_transport_iscsi.h | 45 +-
+ 138 files changed, 11643 insertions(+), 2796 deletions(-)
+ create mode 100644 Documentation/scsi/bnx2fc.txt
+ create mode 100644 drivers/scsi/mvumi.c
+ create mode 100644 drivers/scsi/mvumi.h
+ create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.c
+ create mode 100644 drivers/scsi/qla4xxx/ql4_bsg.h
+ create mode 100644 include/scsi/scsi_bsg_iscsi.h
+Merging iscsi-target/for-next
+$ git merge iscsi-target/for-next
+Already up-to-date.
+Merging slave-dma/next
+$ git merge slave-dma/next
+Auto-merging drivers/tty/serial/sh-sci.c
+Merge made by recursive.
+ drivers/dma/amba-pl08x.c | 381 ++++++++++++++++++++++++-------------------
+ drivers/dma/at_hdmac.c | 5 +-
+ drivers/dma/dw_dmac.c | 5 +-
+ drivers/dma/imx-dma.c | 1 +
+ drivers/dma/imx-sdma.c | 1 +
+ drivers/dma/intel_mid_dma.c | 2 -
+ drivers/dma/mpc512x_dma.c | 1 -
+ drivers/dma/pch_dma.c | 2 -
+ drivers/dma/pl330.c | 2 -
+ drivers/dma/shdma.c | 129 ++++++++++-----
+ drivers/dma/shdma.h | 7 +
+ drivers/dma/timb_dma.c | 3 +-
+ drivers/tty/serial/sh-sci.c | 25 +--
+ include/linux/amba/pl08x.h | 22 ++-
+ include/linux/serial_sci.h | 2 -
+ 15 files changed, 341 insertions(+), 247 deletions(-)
+Merging async_tx/next
+$ git merge async_tx/next
+Already up-to-date.
+Merging net/master
+$ git merge net/master
+Auto-merging Documentation/networking/ip-sysctl.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
+Auto-merging arch/powerpc/configs/ppc40x_defconfig
+Auto-merging arch/powerpc/platforms/40x/Kconfig
+Auto-merging arch/s390/include/asm/qdio.h
+Removing drivers/net/arm/Kconfig
+Removing drivers/net/arm/Makefile
+Removing drivers/net/benet/Kconfig
+Removing drivers/net/bna/bfa_ioc_ct.c
+Removing drivers/net/bna/bfi_ctreg.h
+Removing drivers/net/bna/bfi_ll.h
+Removing drivers/net/bna/bna_ctrl.c
+Removing drivers/net/bna/bna_hw.h
+Removing drivers/net/bna/bna_txrx.c
+Auto-merging drivers/net/bonding/bond_main.c
+Auto-merging drivers/net/cris/eth_v10.c
+Auto-merging drivers/net/ethernet/3com/3c501.c
+Auto-merging drivers/net/ethernet/3com/3c509.c
+Auto-merging drivers/net/ethernet/3com/3c515.c
+Auto-merging drivers/net/ethernet/3com/3c574_cs.c
+Auto-merging drivers/net/ethernet/3com/3c589_cs.c
+Auto-merging drivers/net/ethernet/3com/3c59x.c
+Auto-merging drivers/net/ethernet/3com/typhoon.c
+Auto-merging drivers/net/ethernet/8390/3c503.c
+Auto-merging drivers/net/ethernet/8390/8390.c
+Auto-merging drivers/net/ethernet/8390/8390p.c
+Auto-merging drivers/net/ethernet/8390/ac3200.c
+Auto-merging drivers/net/ethernet/8390/ax88796.c
+Auto-merging drivers/net/ethernet/8390/axnet_cs.c
+Auto-merging drivers/net/ethernet/8390/e2100.c
+Auto-merging drivers/net/ethernet/8390/etherh.c
+Auto-merging drivers/net/ethernet/8390/hp-plus.c
+Auto-merging drivers/net/ethernet/8390/hydra.c
+Auto-merging drivers/net/ethernet/8390/mac8390.c
+Auto-merging drivers/net/ethernet/8390/ne-h8300.c
+Auto-merging drivers/net/ethernet/8390/ne2k-pci.c
+Auto-merging drivers/net/ethernet/8390/pcnet_cs.c
+Auto-merging drivers/net/ethernet/8390/smc-mca.c
+Auto-merging drivers/net/ethernet/8390/smc-ultra.c
+Auto-merging drivers/net/ethernet/8390/smc-ultra32.c
+Auto-merging drivers/net/ethernet/8390/wd.c
+Auto-merging drivers/net/ethernet/8390/zorro8390.c
+Auto-merging drivers/net/ethernet/adaptec/starfire.c
+Auto-merging drivers/net/ethernet/adi/bfin_mac.c
+Auto-merging drivers/net/ethernet/aeroflex/greth.c
+Auto-merging drivers/net/ethernet/alteon/acenic.c
+Auto-merging drivers/net/ethernet/amd/a2065.c
+Auto-merging drivers/net/ethernet/amd/am79c961a.c
+Auto-merging drivers/net/ethernet/amd/amd8111e.c
+Auto-merging drivers/net/ethernet/amd/ariadne.c
+Auto-merging drivers/net/ethernet/amd/atarilance.c
+Auto-merging drivers/net/ethernet/amd/au1000_eth.c
+Auto-merging drivers/net/ethernet/amd/declance.c
+Auto-merging drivers/net/ethernet/amd/depca.c
+Auto-merging drivers/net/ethernet/amd/depca.h
+Auto-merging drivers/net/ethernet/amd/hplance.c
+Auto-merging drivers/net/ethernet/amd/lance.c
+Auto-merging drivers/net/ethernet/amd/mvme147.c
+Auto-merging drivers/net/ethernet/amd/ni65.c
+Auto-merging drivers/net/ethernet/amd/nmclan_cs.c
+Auto-merging drivers/net/ethernet/amd/pcnet32.c
+Auto-merging drivers/net/ethernet/amd/sun3lance.c
+Auto-merging drivers/net/ethernet/amd/sunlance.c
+Auto-merging drivers/net/ethernet/apple/bmac.c
+Auto-merging drivers/net/ethernet/apple/cs89x0.c
+Auto-merging drivers/net/ethernet/apple/mac89x0.c
+Auto-merging drivers/net/ethernet/apple/mace.c
+Auto-merging drivers/net/ethernet/apple/macmace.c
+Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
+Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c
+Auto-merging drivers/net/ethernet/broadcom/b44.c
+Auto-merging drivers/net/ethernet/broadcom/bcm63xx_enet.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+Auto-merging drivers/net/ethernet/broadcom/cnic.c
+Auto-merging drivers/net/ethernet/broadcom/cnic.h
+Auto-merging drivers/net/ethernet/broadcom/cnic_defs.h
+Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c
+Auto-merging drivers/net/ethernet/broadcom/tg3.c
+Auto-merging drivers/net/ethernet/broadcom/tg3.h
+Auto-merging drivers/net/ethernet/brocade/bna/Makefile
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_cee.c
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs.h
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.c
+Auto-merging drivers/net/ethernet/brocade/bna/bfa_ioc.h
+Auto-merging drivers/net/ethernet/brocade/bna/bfi.h
+Auto-merging drivers/net/ethernet/brocade/bna/bna.h
+Auto-merging drivers/net/ethernet/brocade/bna/bna_types.h
+Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
+Auto-merging drivers/net/ethernet/brocade/bna/bnad.h
+Auto-merging drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+Auto-merging drivers/net/ethernet/brocade/bna/cna.h
+Auto-merging drivers/net/ethernet/brocade/bna/cna_fwimg.c
+Auto-merging drivers/net/ethernet/cadence/at91_ether.c
+Auto-merging drivers/net/ethernet/cadence/macb.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb/sge.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb3/sge.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+Auto-merging drivers/net/ethernet/cisco/enic/enic.h
+Auto-merging drivers/net/ethernet/cisco/enic/enic_dev.h
+Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
+Auto-merging drivers/net/ethernet/cisco/enic/enic_pp.c
+Auto-merging drivers/net/ethernet/cisco/enic/enic_pp.h
+Auto-merging drivers/net/ethernet/cisco/enic/vnic_dev.c
+Auto-merging drivers/net/ethernet/cisco/enic/vnic_dev.h
+Auto-merging drivers/net/ethernet/davicom/dm9000.c
+Auto-merging drivers/net/ethernet/dec/ewrk3.c
+Auto-merging drivers/net/ethernet/dec/tulip/Kconfig
+Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c
+Auto-merging drivers/net/ethernet/dec/tulip/de4x5.c
+Auto-merging drivers/net/ethernet/dec/tulip/de4x5.h
+Auto-merging drivers/net/ethernet/dec/tulip/dmfe.c
+Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
+Auto-merging drivers/net/ethernet/dec/tulip/uli526x.c
+Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c
+Auto-merging drivers/net/ethernet/dlink/de620.c
+Auto-merging drivers/net/ethernet/dlink/dl2k.c
+Auto-merging drivers/net/ethernet/dlink/dl2k.h
+Auto-merging drivers/net/ethernet/dlink/sundance.c
+Auto-merging drivers/net/ethernet/emulex/benet/be.h
+Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
+Auto-merging drivers/net/ethernet/emulex/benet/be_ethtool.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Auto-merging drivers/net/ethernet/ethoc.c
+Auto-merging drivers/net/ethernet/fealnx.c
+Auto-merging drivers/net/ethernet/freescale/fec.c
+Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
+Auto-merging drivers/net/ethernet/freescale/fs_enet/Kconfig
+Auto-merging drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+Auto-merging drivers/net/ethernet/freescale/gianfar.c
+Auto-merging drivers/net/ethernet/freescale/gianfar_ethtool.c
+Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
+Auto-merging drivers/net/ethernet/fujitsu/at1700.c
+Auto-merging drivers/net/ethernet/fujitsu/eth16i.c
+Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
+Auto-merging drivers/net/ethernet/hp/hp100.c
+Auto-merging drivers/net/ethernet/i825xx/3c505.c
+Auto-merging drivers/net/ethernet/i825xx/3c523.c
+Auto-merging drivers/net/ethernet/i825xx/3c527.c
+Auto-merging drivers/net/ethernet/i825xx/82596.c
+Auto-merging drivers/net/ethernet/i825xx/eepro.c
+Auto-merging drivers/net/ethernet/i825xx/eexpress.c
+Auto-merging drivers/net/ethernet/i825xx/ether1.c
+Auto-merging drivers/net/ethernet/i825xx/lib82596.c
+Auto-merging drivers/net/ethernet/i825xx/lp486e.c
+Auto-merging drivers/net/ethernet/i825xx/ni52.c
+Auto-merging drivers/net/ethernet/i825xx/sun3_82586.c
+Auto-merging drivers/net/ethernet/i825xx/znet.c
+Auto-merging drivers/net/ethernet/ibm/ehea/ehea.h
+Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
+Auto-merging drivers/net/ethernet/ibm/emac/Kconfig
+Auto-merging drivers/net/ethernet/ibm/emac/core.c
+Auto-merging drivers/net/ethernet/ibm/emac/core.h
+Auto-merging drivers/net/ethernet/ibm/emac/debug.h
+Auto-merging drivers/net/ethernet/ibm/emac/mal.c
+Auto-merging drivers/net/ethernet/ibm/emac/mal.h
+Auto-merging drivers/net/ethernet/ibm/emac/rgmii.h
+Auto-merging drivers/net/ethernet/ibm/emac/tah.h
+Auto-merging drivers/net/ethernet/ibm/emac/zmii.h
+Auto-merging drivers/net/ethernet/ibm/ibmveth.c
+Auto-merging drivers/net/ethernet/ibm/iseries_veth.c
+Auto-merging drivers/net/ethernet/icplus/ipg.c
+Auto-merging drivers/net/ethernet/intel/e100.c
+Auto-merging drivers/net/ethernet/intel/e1000/e1000.h
+Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
+Auto-merging drivers/net/ethernet/intel/e1000e/80003es2lan.c
+Auto-merging drivers/net/ethernet/intel/e1000e/82571.c
+Auto-merging drivers/net/ethernet/intel/e1000e/Makefile
+Auto-merging drivers/net/ethernet/intel/e1000e/e1000.h
+Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c
+Auto-merging drivers/net/ethernet/intel/e1000e/ich8lan.c
+Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
+Auto-merging drivers/net/ethernet/intel/igb/e1000_mac.c
+Auto-merging drivers/net/ethernet/intel/igb/e1000_phy.c
+Auto-merging drivers/net/ethernet/intel/igb/igb.h
+Auto-merging drivers/net/ethernet/intel/igb/igb_ethtool.c
+Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
+Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb.h
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ee.c
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ee.h
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_hw.c
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_hw.h
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
+Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_param.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe.h
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+Auto-merging drivers/net/ethernet/intel/ixgbevf/ethtool.c
+Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+Auto-merging drivers/net/ethernet/jme.c
+Auto-merging drivers/net/ethernet/jme.h
+Auto-merging drivers/net/ethernet/korina.c
+Auto-merging drivers/net/ethernet/lantiq_etop.c
+Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
+Auto-merging drivers/net/ethernet/marvell/skge.c
+Auto-merging drivers/net/ethernet/marvell/sky2.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+Auto-merging drivers/net/ethernet/micrel/ks8695net.c
+Auto-merging drivers/net/ethernet/micrel/ksz884x.c
+Auto-merging drivers/net/ethernet/microchip/enc28j60.c
+Auto-merging drivers/net/ethernet/mipsnet.c
+Auto-merging drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+Auto-merging drivers/net/ethernet/natsemi/ibmlana.c
+Auto-merging drivers/net/ethernet/natsemi/jazzsonic.c
+Auto-merging drivers/net/ethernet/natsemi/macsonic.c
+Auto-merging drivers/net/ethernet/natsemi/natsemi.c
+Auto-merging drivers/net/ethernet/natsemi/ns83820.c
+Auto-merging drivers/net/ethernet/natsemi/xtsonic.c
+Auto-merging drivers/net/ethernet/neterion/s2io.c
+Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.c
+Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.h
+Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
+Auto-merging drivers/net/ethernet/neterion/vxge/vxge-traffic.c
+Auto-merging drivers/net/ethernet/netx-eth.c
+Auto-merging drivers/net/ethernet/nuvoton/w90p910_ether.c
+Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
+Auto-merging drivers/net/ethernet/octeon/Kconfig
+Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
+Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+Auto-merging drivers/net/ethernet/packetengines/hamachi.c
+Auto-merging drivers/net/ethernet/packetengines/yellowfin.c
+Auto-merging drivers/net/ethernet/pasemi/pasemi_mac.c
+Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+Auto-merging drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
+Auto-merging drivers/net/ethernet/racal/ni5010.c
+Auto-merging drivers/net/ethernet/rdc/r6040.c
+Auto-merging drivers/net/ethernet/realtek/8139cp.c
+Auto-merging drivers/net/ethernet/realtek/8139too.c
+Auto-merging drivers/net/ethernet/realtek/atp.c
+Auto-merging drivers/net/ethernet/realtek/r8169.c
+Auto-merging drivers/net/ethernet/realtek/sc92031.c
+Auto-merging drivers/net/ethernet/renesas/sh_eth.c
+Auto-merging drivers/net/ethernet/renesas/sh_eth.h
+Auto-merging drivers/net/ethernet/seeq/ether3.c
+Auto-merging drivers/net/ethernet/seeq/seeq8005.c
+Auto-merging drivers/net/ethernet/seeq/sgiseeq.c
+Auto-merging drivers/net/ethernet/sfc/Kconfig
+Auto-merging drivers/net/ethernet/sfc/efx.c
+Auto-merging drivers/net/ethernet/sfc/efx.h
+Auto-merging drivers/net/ethernet/sfc/ethtool.c
+Auto-merging drivers/net/ethernet/sfc/falcon.c
+Auto-merging drivers/net/ethernet/sfc/nic.h
+Auto-merging drivers/net/ethernet/sfc/rx.c
+Auto-merging drivers/net/ethernet/sfc/siena.c
+Auto-merging drivers/net/ethernet/sfc/tx.c
+Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
+Auto-merging drivers/net/ethernet/sis/sis190.c
+Auto-merging drivers/net/ethernet/sis/sis900.c
+Auto-merging drivers/net/ethernet/smsc/epic100.c
+Auto-merging drivers/net/ethernet/smsc/smc911x.c
+Auto-merging drivers/net/ethernet/smsc/smc9194.c
+Auto-merging drivers/net/ethernet/smsc/smc91c92_cs.c
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Auto-merging drivers/net/ethernet/smsc/smsc911x.c
+Auto-merging drivers/net/ethernet/smsc/smsc9420.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig
+Auto-merging drivers/net/ethernet/stmicro/stmmac/Makefile
+Auto-merging drivers/net/ethernet/stmicro/stmmac/common.h
+Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac.h
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/sun/cassini.c
+Auto-merging drivers/net/ethernet/sun/niu.c
+Auto-merging drivers/net/ethernet/sun/sunbmac.c
+Auto-merging drivers/net/ethernet/sun/sunbmac.h
+Auto-merging drivers/net/ethernet/sun/sungem.c
+Auto-merging drivers/net/ethernet/sun/sunhme.c
+Auto-merging drivers/net/ethernet/sun/sunqe.c
+Auto-merging drivers/net/ethernet/sun/sunvnet.c
+Auto-merging drivers/net/ethernet/tehuti/tehuti.c
+Auto-merging drivers/net/ethernet/ti/cpmac.c
+Auto-merging drivers/net/ethernet/ti/davinci_emac.c
+Auto-merging drivers/net/ethernet/ti/tlan.c
+Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
+Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+Auto-merging drivers/net/ethernet/toshiba/spider_net.c
+Auto-merging drivers/net/ethernet/toshiba/spider_net.h
+Auto-merging drivers/net/ethernet/toshiba/tc35815.c
+Auto-merging drivers/net/ethernet/tundra/tsi108_eth.c
+Auto-merging drivers/net/ethernet/via/via-rhine.c
+Auto-merging drivers/net/ethernet/via/via-velocity.c
+Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
+Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
+Auto-merging drivers/net/ethernet/xscale/ixp2000/Kconfig
+Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
+Auto-merging drivers/net/fddi/defxx.c
+Auto-merging drivers/net/fddi/skfp/h/cmtdef.h
+Auto-merging drivers/net/fddi/skfp/h/hwmtm.h
+Auto-merging drivers/net/fddi/skfp/h/sba.h
+Auto-merging drivers/net/fddi/skfp/h/skfbiinc.h
+Auto-merging drivers/net/fddi/skfp/h/smc.h
+Auto-merging drivers/net/fddi/skfp/h/targethw.h
+Auto-merging drivers/net/fddi/skfp/h/targetos.h
+Auto-merging drivers/net/fddi/skfp/skfddi.c
+Removing drivers/net/ibm_newemac/Makefile
+Auto-merging drivers/net/macvlan.c
+Removing drivers/net/octeon/Makefile
+Removing drivers/net/pci-skeleton.c
+Removing drivers/net/pcmcia/Kconfig
+Removing drivers/net/pcmcia/Makefile
+Auto-merging drivers/net/phy/dp83640.c
+Auto-merging drivers/net/slip/slip.c
+Auto-merging drivers/net/slip/slip.h
+Auto-merging drivers/net/tokenring/ibmtr_cs.c
+Removing drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
+Removing drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
+Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+Removing drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
+Auto-merging drivers/s390/cio/qdio_main.c
+CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
+Auto-merging drivers/s390/cio/qdio_setup.c
+Auto-merging drivers/s390/net/lcs.c
+Auto-merging drivers/scsi/bnx2fc/bnx2fc.h
+Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+Auto-merging drivers/scsi/fcoe/fcoe.c
+Auto-merging drivers/scsi/fcoe/fcoe_transport.c
+Auto-merging drivers/staging/Kconfig
+Auto-merging drivers/staging/Makefile
+Removing drivers/staging/ath6kl/Kconfig
+Removing drivers/staging/ath6kl/Makefile
+Removing drivers/staging/ath6kl/TODO
+Removing drivers/staging/ath6kl/bmi/include/bmi_internal.h
+Removing drivers/staging/ath6kl/bmi/src/bmi.c
+Removing drivers/staging/ath6kl/hif/common/hif_sdio_common.h
+Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
+Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+Removing drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+Removing drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+Removing drivers/staging/ath6kl/htc2/htc.c
+Removing drivers/staging/ath6kl/htc2/htc_debug.h
+Removing drivers/staging/ath6kl/htc2/htc_internal.h
+Removing drivers/staging/ath6kl/htc2/htc_recv.c
+Removing drivers/staging/ath6kl/htc2/htc_send.c
+Removing drivers/staging/ath6kl/htc2/htc_services.c
+Removing drivers/staging/ath6kl/include/a_config.h
+Removing drivers/staging/ath6kl/include/a_debug.h
+Removing drivers/staging/ath6kl/include/a_drv.h
+Removing drivers/staging/ath6kl/include/a_drv_api.h
+Removing drivers/staging/ath6kl/include/a_osapi.h
+Removing drivers/staging/ath6kl/include/aggr_recv_api.h
+Removing drivers/staging/ath6kl/include/ar3kconfig.h
+Removing drivers/staging/ath6kl/include/ar6000_api.h
+Removing drivers/staging/ath6kl/include/ar6000_diag.h
+Removing drivers/staging/ath6kl/include/ar6kap_common.h
+Removing drivers/staging/ath6kl/include/athbtfilter.h
+Removing drivers/staging/ath6kl/include/bmi.h
+Removing drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
+Removing drivers/staging/ath6kl/include/common/AR6002/addrs.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
+Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
+Removing drivers/staging/ath6kl/include/common/athdefs.h
+Removing drivers/staging/ath6kl/include/common/bmi_msg.h
+Removing drivers/staging/ath6kl/include/common/cnxmgmt.h
+Removing drivers/staging/ath6kl/include/common/dbglog.h
+Removing drivers/staging/ath6kl/include/common/dbglog_id.h
+Removing drivers/staging/ath6kl/include/common/discovery.h
+Removing drivers/staging/ath6kl/include/common/epping_test.h
+Removing drivers/staging/ath6kl/include/common/gmboxif.h
+Removing drivers/staging/ath6kl/include/common/gpio_reg.h
+Removing drivers/staging/ath6kl/include/common/htc.h
+Removing drivers/staging/ath6kl/include/common/htc_services.h
+Removing drivers/staging/ath6kl/include/common/pkt_log.h
+Removing drivers/staging/ath6kl/include/common/roaming.h
+Removing drivers/staging/ath6kl/include/common/targaddrs.h
+Removing drivers/staging/ath6kl/include/common/testcmd.h
+Removing drivers/staging/ath6kl/include/common/tlpm.h
+Removing drivers/staging/ath6kl/include/common/wlan_defs.h
+Removing drivers/staging/ath6kl/include/common/wmi.h
+Removing drivers/staging/ath6kl/include/common/wmix.h
+Removing drivers/staging/ath6kl/include/common_drv.h
+Removing drivers/staging/ath6kl/include/dbglog_api.h
+Removing drivers/staging/ath6kl/include/dl_list.h
+Removing drivers/staging/ath6kl/include/dset_api.h
+Removing drivers/staging/ath6kl/include/hci_transport_api.h
+Removing drivers/staging/ath6kl/include/hif.h
+Removing drivers/staging/ath6kl/include/host_version.h
+Removing drivers/staging/ath6kl/include/htc_api.h
+Removing drivers/staging/ath6kl/include/htc_packet.h
+Removing drivers/staging/ath6kl/include/wlan_api.h
+Removing drivers/staging/ath6kl/include/wmi_api.h
+Removing drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+Removing drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+Removing drivers/staging/ath6kl/miscdrv/common_drv.c
+Removing drivers/staging/ath6kl/miscdrv/credit_dist.c
+Removing drivers/staging/ath6kl/miscdrv/miscdrv.h
+Removing drivers/staging/ath6kl/os/linux/ar6000_drv.c
+Removing drivers/staging/ath6kl/os/linux/ar6000_pm.c
+Removing drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+Removing drivers/staging/ath6kl/os/linux/cfg80211.c
+Removing drivers/staging/ath6kl/os/linux/export_hci_transport.c
+Removing drivers/staging/ath6kl/os/linux/hci_bridge.c
+Removing drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+Removing drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+Removing drivers/staging/ath6kl/os/linux/inResolved 'drivers/s390/cio/qdio_main.c' using previous resolution.
+Resolved 'net/batman-adv/soft-interface.c' using previous resolution.
+clude/ar6xapi_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/cfg80211.h
+Removing drivers/staging/ath6kl/os/linux/include/config_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/debug_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
+Removing drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
+Removing drivers/staging/ath6kl/os/linux/include/osapi_linux.h
+Removing drivers/staging/ath6kl/os/linux/include/wlan_config.h
+Removing drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
+Removing drivers/staging/ath6kl/os/linux/netbuf.c
+Removing drivers/staging/ath6kl/reorder/aggr_rx_internal.h
+Removing drivers/staging/ath6kl/reorder/rcv_aggr.c
+Removing drivers/staging/ath6kl/wlan/include/ieee80211.h
+Removing drivers/staging/ath6kl/wlan/include/ieee80211_node.h
+Removing drivers/staging/ath6kl/wlan/src/wlan_node.c
+Removing drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
+Removing drivers/staging/ath6kl/wlan/src/wlan_utils.c
+Removing drivers/staging/ath6kl/wmi/wmi.c
+Removing drivers/staging/ath6kl/wmi/wmi_host.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/sh_eth.h
+Auto-merging include/linux/sungem_phy.h
+Auto-merging include/net/nfc/nfc.h
+Removing net/batman-adv/aggregation.c
+Removing net/batman-adv/aggregation.h
+Auto-merging net/batman-adv/soft-interface.c
+CONFLICT (content): Merge conflict in net/batman-adv/soft-interface.c
+Auto-merging net/bridge/br_device.c
+Auto-merging net/ipv4/tcp_input.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/ipv6/tcp_ipv6.c
+Auto-merging net/packet/af_packet.c
+Removing net/rds/xlist.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
+arch/powerpc/configs/40x/hcu4_defconfig: needs merge
+drivers/s390/cio/qdio_main.c: needs merge
+net/batman-adv/soft-interface.c: needs merge
+rm 'arch/powerpc/configs/40x/hcu4_defconfig'
+$ git commit -v -a
+[master b8f66d9] Merge remote-tracking branch 'net/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-net-mesh | 8 +
+ .../devicetree/bindings/net/can/fsl-flexcan.txt | 63 +-
+ Documentation/devicetree/bindings/net/smsc911x.txt | 38 +
+ Documentation/networking/batman-adv.txt | 8 +-
+ Documentation/networking/ip-sysctl.txt | 17 +-
+ Documentation/networking/netdevices.txt | 4 +-
+ Documentation/networking/stmmac.txt | 33 +-
+ MAINTAINERS | 214 +-
+ arch/cris/arch-v10/drivers/Kconfig | 1 +
+ arch/cris/arch-v32/drivers/Kconfig | 1 +
+ arch/ia64/hp/sim/simeth.c | 2 +-
+ arch/mips/Kconfig | 8 +-
+ arch/mips/bcm47xx/Kconfig | 31 +
+ arch/mips/bcm47xx/Makefile | 3 +-
+ arch/mips/bcm47xx/gpio.c | 82 +-
+ arch/mips/bcm47xx/irq.c | 12 +
+ arch/mips/bcm47xx/nvram.c | 29 +-
+ arch/mips/bcm47xx/serial.c | 46 +-
+ arch/mips/bcm47xx/setup.c | 90 +-
+ arch/mips/bcm47xx/time.c | 16 +-
+ arch/mips/bcm47xx/wgt634u.c | 14 +-
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 26 +-
+ arch/mips/include/asm/mach-bcm47xx/gpio.h | 108 +-
+ arch/mips/pci/pci-bcm47xx.c | 6 +
+ arch/mips/txx9/generic/setup_tx4939.c | 2 +-
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/boot/dts/p1010rdb.dts | 10 +-
+ arch/powerpc/boot/dts/p1010si.dtsi | 10 +-
+ arch/powerpc/configs/40x/acadia_defconfig | 11 +-
+ arch/powerpc/configs/40x/ep405_defconfig | 5 +-
+ arch/powerpc/configs/40x/kilauea_defconfig | 9 +-
+ arch/powerpc/configs/40x/makalu_defconfig | 9 +-
+ arch/powerpc/configs/40x/walnut_defconfig | 5 +-
+ arch/powerpc/configs/44x/arches_defconfig | 9 +-
+ arch/powerpc/configs/44x/bamboo_defconfig | 5 +-
+ arch/powerpc/configs/44x/bluestone_defconfig | 9 +-
+ arch/powerpc/configs/44x/canyonlands_defconfig | 9 +-
+ arch/powerpc/configs/44x/ebony_defconfig | 5 +-
+ arch/powerpc/configs/44x/eiger_defconfig | 9 +-
+ arch/powerpc/configs/44x/icon_defconfig | 5 +-
+ arch/powerpc/configs/44x/katmai_defconfig | 5 +-
+ arch/powerpc/configs/44x/redwood_defconfig | 11 +-
+ arch/powerpc/configs/44x/sam440ep_defconfig | 5 +-
+ arch/powerpc/configs/44x/sequoia_defconfig | 5 +-
+ arch/powerpc/configs/44x/taishan_defconfig | 5 +-
+ arch/powerpc/configs/44x/warp_defconfig | 5 +-
+ arch/powerpc/configs/ppc40x_defconfig | 5 +-
+ arch/powerpc/configs/ppc44x_defconfig | 5 +-
+ arch/powerpc/platforms/40x/Kconfig | 12 +-
+ arch/powerpc/platforms/44x/Kconfig | 54 +-
+ arch/powerpc/platforms/cell/Kconfig | 8 +-
+ arch/s390/include/asm/qdio.h | 78 +-
+ arch/um/drivers/net_kern.c | 2 +-
+ arch/xtensa/platforms/iss/network.c | 2 +-
+ drivers/atm/eni.c | 3 +-
+ drivers/atm/iphase.c | 265 +-
+ drivers/atm/iphase.h | 391 +-
+ drivers/bcma/Kconfig | 13 +
+ drivers/bcma/Makefile | 2 +
+ drivers/bcma/bcma_private.h | 16 +
+ drivers/bcma/core.c | 2 +
+ drivers/bcma/driver_chipcommon.c | 53 +
+ drivers/bcma/driver_chipcommon_pmu.c | 191 +-
+ drivers/bcma/driver_mips.c | 256 +
+ drivers/bcma/driver_pci.c | 16 +-
+ drivers/bcma/host_soc.c | 183 +
+ drivers/bcma/main.c | 70 +-
+ drivers/bcma/scan.c | 348 +-
+ drivers/bcma/sprom.c | 15 +
+ drivers/connector/cn_proc.c | 26 +
+ drivers/infiniband/hw/amso1100/c2.c | 8 +-
+ drivers/infiniband/hw/cxgb3/Makefile | 2 +-
+ drivers/infiniband/hw/cxgb4/Makefile | 2 +-
+ drivers/infiniband/hw/mlx4/Kconfig | 3 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 23 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 5 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 5 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +-
+ drivers/media/dvb/dvb-core/dvb_net.c | 2 +-
+ drivers/net/Kconfig | 3448 +----------
+ drivers/net/Makefile | 326 +-
+ drivers/net/appletalk/cops.c | 2 +-
+ drivers/net/appletalk/ltpc.c | 2 +-
+ drivers/net/arcnet/Kconfig | 14 +-
+ drivers/net/arcnet/Makefile | 1 +
+ drivers/net/arcnet/com20020.c | 2 +-
+ drivers/net/{pcmcia => arcnet}/com20020_cs.c | 0
+ drivers/net/arm/Kconfig | 74 -
+ drivers/net/arm/Makefile | 14 -
+ drivers/net/benet/Kconfig | 6 -
+ drivers/net/bna/bfa_ioc_ct.c | 516 --
+ drivers/net/bna/bfi_ctreg.h | 646 --
+ drivers/net/bna/bfi_ll.h | 438 --
+ drivers/net/bna/bna_ctrl.c | 3076 ----------
+ drivers/net/bna/bna_hw.h | 1490 -----
+ drivers/net/bna/bna_txrx.c | 4185 -------------
+ drivers/net/bonding/bond_main.c | 68 +-
+ drivers/net/bonding/bonding.h | 1 -
+ drivers/net/caif/caif_hsi.c | 9 +-
+ drivers/net/caif/caif_spi.c | 4 -
+ drivers/net/can/dev.c | 14 +-
+ drivers/net/can/flexcan.c | 189 +-
+ drivers/net/can/mscan/mscan.c | 26 +-
+ drivers/net/can/sja1000/Kconfig | 14 +
+ drivers/net/can/sja1000/Makefile | 2 +
+ drivers/net/can/sja1000/ems_pcmcia.c | 331 +
+ drivers/net/can/sja1000/peak_pci.c | 291 +
+ drivers/net/cris/eth_v10.c | 2 +-
+ drivers/net/dummy.c | 2 +-
+ drivers/net/{ => ethernet/3com}/3c501.c | 2 +-
+ drivers/net/{ => ethernet/3com}/3c501.h | 0
+ drivers/net/{ => ethernet/3com}/3c509.c | 2 +-
+ drivers/net/{ => ethernet/3com}/3c515.c | 2 +-
+ drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c | 2 +-
+ drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c | 2 +-
+ drivers/net/{ => ethernet/3com}/3c59x.c | 11 +-
+ drivers/net/ethernet/3com/Kconfig | 122 +
+ drivers/net/ethernet/3com/Makefile | 11 +
+ drivers/net/{ => ethernet/3com}/typhoon.c | 5 +-
+ drivers/net/{ => ethernet/3com}/typhoon.h | 0
+ drivers/net/{ => ethernet/8390}/3c503.c | 2 +-
+ drivers/net/{ => ethernet/8390}/3c503.h | 0
+ drivers/net/{ => ethernet/8390}/8390.c | 2 +-
+ drivers/net/{ => ethernet/8390}/8390.h | 0
+ drivers/net/{ => ethernet/8390}/8390p.c | 2 +-
+ drivers/net/ethernet/8390/Kconfig | 337 +
+ drivers/net/ethernet/8390/Makefile | 29 +
+ drivers/net/{ => ethernet/8390}/ac3200.c | 2 +-
+ drivers/net/{ => ethernet/8390}/apne.c | 0
+ drivers/net/{ => ethernet/8390}/ax88796.c | 2 +-
+ drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c | 4 +-
+ drivers/net/{ => ethernet/8390}/e2100.c | 2 +-
+ drivers/net/{ => ethernet/8390}/es3210.c | 0
+ drivers/net/{arm => ethernet/8390}/etherh.c | 4 +-
+ drivers/net/{ => ethernet/8390}/hp-plus.c | 2 +-
+ drivers/net/{ => ethernet/8390}/hp.c | 0
+ drivers/net/{ => ethernet/8390}/hydra.c | 2 +-
+ drivers/net/{ => ethernet/8390}/lib8390.c | 0
+ drivers/net/{ => ethernet/8390}/lne390.c | 0
+ drivers/net/{ => ethernet/8390}/mac8390.c | 2 +-
+ drivers/net/{ => ethernet/8390}/ne-h8300.c | 2 +-
+ drivers/net/{ => ethernet/8390}/ne.c | 0
+ drivers/net/{ => ethernet/8390}/ne2.c | 0
+ drivers/net/{ => ethernet/8390}/ne2k-pci.c | 2 +-
+ drivers/net/{ => ethernet/8390}/ne3210.c | 0
+ drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c | 4 +-
+ drivers/net/{ => ethernet/8390}/smc-mca.c | 2 +-
+ drivers/net/{ => ethernet/8390}/smc-ultra.c | 2 +-
+ drivers/net/{ => ethernet/8390}/smc-ultra32.c | 2 +-
+ drivers/net/{ => ethernet/8390}/stnic.c | 0
+ drivers/net/{ => ethernet/8390}/wd.c | 2 +-
+ drivers/net/{ => ethernet/8390}/zorro8390.c | 2 +-
+ drivers/net/ethernet/Kconfig | 177 +
+ drivers/net/ethernet/Makefile | 74 +
+ drivers/net/ethernet/adaptec/Kconfig | 36 +
+ drivers/net/ethernet/adaptec/Makefile | 5 +
+ drivers/net/{ => ethernet/adaptec}/starfire.c | 7 +-
+ drivers/net/ethernet/adi/Kconfig | 69 +
+ drivers/net/ethernet/adi/Makefile | 5 +
+ drivers/net/{ => ethernet/adi}/bfin_mac.c | 2 +-
+ drivers/net/{ => ethernet/adi}/bfin_mac.h | 0
+ drivers/net/ethernet/aeroflex/Kconfig | 11 +
+ drivers/net/ethernet/aeroflex/Makefile | 5 +
+ drivers/net/{ => ethernet/aeroflex}/greth.c | 14 +-
+ drivers/net/{ => ethernet/aeroflex}/greth.h | 0
+ drivers/net/ethernet/alteon/Kconfig | 48 +
+ drivers/net/ethernet/alteon/Makefile | 5 +
+ drivers/net/{ => ethernet/alteon}/acenic.c | 8 +-
+ drivers/net/{ => ethernet/alteon}/acenic.h | 0
+ drivers/net/{ => ethernet/amd}/7990.c | 0
+ drivers/net/{ => ethernet/amd}/7990.h | 0
+ drivers/net/ethernet/amd/Kconfig | 195 +
+ drivers/net/ethernet/amd/Makefile | 20 +
+ drivers/net/{ => ethernet/amd}/a2065.c | 2 +-
+ drivers/net/{ => ethernet/amd}/a2065.h | 0
+ drivers/net/{arm => ethernet/amd}/am79c961a.c | 2 +-
+ drivers/net/{arm => ethernet/amd}/am79c961a.h | 0
+ drivers/net/{ => ethernet/amd}/amd8111e.c | 2 +-
+ drivers/net/{ => ethernet/amd}/amd8111e.h | 0
+ drivers/net/{ => ethernet/amd}/ariadne.c | 2 +-
+ drivers/net/{ => ethernet/amd}/ariadne.h | 0
+ drivers/net/{ => ethernet/amd}/atarilance.c | 2 +-
+ drivers/net/{ => ethernet/amd}/au1000_eth.c | 2 +-
+ drivers/net/{ => ethernet/amd}/au1000_eth.h | 0
+ drivers/net/{ => ethernet/amd}/declance.c | 2 +-
+ drivers/net/{ => ethernet/amd}/depca.c | 2 +-
+ drivers/net/{ => ethernet/amd}/depca.h | 2 -
+ drivers/net/{ => ethernet/amd}/hplance.c | 2 +-
+ drivers/net/{ => ethernet/amd}/hplance.h | 0
+ drivers/net/{ => ethernet/amd}/lance.c | 2 +-
+ drivers/net/{ => ethernet/amd}/mvme147.c | 2 +-
+ drivers/net/{ => ethernet/amd}/ni65.c | 2 +-
+ drivers/net/{ => ethernet/amd}/ni65.h | 0
+ drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c | 2 +-
+ drivers/net/{ => ethernet/amd}/pcnet32.c | 204 +-
+ drivers/net/{ => ethernet/amd}/sun3lance.c | 2 +-
+ drivers/net/{ => ethernet/amd}/sunlance.c | 2 +-
+ drivers/net/ethernet/apple/Kconfig | 97 +
+ drivers/net/ethernet/apple/Makefile | 9 +
+ drivers/net/{ => ethernet/apple}/bmac.c | 2 +-
+ drivers/net/{ => ethernet/apple}/bmac.h | 0
+ drivers/net/{ => ethernet/apple}/cs89x0.c | 2 +-
+ drivers/net/{ => ethernet/apple}/cs89x0.h | 0
+ drivers/net/{ => ethernet/apple}/mac89x0.c | 2 +-
+ drivers/net/{ => ethernet/apple}/mace.c | 2 +-
+ drivers/net/{ => ethernet/apple}/mace.h | 0
+ drivers/net/{ => ethernet/apple}/macmace.c | 11 +-
+ drivers/net/ethernet/atheros/Kconfig | 70 +
+ drivers/net/ethernet/atheros/Makefile | 8 +
+ drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
+ drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
+ .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
+ .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
+ .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
+ .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 11 +-
+ drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
+ drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
+ .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 13 +-
+ .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
+ drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
+ drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 7 +-
+ drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
+ drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 2 +-
+ drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
+ drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
+ drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
+ drivers/net/ethernet/broadcom/Kconfig | 122 +
+ drivers/net/ethernet/broadcom/Makefile | 11 +
+ drivers/net/{ => ethernet/broadcom}/b44.c | 2 +-
+ drivers/net/{ => ethernet/broadcom}/b44.h | 0
+ drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 2 +-
+ drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
+ drivers/net/{ => ethernet/broadcom}/bnx2.c | 77 +-
+ drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
+ drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
+ drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
+ drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 67 +-
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 53 +-
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 10 +-
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 5 +-
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 25 +-
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
+ .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 2 +
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 150 +-
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 81 +-
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c | 67 +-
+ .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h | 0
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 46 +-
+ .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
+ drivers/net/{ => ethernet/broadcom}/cnic.c | 35 +-
+ drivers/net/{ => ethernet/broadcom}/cnic.h | 4 +-
+ drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 1 +
+ drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
+ drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 2 +-
+ drivers/net/{ => ethernet/broadcom}/tg3.c | 1553 +++---
+ drivers/net/{ => ethernet/broadcom}/tg3.h | 3 +
+ drivers/net/ethernet/brocade/Kconfig | 23 +
+ drivers/net/ethernet/brocade/Makefile | 5 +
+ drivers/net/ethernet/brocade/bna/Kconfig | 17 +
+ drivers/net/{ => ethernet/brocade}/bna/Makefile | 5 +-
+ drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 5 -
+ drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0
+ drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0
+ drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 64 +-
+ .../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 8 +-
+ .../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 69 +-
+ .../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0
+ drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 459 +-
+ drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 68 +-
+ drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 878 +++
+ drivers/net/ethernet/brocade/bna/bfa_msgq.c | 669 ++
+ drivers/net/ethernet/brocade/bna/bfa_msgq.h | 130 +
+ drivers/net/{ => ethernet/brocade}/bna/bfi.h | 257 +-
+ drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
+ drivers/net/ethernet/brocade/bna/bfi_enet.h | 901 +++
+ drivers/net/ethernet/brocade/bna/bfi_reg.h | 452 ++
+ drivers/net/{ => ethernet/brocade}/bna/bna.h | 351 +-
+ drivers/net/ethernet/brocade/bna/bna_enet.c | 2144 +++++++
+ drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 422 ++
+ drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 3798 ++++++++++++
+ drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 656 +--
+ drivers/net/{ => ethernet/brocade}/bna/bnad.c | 1176 +++--
+ drivers/net/{ => ethernet/brocade}/bna/bnad.h | 101 +-
+ .../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 486 +--
+ drivers/net/{ => ethernet/brocade}/bna/cna.h | 43 +-
+ drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 48 +-
+ drivers/net/ethernet/cadence/Kconfig | 45 +
+ drivers/net/ethernet/cadence/Makefile | 6 +
+ drivers/net/{arm => ethernet/cadence}/at91_ether.c | 2 +-
+ drivers/net/{arm => ethernet/cadence}/at91_ether.h | 0
+ drivers/net/{ => ethernet/cadence}/macb.c | 2 +-
+ drivers/net/{ => ethernet/cadence}/macb.h | 0
+ drivers/net/ethernet/chelsio/Kconfig | 107 +
+ drivers/net/ethernet/chelsio/Makefile | 8 +
+ .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 2 +-
+ .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 5 +-
+ .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
+ .../chelsio/cxgb}/suni1x10gexp_regs.h | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
+ .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
+ .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
+ .../chelsio/cxgb}/vsc7326_reg.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
+ .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 2 +-
+ .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
+ .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
+ .../chelsio}/cxgb3/firmware_exports.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 6 +-
+ .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 5 +-
+ .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
+ drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
+ .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 2 +
+ drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
+ .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
+ .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
+ drivers/net/ethernet/cirrus/Kconfig | 30 +
+ drivers/net/ethernet/cirrus/Makefile | 5 +
+ drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c | 0
+ drivers/net/ethernet/cisco/Kconfig | 23 +
+ drivers/net/ethernet/cisco/Makefile | 5 +
+ drivers/net/ethernet/cisco/enic/Kconfig | 9 +
+ drivers/net/{ => ethernet/cisco}/enic/Makefile | 0
+ drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0
+ .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/enic.h | 15 +-
+ drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0
+ drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 19 +
+ drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 192 +-
+ drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 192 +-
+ drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 15 +-
+ drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0
+ drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0
+ .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 28 +-
+ drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 2 +
+ .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0
+ .../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0
+ drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0
+ .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0
+ drivers/net/ethernet/davicom/Kconfig | 24 +
+ drivers/net/ethernet/davicom/Makefile | 5 +
+ drivers/net/{ => ethernet/davicom}/dm9000.c | 13 +-
+ drivers/net/{ => ethernet/davicom}/dm9000.h | 0
+ drivers/net/ethernet/dec/Kconfig | 37 +
+ drivers/net/ethernet/dec/Makefile | 6 +
+ drivers/net/{ => ethernet/dec}/ewrk3.c | 2 +-
+ drivers/net/{ => ethernet/dec}/ewrk3.h | 0
+ drivers/net/{ => ethernet/dec}/tulip/21142.c | 0
+ drivers/net/{ => ethernet/dec}/tulip/Kconfig | 21 +-
+ drivers/net/{ => ethernet/dec}/tulip/Makefile | 0
+ drivers/net/{ => ethernet/dec}/tulip/de2104x.c | 2 +-
+ drivers/net/{ => ethernet/dec}/tulip/de4x5.c | 2 +-
+ drivers/net/{ => ethernet/dec}/tulip/de4x5.h | 2 -
+ drivers/net/{ => ethernet/dec}/tulip/dmfe.c | 2 +-
+ drivers/net/{ => ethernet/dec}/tulip/eeprom.c | 0
+ drivers/net/{ => ethernet/dec}/tulip/interrupt.c | 0
+ drivers/net/{ => ethernet/dec}/tulip/media.c | 0
+ drivers/net/{ => ethernet/dec}/tulip/pnic.c | 0
+ drivers/net/{ => ethernet/dec}/tulip/pnic2.c | 0
+ drivers/net/{ => ethernet/dec}/tulip/timer.c | 0
+ drivers/net/{ => ethernet/dec}/tulip/tulip.h | 0
+ drivers/net/{ => ethernet/dec}/tulip/tulip_core.c | 2 +-
+ drivers/net/{ => ethernet/dec}/tulip/uli526x.c | 2 +-
+ drivers/net/{ => ethernet/dec}/tulip/winbond-840.c | 2 +-
+ drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c | 0
+ drivers/net/ethernet/dlink/Kconfig | 86 +
+ drivers/net/ethernet/dlink/Makefile | 8 +
+ drivers/net/{ => ethernet/dlink}/de600.c | 0
+ drivers/net/{ => ethernet/dlink}/de600.h | 0
+ drivers/net/{ => ethernet/dlink}/de620.c | 2 +-
+ drivers/net/{ => ethernet/dlink}/de620.h | 0
+ drivers/net/{ => ethernet/dlink}/dl2k.c | 107 +-
+ drivers/net/{ => ethernet/dlink}/dl2k.h | 110 +-
+ drivers/net/{ => ethernet/dlink}/sundance.c | 2 +-
+ drivers/net/{ => ethernet}/dnet.c | 0
+ drivers/net/{ => ethernet}/dnet.h | 0
+ drivers/net/ethernet/emulex/Kconfig | 23 +
+ drivers/net/ethernet/emulex/Makefile | 5 +
+ drivers/net/ethernet/emulex/benet/Kconfig | 6 +
+ drivers/net/{ => ethernet/emulex}/benet/Makefile | 0
+ drivers/net/{ => ethernet/emulex}/benet/be.h | 132 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 241 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 94 +-
+ .../net/{ => ethernet/emulex}/benet/be_ethtool.c | 168 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 21 +-
+ drivers/net/{ => ethernet/emulex}/benet/be_main.c | 550 +-
+ drivers/net/{ => ethernet}/ethoc.c | 2 +-
+ drivers/net/ethernet/faraday/Kconfig | 40 +
+ drivers/net/ethernet/faraday/Makefile | 6 +
+ drivers/net/{ => ethernet/faraday}/ftgmac100.c | 0
+ drivers/net/{ => ethernet/faraday}/ftgmac100.h | 0
+ drivers/net/{ => ethernet/faraday}/ftmac100.c | 0
+ drivers/net/{ => ethernet/faraday}/ftmac100.h | 0
+ drivers/net/{ => ethernet}/fealnx.c | 2 +-
+ drivers/net/ethernet/freescale/Kconfig | 88 +
+ drivers/net/ethernet/freescale/Makefile | 18 +
+ drivers/net/{ => ethernet/freescale}/fec.c | 117 +-
+ drivers/net/{ => ethernet/freescale}/fec.h | 0
+ drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c | 2 +-
+ drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h | 0
+ .../net/{ => ethernet/freescale}/fec_mpc52xx_phy.c | 0
+ .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 3 +-
+ .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
+ drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
+ .../freescale}/fs_enet/fs_enet-main.c | 2 +-
+ .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
+ .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
+ .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
+ .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
+ .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
+ .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
+ drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
+ drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
+ drivers/net/{ => ethernet/freescale}/gianfar.c | 12 +-
+ drivers/net/{ => ethernet/freescale}/gianfar.h | 0
+ .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 5 +-
+ drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
+ .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
+ drivers/net/{ => ethernet/freescale}/ucc_geth.c | 12 +-
+ drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
+ .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
+ drivers/net/ethernet/fujitsu/Kconfig | 54 +
+ drivers/net/ethernet/fujitsu/Makefile | 7 +
+ drivers/net/{ => ethernet/fujitsu}/at1700.c | 2 +-
+ drivers/net/{ => ethernet/fujitsu}/eth16i.c | 2 +-
+ .../net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c | 2 +-
+ drivers/net/ethernet/hp/Kconfig | 32 +
+ drivers/net/ethernet/hp/Makefile | 5 +
+ drivers/net/{ => ethernet/hp}/hp100.c | 4 +-
+ drivers/net/{ => ethernet/hp}/hp100.h | 0
+ drivers/net/{ => ethernet/i825xx}/3c505.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/3c505.h | 0
+ drivers/net/{ => ethernet/i825xx}/3c507.c | 0
+ drivers/net/{ => ethernet/i825xx}/3c523.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/3c523.h | 0
+ drivers/net/{ => ethernet/i825xx}/3c527.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/3c527.h | 0
+ drivers/net/{ => ethernet/i825xx}/82596.c | 2 +-
+ drivers/net/ethernet/i825xx/Kconfig | 183 +
+ drivers/net/ethernet/i825xx/Makefile | 20 +
+ drivers/net/{ => ethernet/i825xx}/eepro.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/eexpress.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/eexpress.h | 0
+ drivers/net/{arm => ethernet/i825xx}/ether1.c | 2 +-
+ drivers/net/{arm => ethernet/i825xx}/ether1.h | 0
+ drivers/net/{ => ethernet/i825xx}/lasi_82596.c | 0
+ drivers/net/{ => ethernet/i825xx}/lib82596.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/lp486e.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/ni52.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/ni52.h | 0
+ drivers/net/{ => ethernet/i825xx}/sni_82596.c | 0
+ drivers/net/{ => ethernet/i825xx}/sun3_82586.c | 2 +-
+ drivers/net/{ => ethernet/i825xx}/sun3_82586.h | 0
+ drivers/net/{ => ethernet/i825xx}/znet.c | 2 +-
+ drivers/net/ethernet/ibm/Kconfig | 48 +
+ drivers/net/ethernet/ibm/Makefile | 8 +
+ drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 1 +
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 61 +-
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
+ drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/Kconfig | 40 +-
+ drivers/net/ethernet/ibm/emac/Makefile | 11 +
+ .../net/{ibm_newemac => ethernet/ibm/emac}/core.c | 16 +-
+ .../net/{ibm_newemac => ethernet/ibm/emac}/core.h | 16 +-
+ .../net/{ibm_newemac => ethernet/ibm/emac}/debug.c | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/debug.h | 2 +-
+ .../net/{ibm_newemac => ethernet/ibm/emac}/emac.h | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/mal.c | 6 +-
+ .../net/{ibm_newemac => ethernet/ibm/emac}/mal.h | 4 +-
+ .../net/{ibm_newemac => ethernet/ibm/emac}/phy.c | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/phy.h | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h | 4 +-
+ .../net/{ibm_newemac => ethernet/ibm/emac}/tah.c | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/tah.h | 4 +-
+ .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.c | 0
+ .../net/{ibm_newemac => ethernet/ibm/emac}/zmii.h | 4 +-
+ drivers/net/{ => ethernet/ibm}/ibmveth.c | 7 +-
+ drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
+ drivers/net/{ => ethernet/ibm}/iseries_veth.c | 2 +-
+ drivers/net/ethernet/icplus/Kconfig | 14 +
+ drivers/net/ethernet/icplus/Makefile | 5 +
+ drivers/net/{ => ethernet/icplus}/ipg.c | 199 +-
+ drivers/net/{ => ethernet/icplus}/ipg.h | 0
+ drivers/net/ethernet/intel/Kconfig | 222 +
+ drivers/net/ethernet/intel/Makefile | 12 +
+ drivers/net/{ => ethernet/intel}/e100.c | 2 +-
+ drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
+ drivers/net/{ => ethernet/intel}/e1000/e1000.h | 2 +
+ .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
+ drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
+ drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
+ .../net/{ => ethernet/intel}/e1000/e1000_main.c | 42 +-
+ .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
+ .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
+ .../intel/e1000e/80003es2lan.c} | 9 +-
+ drivers/net/{ => ethernet/intel}/e1000e/82571.c | 25 +-
+ drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
+ drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
+ drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 34 +-
+ drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 97 +-
+ drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
+ drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 46 +-
+ drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
+ drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 257 +-
+ drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
+ drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
+ drivers/net/{ => ethernet/intel}/igb/Makefile | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
+ .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 9 +-
+ drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 6 +
+ drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
+ drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
+ drivers/net/{ => ethernet/intel}/igb/igb.h | 117 +-
+ drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 15 +-
+ drivers/net/{ => ethernet/intel}/igb/igb_main.c | 533 +-
+ drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
+ drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
+ drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
+ drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
+ drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
+ drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
+ drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 7 +-
+ drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
+ drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
+ drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
+ drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 2 +
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 2 +-
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 4 +-
+ .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 98 +-
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 2 +-
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 4 +-
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 74 +-
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 1 +
+ drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 18 +-
+ drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 77 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 43 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 147 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 172 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 2 +-
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 58 +-
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 7 +-
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 9 +-
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 56 +-
+ .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 2 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 161 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 217 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 15 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 2092 +++----
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 33 +-
+ drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 207 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 5 +
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 78 +-
+ .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 92 +-
+ drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
+ drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
+ drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 46 -
+ drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 8 +-
+ .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 101 +-
+ drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
+ drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
+ drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
+ drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
+ drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
+ drivers/net/{ => ethernet}/jme.c | 7 +-
+ drivers/net/{ => ethernet}/jme.h | 1 -
+ drivers/net/{ => ethernet}/korina.c | 3 +-
+ drivers/net/{ => ethernet}/lantiq_etop.c | 2 +-
+ drivers/net/ethernet/marvell/Kconfig | 111 +
+ drivers/net/ethernet/marvell/Makefile | 8 +
+ drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 10 +-
+ drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
+ drivers/net/{ => ethernet/marvell}/skge.c | 78 +-
+ drivers/net/{ => ethernet/marvell}/skge.h | 0
+ drivers/net/{ => ethernet/marvell}/sky2.c | 102 +-
+ drivers/net/{ => ethernet/marvell}/sky2.h | 0
+ drivers/net/ethernet/mellanox/Kconfig | 23 +
+ drivers/net/ethernet/mellanox/Makefile | 5 +
+ drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 +
+ drivers/net/{ => ethernet/mellanox}/mlx4/Makefile | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/catas.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/cq.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c | 0
+ .../net/{ => ethernet/mellanox}/mlx4/en_ethtool.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c | 0
+ .../net/{ => ethernet/mellanox}/mlx4/en_netdev.c | 2 +-
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h | 0
+ .../{ => ethernet/mellanox}/mlx4/en_resources.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c | 0
+ .../net/{ => ethernet/mellanox}/mlx4/en_selftest.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/eq.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/fw.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/fw.h | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/icm.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/icm.h | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/intf.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/main.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/mr.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/pd.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/port.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/profile.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/qp.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/reset.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/sense.c | 0
+ drivers/net/{ => ethernet/mellanox}/mlx4/srq.c | 0
+ drivers/net/ethernet/micrel/Kconfig | 69 +
+ drivers/net/ethernet/micrel/Makefile | 9 +
+ drivers/net/{arm => ethernet/micrel}/ks8695net.c | 2 +-
+ drivers/net/{arm => ethernet/micrel}/ks8695net.h | 0
+ drivers/net/{ => ethernet/micrel}/ks8842.c | 0
+ drivers/net/{ => ethernet/micrel}/ks8851.c | 0
+ drivers/net/{ => ethernet/micrel}/ks8851.h | 0
+ drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
+ drivers/net/{ => ethernet/micrel}/ksz884x.c | 3 +-
+ drivers/net/ethernet/microchip/Kconfig | 38 +
+ drivers/net/ethernet/microchip/Makefile | 5 +
+ drivers/net/{ => ethernet/microchip}/enc28j60.c | 2 +-
+ drivers/net/{ => ethernet/microchip}/enc28j60_hw.h | 0
+ drivers/net/{ => ethernet}/mipsnet.c | 2 +-
+ drivers/net/ethernet/myricom/Kconfig | 47 +
+ drivers/net/ethernet/myricom/Makefile | 5 +
+ .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
+ .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 14 +-
+ .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
+ .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
+ drivers/net/ethernet/natsemi/Kconfig | 83 +
+ drivers/net/ethernet/natsemi/Makefile | 10 +
+ drivers/net/{ => ethernet/natsemi}/ibmlana.c | 2 +-
+ drivers/net/{ => ethernet/natsemi}/ibmlana.h | 0
+ drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 2 +-
+ drivers/net/{ => ethernet/natsemi}/macsonic.c | 11 +-
+ drivers/net/{ => ethernet/natsemi}/natsemi.c | 2 +-
+ drivers/net/{ => ethernet/natsemi}/ns83820.c | 7 +-
+ drivers/net/{ => ethernet/natsemi}/sonic.c | 0
+ drivers/net/{ => ethernet/natsemi}/sonic.h | 0
+ drivers/net/{ => ethernet/natsemi}/xtsonic.c | 2 +-
+ drivers/net/ethernet/neterion/Kconfig | 55 +
+ drivers/net/ethernet/neterion/Makefile | 6 +
+ drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0
+ drivers/net/{ => ethernet/neterion}/s2io.c | 10 +-
+ drivers/net/{ => ethernet/neterion}/s2io.h | 0
+ drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0
+ .../net/{ => ethernet/neterion}/vxge/vxge-config.c | 11 +-
+ .../net/{ => ethernet/neterion}/vxge/vxge-config.h | 4 +-
+ .../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0
+ .../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0
+ .../net/{ => ethernet/neterion}/vxge/vxge-main.c | 20 +-
+ .../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0
+ .../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0
+ .../{ => ethernet/neterion}/vxge/vxge-traffic.c | 12 +-
+ .../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0
+ .../{ => ethernet/neterion}/vxge/vxge-version.h | 0
+ drivers/net/{ => ethernet}/netx-eth.c | 2 +-
+ drivers/net/ethernet/nuvoton/Kconfig | 31 +
+ drivers/net/ethernet/nuvoton/Makefile | 5 +
+ .../net/{arm => ethernet/nuvoton}/w90p910_ether.c | 2 +-
+ drivers/net/ethernet/nvidia/Kconfig | 32 +
+ drivers/net/ethernet/nvidia/Makefile | 5 +
+ drivers/net/{ => ethernet/nvidia}/forcedeth.c | 18 +-
+ drivers/net/{ => ethernet}/octeon/Kconfig | 6 +-
+ drivers/net/ethernet/octeon/Makefile | 5 +
+ drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 4 +-
+ drivers/net/ethernet/oki-semi/Kconfig | 23 +
+ drivers/net/ethernet/oki-semi/Makefile | 5 +
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 22 +
+ .../net/{ => ethernet/oki-semi}/pch_gbe/Makefile | 0
+ .../net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h | 0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c | 0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h | 0
+ .../oki-semi}/pch_gbe/pch_gbe_ethtool.c | 0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c | 3 +-
+ .../oki-semi}/pch_gbe/pch_gbe_param.c | 0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c | 0
+ .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h | 0
+ drivers/net/ethernet/packetengines/Kconfig | 47 +
+ drivers/net/ethernet/packetengines/Makefile | 6 +
+ drivers/net/{ => ethernet/packetengines}/hamachi.c | 2 +-
+ .../net/{ => ethernet/packetengines}/yellowfin.c | 2 +-
+ drivers/net/ethernet/pasemi/Kconfig | 30 +
+ drivers/net/ethernet/pasemi/Makefile | 5 +
+ drivers/net/{ => ethernet/pasemi}/pasemi_mac.c | 7 +-
+ drivers/net/{ => ethernet/pasemi}/pasemi_mac.h | 0
+ .../net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c | 0
+ drivers/net/ethernet/qlogic/Kconfig | 54 +
+ drivers/net/ethernet/qlogic/Makefile | 8 +
+ drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
+ .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 10 +-
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
+ .../qlogic}/netxen/netxen_nic_ethtool.c | 0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 8 +-
+ .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 172 +-
+ drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 8 +-
+ drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
+ drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
+ drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 32 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 312 +-
+ .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 53 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 4 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 4 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 21 +-
+ .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 179 +-
+ drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
+ .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 20 +-
+ drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
+ drivers/net/ethernet/racal/Kconfig | 33 +
+ drivers/net/ethernet/racal/Makefile | 5 +
+ drivers/net/{ => ethernet/racal}/ni5010.c | 2 +-
+ drivers/net/{ => ethernet/racal}/ni5010.h | 0
+ drivers/net/ethernet/rdc/Kconfig | 35 +
+ drivers/net/ethernet/rdc/Makefile | 5 +
+ drivers/net/{ => ethernet/rdc}/r6040.c | 2 +-
+ drivers/net/{ => ethernet/realtek}/8139cp.c | 5 +-
+ drivers/net/{ => ethernet/realtek}/8139too.c | 2 +-
+ drivers/net/ethernet/realtek/Kconfig | 130 +
+ drivers/net/ethernet/realtek/Makefile | 9 +
+ drivers/net/{ => ethernet/realtek}/atp.c | 2 +-
+ drivers/net/{ => ethernet/realtek}/atp.h | 0
+ drivers/net/{ => ethernet/realtek}/r8169.c | 491 ++-
+ drivers/net/{ => ethernet/realtek}/sc92031.c | 10 +-
+ drivers/net/ethernet/renesas/Kconfig | 19 +
+ drivers/net/ethernet/renesas/Makefile | 5 +
+ drivers/net/{ => ethernet/renesas}/sh_eth.c | 44 +-
+ drivers/net/{ => ethernet/renesas}/sh_eth.h | 17 +-
+ drivers/net/{ => ethernet}/s6gmac.c | 0
+ drivers/net/ethernet/seeq/Kconfig | 47 +
+ drivers/net/ethernet/seeq/Makefile | 7 +
+ drivers/net/{arm => ethernet/seeq}/ether3.c | 2 +-
+ drivers/net/{arm => ethernet/seeq}/ether3.h | 0
+ drivers/net/{ => ethernet/seeq}/seeq8005.c | 2 +-
+ drivers/net/{ => ethernet/seeq}/seeq8005.h | 0
+ drivers/net/{ => ethernet/seeq}/sgiseeq.c | 2 +-
+ drivers/net/{ => ethernet/seeq}/sgiseeq.h | 0
+ drivers/net/{ => ethernet}/sfc/Kconfig | 4 +-
+ drivers/net/{ => ethernet}/sfc/Makefile | 0
+ drivers/net/{ => ethernet}/sfc/bitfield.h | 0
+ drivers/net/{ => ethernet}/sfc/efx.c | 46 +-
+ drivers/net/{ => ethernet}/sfc/efx.h | 7 +-
+ drivers/net/{ => ethernet}/sfc/enum.h | 0
+ drivers/net/{ => ethernet}/sfc/ethtool.c | 107 +-
+ drivers/net/{ => ethernet}/sfc/falcon.c | 2 +
+ drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
+ drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
+ drivers/net/{ => ethernet}/sfc/filter.c | 0
+ drivers/net/{ => ethernet}/sfc/filter.h | 0
+ drivers/net/{ => ethernet}/sfc/io.h | 0
+ drivers/net/{ => ethernet}/sfc/mac.h | 0
+ drivers/net/{ => ethernet}/sfc/mcdi.c | 0
+ drivers/net/{ => ethernet}/sfc/mcdi.h | 0
+ drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
+ drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
+ drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
+ drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
+ drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
+ drivers/net/{ => ethernet}/sfc/mtd.c | 0
+ drivers/net/{ => ethernet}/sfc/net_driver.h | 0
+ drivers/net/{ => ethernet}/sfc/nic.c | 0
+ drivers/net/{ => ethernet}/sfc/nic.h | 3 +-
+ drivers/net/{ => ethernet}/sfc/phy.h | 0
+ drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
+ drivers/net/{ => ethernet}/sfc/regs.h | 0
+ drivers/net/{ => ethernet}/sfc/rx.c | 2 +-
+ drivers/net/{ => ethernet}/sfc/selftest.c | 0
+ drivers/net/{ => ethernet}/sfc/selftest.h | 0
+ drivers/net/{ => ethernet}/sfc/siena.c | 2 +
+ drivers/net/{ => ethernet}/sfc/spi.h | 0
+ drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
+ drivers/net/{ => ethernet}/sfc/tx.c | 13 +-
+ drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
+ drivers/net/{ => ethernet}/sfc/workarounds.h | 0
+ drivers/net/ethernet/sgi/Kconfig | 36 +
+ drivers/net/ethernet/sgi/Makefile | 6 +
+ drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 2 +-
+ drivers/net/{ => ethernet/sgi}/meth.c | 0
+ drivers/net/{ => ethernet/sgi}/meth.h | 0
+ drivers/net/ethernet/sis/Kconfig | 53 +
+ drivers/net/ethernet/sis/Makefile | 6 +
+ drivers/net/{ => ethernet/sis}/sis190.c | 2 +-
+ drivers/net/{ => ethernet/sis}/sis900.c | 2 +-
+ drivers/net/{ => ethernet/sis}/sis900.h | 0
+ drivers/net/ethernet/smsc/Kconfig | 137 +
+ drivers/net/ethernet/smsc/Makefile | 11 +
+ drivers/net/{ => ethernet/smsc}/epic100.c | 2 +-
+ drivers/net/{ => ethernet/smsc}/smc911x.c | 2 +-
+ drivers/net/{ => ethernet/smsc}/smc911x.h | 0
+ drivers/net/{ => ethernet/smsc}/smc9194.c | 2 +-
+ drivers/net/{ => ethernet/smsc}/smc9194.h | 0
+ .../net/{pcmcia => ethernet/smsc}/smc91c92_cs.c | 2 +-
+ drivers/net/{ => ethernet/smsc}/smc91x.c | 2 +-
+ drivers/net/{ => ethernet/smsc}/smc91x.h | 0
+ drivers/net/{ => ethernet/smsc}/smsc911x.c | 89 +-
+ drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
+ drivers/net/{ => ethernet/smsc}/smsc9420.c | 2 +-
+ drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
+ drivers/net/ethernet/stmicro/Kconfig | 23 +
+ drivers/net/ethernet/stmicro/Makefile | 5 +
+ drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig | 23 +-
+ drivers/net/{ => ethernet/stmicro}/stmmac/Makefile | 3 +-
+ drivers/net/{ => ethernet/stmicro}/stmmac/common.h | 46 +-
+ drivers/net/{ => ethernet/stmicro}/stmmac/descs.h | 0
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac100.h | 0
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0
+ .../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c | 11 +-
+ .../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c | 14 +-
+ .../{ => ethernet/stmicro}/stmmac/dwmac100_core.c | 12 +-
+ .../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c | 0
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 1 +
+ .../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0
+ .../net/{ => ethernet/stmicro}/stmmac/enh_desc.c | 0
+ drivers/net/ethernet/stmicro/stmmac/mmc.h | 131 +
+ drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 265 +
+ .../net/{ => ethernet/stmicro}/stmmac/norm_desc.c | 0
+ drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h | 5 +-
+ .../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c | 144 +-
+ .../{ => ethernet/stmicro}/stmmac/stmmac_main.c | 305 +-
+ .../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c | 0
+ .../{ => ethernet/stmicro}/stmmac/stmmac_timer.c | 0
+ .../{ => ethernet/stmicro}/stmmac/stmmac_timer.h | 0
+ drivers/net/ethernet/sun/Kconfig | 88 +
+ drivers/net/ethernet/sun/Makefile | 11 +
+ drivers/net/{ => ethernet/sun}/cassini.c | 17 +-
+ drivers/net/{ => ethernet/sun}/cassini.h | 0
+ drivers/net/{ => ethernet/sun}/niu.c | 18 +-
+ drivers/net/{ => ethernet/sun}/niu.h | 0
+ drivers/net/{ => ethernet/sun}/sunbmac.c | 33 +-
+ drivers/net/{ => ethernet/sun}/sunbmac.h | 17 -
+ drivers/net/{ => ethernet/sun}/sungem.c | 12 +-
+ drivers/net/{ => ethernet/sun}/sungem.h | 0
+ drivers/net/{ => ethernet/sun}/sunhme.c | 7 +-
+ drivers/net/{ => ethernet/sun}/sunhme.h | 0
+ drivers/net/{ => ethernet/sun}/sunqe.c | 2 +-
+ drivers/net/{ => ethernet/sun}/sunqe.h | 0
+ drivers/net/{ => ethernet/sun}/sunvnet.c | 2 +-
+ drivers/net/{ => ethernet/sun}/sunvnet.h | 0
+ drivers/net/ethernet/tehuti/Kconfig | 27 +
+ drivers/net/ethernet/tehuti/Makefile | 5 +
+ drivers/net/{ => ethernet/tehuti}/tehuti.c | 16 +-
+ drivers/net/{ => ethernet/tehuti}/tehuti.h | 0
+ drivers/net/ethernet/ti/Kconfig | 77 +
+ drivers/net/ethernet/ti/Makefile | 9 +
+ drivers/net/{ => ethernet/ti}/cpmac.c | 2 +-
+ drivers/net/{ => ethernet/ti}/davinci_cpdma.c | 0
+ drivers/net/{ => ethernet/ti}/davinci_cpdma.h | 0
+ drivers/net/{ => ethernet/ti}/davinci_emac.c | 2 +-
+ drivers/net/{ => ethernet/ti}/davinci_mdio.c | 0
+ drivers/net/{ => ethernet/ti}/tlan.c | 2 +-
+ drivers/net/{ => ethernet/ti}/tlan.h | 0
+ drivers/net/ethernet/tile/Kconfig | 15 +
+ drivers/net/{ => ethernet}/tile/Makefile | 0
+ drivers/net/{ => ethernet}/tile/tilepro.c | 0
+ drivers/net/ethernet/toshiba/Kconfig | 57 +
+ drivers/net/ethernet/toshiba/Makefile | 10 +
+ drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c | 2 +-
+ drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h | 0
+ .../{ => ethernet/toshiba}/ps3_gelic_wireless.c | 2 +-
+ .../{ => ethernet/toshiba}/ps3_gelic_wireless.h | 0
+ drivers/net/{ => ethernet/toshiba}/spider_net.c | 6 +-
+ drivers/net/{ => ethernet/toshiba}/spider_net.h | 2 +-
+ .../{ => ethernet/toshiba}/spider_net_ethtool.c | 0
+ drivers/net/{ => ethernet/toshiba}/tc35815.c | 2 +-
+ drivers/net/ethernet/tundra/Kconfig | 29 +
+ drivers/net/ethernet/tundra/Makefile | 5 +
+ drivers/net/{ => ethernet/tundra}/tsi108_eth.c | 9 +-
+ drivers/net/{ => ethernet/tundra}/tsi108_eth.h | 0
+ drivers/net/ethernet/via/Kconfig | 59 +
+ drivers/net/ethernet/via/Makefile | 6 +
+ drivers/net/{ => ethernet/via}/via-rhine.c | 2 +-
+ drivers/net/{ => ethernet/via}/via-velocity.c | 155 +-
+ drivers/net/{ => ethernet/via}/via-velocity.h | 0
+ drivers/net/ethernet/xilinx/Kconfig | 36 +
+ drivers/net/ethernet/xilinx/Makefile | 7 +
+ drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0
+ drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 1 -
+ drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0
+ .../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0
+ drivers/net/ethernet/xircom/Kconfig | 31 +
+ drivers/net/ethernet/xircom/Makefile | 5 +
+ .../net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c | 2 +-
+ drivers/net/ethernet/xscale/Kconfig | 32 +
+ drivers/net/ethernet/xscale/Makefile | 6 +
+ drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig | 2 +-
+ drivers/net/{ => ethernet/xscale}/ixp2000/Makefile | 0
+ drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c | 0
+ drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h | 0
+ .../net/{ => ethernet/xscale}/ixp2000/enp2611.c | 0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.c | 0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400-msf.h | 0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc | 0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode | 0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc | 0
+ .../{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode | 0
+ drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c | 0
+ drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h | 0
+ .../{ => ethernet/xscale}/ixp2000/ixpdev_priv.h | 0
+ drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c | 0
+ drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h | 0
+ drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c | 2 +-
+ drivers/net/fddi/Kconfig | 77 +
+ drivers/net/fddi/Makefile | 6 +
+ drivers/net/{ => fddi}/defxx.c | 2 +-
+ drivers/net/{ => fddi}/defxx.h | 0
+ drivers/net/{ => fddi}/skfp/Makefile | 0
+ drivers/net/{ => fddi}/skfp/cfm.c | 0
+ drivers/net/{ => fddi}/skfp/drvfbi.c | 0
+ drivers/net/{ => fddi}/skfp/ecm.c | 0
+ drivers/net/{ => fddi}/skfp/ess.c | 0
+ drivers/net/{ => fddi}/skfp/fplustm.c | 0
+ drivers/net/{ => fddi}/skfp/h/cmtdef.h | 4 +-
+ drivers/net/{ => fddi}/skfp/h/fddi.h | 0
+ drivers/net/{ => fddi}/skfp/h/fddimib.h | 0
+ drivers/net/{ => fddi}/skfp/h/fplustm.h | 0
+ drivers/net/{ => fddi}/skfp/h/hwmtm.h | 2 +-
+ drivers/net/{ => fddi}/skfp/h/mbuf.h | 0
+ drivers/net/{ => fddi}/skfp/h/osdef1st.h | 0
+ drivers/net/{ => fddi}/skfp/h/sba.h | 4 +-
+ drivers/net/{ => fddi}/skfp/h/sba_def.h | 0
+ drivers/net/{ => fddi}/skfp/h/skfbi.h | 0
+ drivers/net/{ => fddi}/skfp/h/skfbiinc.h | 2 +-
+ drivers/net/{ => fddi}/skfp/h/smc.h | 14 +-
+ drivers/net/{ => fddi}/skfp/h/smt.h | 0
+ drivers/net/{ => fddi}/skfp/h/smt_p.h | 0
+ drivers/net/{ => fddi}/skfp/h/smtstate.h | 0
+ drivers/net/{ => fddi}/skfp/h/supern_2.h | 0
+ drivers/net/{ => fddi}/skfp/h/targethw.h | 6 +-
+ drivers/net/{ => fddi}/skfp/h/targetos.h | 2 +-
+ drivers/net/{ => fddi}/skfp/h/types.h | 0
+ drivers/net/{ => fddi}/skfp/hwmtm.c | 0
+ drivers/net/{ => fddi}/skfp/hwt.c | 0
+ drivers/net/{ => fddi}/skfp/pcmplc.c | 0
+ drivers/net/{ => fddi}/skfp/pmf.c | 0
+ drivers/net/{ => fddi}/skfp/queue.c | 0
+ drivers/net/{ => fddi}/skfp/rmt.c | 0
+ drivers/net/{ => fddi}/skfp/skfddi.c | 2 +-
+ drivers/net/{ => fddi}/skfp/smt.c | 0
+ drivers/net/{ => fddi}/skfp/smtdef.c | 0
+ drivers/net/{ => fddi}/skfp/smtinit.c | 0
+ drivers/net/{ => fddi}/skfp/smttimer.c | 0
+ drivers/net/{ => fddi}/skfp/srf.c | 0
+ drivers/net/hippi/Kconfig | 39 +
+ drivers/net/hippi/Makefile | 5 +
+ drivers/net/{ => hippi}/rrunner.c | 0
+ drivers/net/{ => hippi}/rrunner.h | 0
+ drivers/net/ibm_newemac/Makefile | 11 -
+ drivers/net/irda/sh_irda.c | 124 +-
+ drivers/net/macvlan.c | 5 +-
+ drivers/net/macvtap.c | 12 +-
+ drivers/net/octeon/Makefile | 2 -
+ drivers/net/pci-skeleton.c | 1923 ------
+ drivers/net/pcmcia/Kconfig | 123 -
+ drivers/net/pcmcia/Makefile | 16 -
+ drivers/net/phy/Kconfig | 2 +-
+ drivers/net/phy/dp83640.c | 205 +-
+ drivers/net/phy/icplus.c | 93 +-
+ drivers/net/phy/phy_device.c | 4 +-
+ drivers/net/plip/Kconfig | 38 +
+ drivers/net/plip/Makefile | 5 +
+ drivers/net/{ => plip}/plip.c | 0
+ drivers/net/ppp/Kconfig | 175 +
+ drivers/net/ppp/Makefile | 13 +
+ drivers/net/{ => ppp}/bsd_comp.c | 0
+ drivers/net/{ => ppp}/ppp_async.c | 0
+ drivers/net/{ => ppp}/ppp_deflate.c | 0
+ drivers/net/{ => ppp}/ppp_generic.c | 0
+ drivers/net/{ => ppp}/ppp_mppe.c | 0
+ drivers/net/{ => ppp}/ppp_mppe.h | 0
+ drivers/net/{ => ppp}/ppp_synctty.c | 0
+ drivers/net/{ => ppp}/pppoe.c | 0
+ drivers/net/{ => ppp}/pppox.c | 0
+ drivers/net/{ => ppp}/pptp.c | 0
+ drivers/net/slip/Kconfig | 79 +
+ drivers/net/slip/Makefile | 6 +
+ drivers/net/{ => slip}/slhc.c | 0
+ drivers/net/{ => slip}/slip.c | 29 +-
+ drivers/net/{ => slip}/slip.h | 9 -
+ drivers/net/sungem_phy.c | 7 +-
+ drivers/net/tokenring/3c359.c | 2 +-
+ drivers/net/tokenring/Kconfig | 15 +-
+ drivers/net/tokenring/Makefile | 21 +-
+ drivers/net/tokenring/ibmtr.c | 2 +-
+ drivers/net/{pcmcia => tokenring}/ibmtr_cs.c | 2 +-
+ drivers/net/tokenring/lanstreamer.c | 2 +-
+ drivers/net/tokenring/olympic.c | 2 +-
+ drivers/net/tokenring/smctr.c | 2 +-
+ drivers/net/tokenring/tms380tr.c | 2 +-
+ drivers/net/tun.c | 2 +-
+ drivers/net/usb/Kconfig | 3 +
+ drivers/net/usb/asix.c | 409 +-
+ drivers/net/usb/catc.c | 2 +-
+ drivers/net/usb/dm9601.c | 2 +-
+ drivers/net/usb/int51x1.c | 2 +-
+ drivers/net/usb/kaweth.c | 2 +-
+ drivers/net/usb/lg-vl600.c | 19 +
+ drivers/net/usb/mcs7830.c | 2 +-
+ drivers/net/usb/pegasus.c | 2 +-
+ drivers/net/usb/rtl8150.c | 113 +-
+ drivers/net/usb/smsc75xx.c | 2 +-
+ drivers/net/usb/smsc95xx.c | 2 +-
+ drivers/net/usb/usbnet.c | 6 +
+ drivers/net/virtio_net.c | 16 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 10 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +-
+ drivers/net/wan/hdlc_ppp.c | 14 +-
+ drivers/net/wan/hdlc_x25.c | 16 +-
+ drivers/net/wan/lapbether.c | 3 +-
+ drivers/net/wan/sbni.c | 2 +-
+ drivers/net/wan/x25_asy.c | 3 +-
+ drivers/net/wireless/adm8211.c | 3 +-
+ drivers/net/wireless/airo.c | 4 +-
+ drivers/net/wireless/ath/Kconfig | 1 +
+ drivers/net/wireless/ath/Makefile | 1 +
+ drivers/net/wireless/ath/ath.h | 51 +-
+ drivers/net/wireless/ath/ath5k/ahb.c | 4 +-
+ drivers/net/wireless/ath/ath5k/ani.c | 1 -
+ drivers/net/wireless/ath/ath5k/ani.h | 4 +
+ drivers/net/wireless/ath/ath5k/ath5k.h | 98 +-
+ drivers/net/wireless/ath/ath5k/attach.c | 18 +-
+ drivers/net/wireless/ath/ath5k/base.c | 31 +-
+ drivers/net/wireless/ath/ath5k/base.h | 55 +-
+ drivers/net/wireless/ath/ath5k/caps.c | 2 +-
+ drivers/net/wireless/ath/ath5k/debug.c | 15 +-
+ drivers/net/wireless/ath/ath5k/desc.c | 1 -
+ drivers/net/wireless/ath/ath5k/dma.c | 1 -
+ drivers/net/wireless/ath/ath5k/eeprom.c | 10 +-
+ drivers/net/wireless/ath/ath5k/gpio.c | 1 -
+ drivers/net/wireless/ath/ath5k/initvals.c | 1 -
+ drivers/net/wireless/ath/ath5k/led.c | 1 -
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c | 11 +-
+ drivers/net/wireless/ath/ath5k/pci.c | 4 +-
+ drivers/net/wireless/ath/ath5k/pcu.c | 5 +-
+ drivers/net/wireless/ath/ath5k/phy.c | 91 +-
+ drivers/net/wireless/ath/ath5k/qcu.c | 10 +-
+ drivers/net/wireless/ath/ath5k/reset.c | 79 +-
+ drivers/net/wireless/ath/ath5k/rfkill.c | 2 +-
+ drivers/net/wireless/ath/ath5k/sysfs.c | 1 -
+ drivers/net/wireless/ath/ath5k/trace.h | 3 +-
+ drivers/net/wireless/ath/ath6kl/Kconfig | 15 +
+ drivers/net/wireless/ath/ath6kl/Makefile | 35 +
+ drivers/net/wireless/ath/ath6kl/bmi.c | 692 +++
+ drivers/net/wireless/ath/ath6kl/bmi.h | 250 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 1538 +++++
+ drivers/net/wireless/ath/ath6kl/cfg80211.h | 39 +
+ drivers/net/wireless/ath/ath6kl/common.h | 180 +
+ drivers/net/wireless/ath/ath6kl/core.h | 544 ++
+ drivers/net/wireless/ath/ath6kl/debug.c | 150 +
+ drivers/net/wireless/ath/ath6kl/debug.h | 105 +
+ drivers/net/wireless/ath/ath6kl/hif-ops.h | 72 +
+ drivers/net/wireless/ath/ath6kl/hif.h | 207 +
+ drivers/net/wireless/ath/ath6kl/htc.c | 2457 ++++++++
+ drivers/net/wireless/ath/ath6kl/htc.h | 607 ++
+ drivers/net/wireless/ath/ath6kl/htc_hif.c | 641 ++
+ drivers/net/wireless/ath/ath6kl/htc_hif.h | 92 +
+ drivers/net/wireless/ath/ath6kl/init.c | 1303 ++++
+ drivers/net/wireless/ath/ath6kl/main.c | 1337 ++++
+ drivers/net/wireless/ath/ath6kl/node.c | 234 +
+ drivers/net/wireless/ath/ath6kl/sdio.c | 912 +++
+ drivers/net/wireless/ath/ath6kl/target.h | 331 +
+ drivers/net/wireless/ath/ath6kl/txrx.c | 1457 +++++
+ drivers/net/wireless/ath/ath6kl/wmi.c | 2743 +++++++++
+ drivers/net/wireless/ath/ath6kl/wmi.h | 2018 ++++++
+ drivers/net/wireless/ath/ath9k/ahb.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ani.c | 12 +-
+ drivers/net/wireless/ath/ath9k/ani.h | 6 +-
+ drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 131 +-
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 32 +-
+ drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 266 +-
+ drivers/net/wireless/ath/ath9k/ar9002_calib.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 56 +-
+ drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 3403 ++++++-----
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c | 257 +-
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 192 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 36 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 269 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 3 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 610 ++-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 374 +-
+ drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 15 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 32 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 102 +-
+ .../net/wireless/ath/ath9k/ar9480_1p0_initvals.h | 1833 ++++++
+ .../net/wireless/ath/ath9k/ar9480_2p0_initvals.h | 1928 ++++++
+ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 1673 +++++
+ drivers/net/wireless/ath/ath9k/ath9k.h | 31 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 74 +-
+ drivers/net/wireless/ath/ath9k/calib.c | 18 +-
+ drivers/net/wireless/ath/ath9k/calib.h | 1 +
+ drivers/net/wireless/ath/ath9k/common.c | 26 +
+ drivers/net/wireless/ath/ath9k/common.h | 1 +
+ drivers/net/wireless/ath/ath9k/debug.c | 474 ++-
+ drivers/net/wireless/ath/ath9k/debug.h | 55 +-
+ drivers/net/wireless/ath/ath9k/eeprom.c | 7 +-
+ drivers/net/wireless/ath/ath9k/eeprom.h | 2 +
+ drivers/net/wireless/ath/ath9k/eeprom_4k.c | 243 +-
+ drivers/net/wireless/ath/ath9k/eeprom_9287.c | 134 +-
+ drivers/net/wireless/ath/ath9k/eeprom_def.c | 196 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 4 +
+ drivers/net/wireless/ath/ath9k/htc.h | 3 -
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 29 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 30 +-
+ drivers/net/wireless/ath/ath9k/hw-ops.h | 71 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 132 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 46 +-
+ drivers/net/wireless/ath/ath9k/init.c | 79 +-
+ drivers/net/wireless/ath/ath9k/mac.c | 49 +-
+ drivers/net/wireless/ath/ath9k/mac.h | 51 +-
+ drivers/net/wireless/ath/ath9k/main.c | 602 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 57 +-
+ drivers/net/wireless/ath/ath9k/rc.c | 38 +-
+ drivers/net/wireless/ath/ath9k/rc.h | 6 -
+ drivers/net/wireless/ath/ath9k/recv.c | 53 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 82 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 841 ++--
+ drivers/net/wireless/ath/carl9170/Kconfig | 14 +
+ drivers/net/wireless/ath/carl9170/carl9170.h | 24 +
+ drivers/net/wireless/ath/carl9170/cmd.c | 34 +
+ drivers/net/wireless/ath/carl9170/cmd.h | 1 +
+ drivers/net/wireless/ath/carl9170/fw.c | 3 +
+ drivers/net/wireless/ath/carl9170/fwcmd.h | 11 +
+ drivers/net/wireless/ath/carl9170/main.c | 232 +-
+ drivers/net/wireless/ath/carl9170/phy.c | 16 +-
+ drivers/net/wireless/ath/carl9170/version.h | 4 +-
+ drivers/net/wireless/ath/main.c | 8 +-
+ drivers/net/wireless/ath/regd.h | 2 +-
+ drivers/net/wireless/ath/regd_common.h | 2 +-
+ drivers/net/wireless/b43/Kconfig | 22 +-
+ drivers/net/wireless/b43/b43.h | 65 +-
+ drivers/net/wireless/b43/bus.c | 2 +
+ drivers/net/wireless/b43/dma.c | 157 +-
+ drivers/net/wireless/b43/dma.h | 16 +-
+ drivers/net/wireless/b43/main.c | 130 +-
+ drivers/net/wireless/b43/phy_common.c | 32 +
+ drivers/net/wireless/b43/phy_common.h | 2 +
+ drivers/net/wireless/b43/phy_ht.c | 205 +
+ drivers/net/wireless/b43/phy_ht.h | 19 +
+ drivers/net/wireless/b43/phy_lcn.c | 853 +++-
+ drivers/net/wireless/b43/phy_lcn.h | 19 +-
+ drivers/net/wireless/b43/phy_n.c | 583 ++-
+ drivers/net/wireless/b43/phy_n.h | 4 +
+ drivers/net/wireless/b43/pio.c | 12 +-
+ drivers/net/wireless/b43/radio_2055.c | 1 +
+ drivers/net/wireless/b43/radio_2056.c | 2 +
+ drivers/net/wireless/b43/radio_2056.h | 26 -
+ drivers/net/wireless/b43/radio_2059.c | 2 +
+ drivers/net/wireless/b43/tables_nphy.c | 1 +
+ drivers/net/wireless/b43/tables_phy_ht.c | 86 +
+ drivers/net/wireless/b43/tables_phy_ht.h | 4 +
+ drivers/net/wireless/b43/tables_phy_lcn.c | 690 +++
+ drivers/net/wireless/b43/tables_phy_lcn.h | 18 +
+ drivers/net/wireless/b43/xmit.c | 120 +-
+ drivers/net/wireless/b43/xmit.h | 62 +-
+ drivers/net/wireless/b43legacy/b43legacy.h | 5 -
+ drivers/net/wireless/b43legacy/dma.c | 374 +-
+ drivers/net/wireless/b43legacy/dma.h | 107 -
+ drivers/net/wireless/b43legacy/main.c | 8 +-
+ drivers/net/wireless/hostap/hostap_main.c | 6 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 3 +-
+ drivers/net/wireless/iwlegacy/iwl-3945-led.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl-3945.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl-4965-led.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl-4965.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl-core.c | 3 +-
+ drivers/net/wireless/iwlegacy/iwl-core.h | 3 +-
+ drivers/net/wireless/iwlegacy/iwl-led.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl3945-base.c | 1 -
+ drivers/net/wireless/iwlegacy/iwl4965-base.c | 1 -
+ drivers/net/wireless/iwlwifi/Kconfig | 17 -
+ drivers/net/wireless/iwlwifi/Makefile | 23 +-
+ drivers/net/wireless/iwlwifi/iwl-1000.c | 57 +-
+ drivers/net/wireless/iwlwifi/iwl-2000.c | 82 +-
+ drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-5000.c | 86 +-
+ drivers/net/wireless/iwlwifi/iwl-6000.c | 83 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 133 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 299 -
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 17 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1118 +----
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 110 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 94 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 84 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 82 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 1 -
+ drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 958 ++--
+ drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 118 +-
+ drivers/net/wireless/iwlwifi/iwl-agn.c | 1384 ++---
+ drivers/net/wireless/iwlwifi/iwl-agn.h | 85 +-
+ drivers/net/wireless/iwlwifi/iwl-bus.h | 90 +-
+ drivers/net/wireless/iwlwifi/iwl-cfg.h | 115 +
+ drivers/net/wireless/iwlwifi/iwl-commands.h | 55 +-
+ drivers/net/wireless/iwlwifi/iwl-core.c | 329 +-
+ drivers/net/wireless/iwlwifi/iwl-core.h | 158 +-
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 18 +
+ drivers/net/wireless/iwlwifi/iwl-debug.h | 40 +-
+ drivers/net/wireless/iwlwifi/iwl-debugfs.c | 430 +-
+ drivers/net/wireless/iwlwifi/iwl-dev.h | 555 +--
+ drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +
+ drivers/net/wireless/iwlwifi/iwl-eeprom.c | 306 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom.h | 11 +-
+ drivers/net/wireless/iwlwifi/iwl-fh.h | 20 +-
+ drivers/net/wireless/iwlwifi/iwl-helpers.h | 114 +-
+ drivers/net/wireless/iwlwifi/iwl-io.c | 192 +-
+ drivers/net/wireless/iwlwifi/iwl-io.h | 61 +-
+ drivers/net/wireless/iwlwifi/iwl-led.c | 13 +-
+ drivers/net/wireless/iwlwifi/iwl-pci.c | 47 +-
+ drivers/net/wireless/iwlwifi/iwl-power.c | 19 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-rx.c | 220 +-
+ drivers/net/wireless/iwlwifi/iwl-scan.c | 760 ++-
+ drivers/net/wireless/iwlwifi/iwl-shared.h | 536 ++
+ drivers/net/wireless/iwlwifi/iwl-sta.c | 143 +-
+ drivers/net/wireless/iwlwifi/iwl-sta.h | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-sv-open.c | 22 +-
+ drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h | 82 -
+ drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 436 ++
+ drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 1436 +++++
+ .../{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c} | 682 ++-
+ drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 1989 ++++++
+ drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c | 979 ---
+ drivers/net/wireless/iwlwifi/iwl-trans.c | 1115 +----
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 278 +-
+ drivers/net/wireless/libertas/README | 25 -
+ drivers/net/wireless/libertas/cfg.c | 102 +-
+ drivers/net/wireless/libertas/cfg.h | 1 +
+ drivers/net/wireless/libertas/cmd.c | 6 +-
+ drivers/net/wireless/libertas/decl.h | 4 +
+ drivers/net/wireless/libertas/dev.h | 29 +-
+ drivers/net/wireless/libertas/ethtool.c | 1 +
+ drivers/net/wireless/libertas/if_sdio.c | 277 +-
+ drivers/net/wireless/libertas/if_spi.c | 4 -
+ drivers/net/wireless/libertas/if_usb.c | 34 +-
+ drivers/net/wireless/libertas/main.c | 182 +-
+ drivers/net/wireless/libertas/mesh.c | 79 +-
+ drivers/net/wireless/libertas/mesh.h | 27 +-
+ drivers/net/wireless/libertas/rx.c | 1 +
+ drivers/net/wireless/libertas/tx.c | 1 +
+ drivers/net/wireless/mac80211_hwsim.c | 6 +
+ drivers/net/wireless/mwifiex/cfg80211.c | 216 +-
+ drivers/net/wireless/mwifiex/cmdevt.c | 3 +
+ drivers/net/wireless/mwifiex/fw.h | 15 +-
+ drivers/net/wireless/mwifiex/init.c | 21 -
+ drivers/net/wireless/mwifiex/ioctl.h | 5 +-
+ drivers/net/wireless/mwifiex/join.c | 35 +-
+ drivers/net/wireless/mwifiex/main.c | 6 +-
+ drivers/net/wireless/mwifiex/main.h | 55 +-
+ drivers/net/wireless/mwifiex/scan.c | 1591 +----
+ drivers/net/wireless/mwifiex/sta_event.c | 9 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 237 +-
+ drivers/net/wireless/mwl8k.c | 11 +-
+ drivers/net/wireless/orinoco/main.c | 2 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
+ drivers/net/wireless/orinoco/wext.c | 1 +
+ drivers/net/wireless/p54/eeprom.c | 26 +-
+ drivers/net/wireless/p54/fwio.c | 2 +
+ drivers/net/wireless/p54/main.c | 113 +-
+ drivers/net/wireless/p54/p54.h | 18 +
+ drivers/net/wireless/p54/p54spi.c | 2 +-
+ drivers/net/wireless/p54/txrx.c | 70 +
+ drivers/net/wireless/ray_cs.c | 2 +-
+ drivers/net/wireless/rndis_wlan.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2400pci.c | 44 +-
+ drivers/net/wireless/rt2x00/rt2500pci.c | 42 +-
+ drivers/net/wireless/rt2x00/rt2800.h | 3 +
+ drivers/net/wireless/rt2x00/rt2800lib.c | 193 +-
+ drivers/net/wireless/rt2x00/rt2800lib.h | 7 +-
+ drivers/net/wireless/rt2x00/rt2800pci.c | 61 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 7 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 30 +
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 22 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 50 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 7 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.h | 5 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 36 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 2 +-
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 5 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
+ drivers/net/wireless/rtlwifi/base.c | 161 +
+ drivers/net/wireless/rtlwifi/base.h | 2 +
+ drivers/net/wireless/rtlwifi/core.c | 8 +-
+ drivers/net/wireless/rtlwifi/debug.c | 6 +-
+ drivers/net/wireless/rtlwifi/pci.c | 37 +-
+ drivers/net/wireless/rtlwifi/pci.h | 26 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 139 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 42 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 116 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 6 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 6 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 23 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/def.h | 35 -
+ drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 42 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 121 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 6 -
+ drivers/net/wireless/rtlwifi/rtl8192se/def.h | 41 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 44 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 126 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 41 +
+ drivers/net/wireless/wl1251/cmd.h | 2 +-
+ drivers/net/wireless/wl1251/wl12xx_80211.h | 2 +-
+ drivers/net/wireless/wl12xx/Kconfig | 10 -
+ drivers/net/wireless/wl12xx/Makefile | 6 +-
+ drivers/net/wireless/wl12xx/acx.c | 362 +-
+ drivers/net/wireless/wl12xx/acx.h | 412 +-
+ drivers/net/wireless/wl12xx/boot.c | 47 +-
+ drivers/net/wireless/wl12xx/boot.h | 3 +-
+ drivers/net/wireless/wl12xx/cmd.c | 823 ++-
+ drivers/net/wireless/wl12xx/cmd.h | 334 +-
+ drivers/net/wireless/wl12xx/conf.h | 381 +-
+ drivers/net/wireless/wl12xx/debugfs.c | 105 +-
+ drivers/net/wireless/wl12xx/event.c | 43 +-
+ drivers/net/wireless/wl12xx/event.h | 80 +-
+ drivers/net/wireless/wl12xx/init.c | 113 +-
+ drivers/net/wireless/wl12xx/io.h | 1 -
+ drivers/net/wireless/wl12xx/main.c | 1294 +++--
+ drivers/net/wireless/wl12xx/ps.c | 12 +-
+ drivers/net/wireless/wl12xx/reg.h | 75 -
+ drivers/net/wireless/wl12xx/rx.c | 69 +-
+ drivers/net/wireless/wl12xx/rx.h | 18 +-
+ drivers/net/wireless/wl12xx/scan.c | 200 +-
+ drivers/net/wireless/wl12xx/scan.h | 31 +-
+ drivers/net/wireless/wl12xx/sdio.c | 4 +-
+ drivers/net/wireless/wl12xx/sdio_test.c | 17 +-
+ drivers/net/wireless/wl12xx/spi.c | 4 +-
+ drivers/net/wireless/wl12xx/tx.c | 192 +-
+ drivers/net/wireless/wl12xx/tx.h | 26 +-
+ drivers/net/wireless/wl12xx/wl12xx.h | 167 +-
+ drivers/net/wireless/wl12xx/wl12xx_80211.h | 27 +-
+ drivers/net/wireless/wl3501_cs.c | 2 +-
+ drivers/net/wireless/zd1201.c | 2 +-
+ drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
+ drivers/net/xen-netback/netback.c | 54 +-
+ drivers/net/xen-netfront.c | 34 +-
+ drivers/nfc/Kconfig | 11 +
+ drivers/nfc/Makefile | 1 +
+ drivers/nfc/nfcwilink.c | 342 ++
+ drivers/nfc/pn533.c | 21 +-
+ drivers/s390/cio/qdio.h | 38 +-
+ drivers/s390/cio/qdio_debug.c | 3 +
+ drivers/s390/cio/qdio_main.c | 208 +-
+ drivers/s390/cio/qdio_setup.c | 83 +-
+ drivers/s390/cio/qdio_thinint.c | 88 +-
+ drivers/s390/net/lcs.c | 2 +-
+ drivers/s390/net/qeth_core.h | 50 +-
+ drivers/s390/net/qeth_core_main.c | 780 +++-
+ drivers/s390/net/qeth_l2_main.c | 4 +-
+ drivers/s390/net/qeth_l3.h | 4 +
+ drivers/s390/net/qeth_l3_main.c | 92 +-
+ drivers/s390/net/qeth_l3_sys.c | 110 +-
+ drivers/scsi/bnx2fc/Kconfig | 3 +-
+ drivers/scsi/bnx2fc/bnx2fc.h | 4 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +-
+ drivers/scsi/bnx2i/Kconfig | 3 +-
+ drivers/scsi/bnx2i/bnx2i.h | 2 +-
+ drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +-
+ drivers/scsi/cxgbi/cxgb3i/Kconfig | 3 +-
+ drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +-
+ drivers/scsi/cxgbi/cxgb4i/Kconfig | 3 +-
+ drivers/scsi/fcoe/fcoe.c | 6 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 5 +-
+ drivers/ssb/main.c | 24 +-
+ drivers/staging/Kconfig | 2 -
+ drivers/staging/Makefile | 1 -
+ drivers/staging/ath6kl/Kconfig | 158 -
+ drivers/staging/ath6kl/Makefile | 122 -
+ drivers/staging/ath6kl/TODO | 25 -
+ drivers/staging/ath6kl/bmi/include/bmi_internal.h | 54 -
+ drivers/staging/ath6kl/bmi/src/bmi.c | 1010 ---
+ .../staging/ath6kl/hif/common/hif_sdio_common.h | 87 -
+ .../hif/sdio/linux_sdio/include/hif_internal.h | 131 -
+ .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 1273 ----
+ .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 393 --
+ drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 1479 -----
+ drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 401 --
+ drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 783 ---
+ drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 755 ---
+ .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 1284 ----
+ drivers/staging/ath6kl/htc2/htc.c | 575 --
+ drivers/staging/ath6kl/htc2/htc_debug.h | 38 -
+ drivers/staging/ath6kl/htc2/htc_internal.h | 211 -
+ drivers/staging/ath6kl/htc2/htc_recv.c | 1572 -----
+ drivers/staging/ath6kl/htc2/htc_send.c | 1018 ---
+ drivers/staging/ath6kl/htc2/htc_services.c | 450 --
+ drivers/staging/ath6kl/include/a_config.h | 31 -
+ drivers/staging/ath6kl/include/a_debug.h | 195 -
+ drivers/staging/ath6kl/include/a_drv.h | 32 -
+ drivers/staging/ath6kl/include/a_drv_api.h | 204 -
+ drivers/staging/ath6kl/include/a_osapi.h | 32 -
+ drivers/staging/ath6kl/include/aggr_recv_api.h | 140 -
+ drivers/staging/ath6kl/include/ar3kconfig.h | 65 -
+ drivers/staging/ath6kl/include/ar6000_api.h | 32 -
+ drivers/staging/ath6kl/include/ar6000_diag.h | 48 -
+ drivers/staging/ath6kl/include/ar6kap_common.h | 44 -
+ drivers/staging/ath6kl/include/athbtfilter.h | 135 -
+ drivers/staging/ath6kl/include/bmi.h | 134 -
+ .../ath6kl/include/common/AR6002/AR6K_version.h | 52 -
+ .../staging/ath6kl/include/common/AR6002/addrs.h | 90 -
+ .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h | 40 -
+ .../include/common/AR6002/hw4.0/hw/apb_map.h | 40 -
+ .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 24 -
+ .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 552 --
+ .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 471 --
+ .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 589 --
+ .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 187 -
+ .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 162 -
+ .../include/common/AR6002/hw4.0/hw/uart_reg.h | 40 -
+ drivers/staging/ath6kl/include/common/athdefs.h | 75 -
+ drivers/staging/ath6kl/include/common/bmi_msg.h | 233 -
+ drivers/staging/ath6kl/include/common/cnxmgmt.h | 36 -
+ drivers/staging/ath6kl/include/common/dbglog.h | 126 -
+ drivers/staging/ath6kl/include/common/dbglog_id.h | 558 --
+ drivers/staging/ath6kl/include/common/discovery.h | 75 -
+ .../staging/ath6kl/include/common/epping_test.h | 111 -
+ drivers/staging/ath6kl/include/common/gmboxif.h | 70 -
+ drivers/staging/ath6kl/include/common/gpio_reg.h | 9 -
+ drivers/staging/ath6kl/include/common/htc.h | 227 -
+ .../staging/ath6kl/include/common/htc_services.h | 52 -
+ drivers/staging/ath6kl/include/common/pkt_log.h | 45 -
+ drivers/staging/ath6kl/include/common/roaming.h | 41 -
+ drivers/staging/ath6kl/include/common/targaddrs.h | 395 --
+ drivers/staging/ath6kl/include/common/testcmd.h | 185 -
+ drivers/staging/ath6kl/include/common/tlpm.h | 38 -
+ drivers/staging/ath6kl/include/common/wlan_defs.h | 79 -
+ drivers/staging/ath6kl/include/common/wmi.h | 3220 ----------
+ drivers/staging/ath6kl/include/common/wmix.h | 271 -
+ drivers/staging/ath6kl/include/common_drv.h | 104 -
+ drivers/staging/ath6kl/include/dbglog_api.h | 52 -
+ drivers/staging/ath6kl/include/dl_list.h | 153 -
+ drivers/staging/ath6kl/include/dset_api.h | 65 -
+ drivers/staging/ath6kl/include/hci_transport_api.h | 259 -
+ drivers/staging/ath6kl/include/hif.h | 456 --
+ drivers/staging/ath6kl/include/host_version.h | 52 -
+ drivers/staging/ath6kl/include/htc_api.h | 575 --
+ drivers/staging/ath6kl/include/htc_packet.h | 227 -
+ drivers/staging/ath6kl/include/wlan_api.h | 128 -
+ drivers/staging/ath6kl/include/wmi_api.h | 441 --
+ drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 565 --
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 572 --
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 75 -
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 969 ---
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 113 -
+ drivers/staging/ath6kl/miscdrv/common_drv.c | 910 ---
+ drivers/staging/ath6kl/miscdrv/credit_dist.c | 417 --
+ drivers/staging/ath6kl/miscdrv/miscdrv.h | 42 -
+ drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6267 -------------------
+ drivers/staging/ath6kl/os/linux/ar6000_pm.c | 626 --
+ drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 455 --
+ drivers/staging/ath6kl/os/linux/cfg80211.c | 1892 ------
+ .../staging/ath6kl/os/linux/export_hci_transport.c | 124 -
+ drivers/staging/ath6kl/os/linux/hci_bridge.c | 1141 ----
+ .../staging/ath6kl/os/linux/include/ar6000_drv.h | 776 ---
+ drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 36 -
+ .../ath6kl/os/linux/include/ar6xapi_linux.h | 190 -
+ .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
+ drivers/staging/ath6kl/os/linux/include/cfg80211.h | 61 -
+ .../staging/ath6kl/os/linux/include/config_linux.h | 51 -
+ .../staging/ath6kl/os/linux/include/debug_linux.h | 50 -
+ .../ath6kl/os/linux/include/export_hci_transport.h | 76 -
+ .../ath6kl/os/linux/include/ieee80211_ioctl.h | 177 -
+ .../staging/ath6kl/os/linux/include/osapi_linux.h | 339 -
+ .../staging/ath6kl/os/linux/include/wlan_config.h | 108 -
+ .../ath6kl/os/linux/include/wmi_filter_linux.h | 300 -
+ drivers/staging/ath6kl/os/linux/netbuf.c | 231 -
+ drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 117 -
+ drivers/staging/ath6kl/reorder/rcv_aggr.c | 661 --
+ drivers/staging/ath6kl/wlan/include/ieee80211.h | 397 --
+ .../staging/ath6kl/wlan/include/ieee80211_node.h | 93 -
+ drivers/staging/ath6kl/wlan/src/wlan_node.c | 636 --
+ drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 199 -
+ drivers/staging/ath6kl/wlan/src/wlan_utils.c | 58 -
+ drivers/staging/ath6kl/wmi/wmi.c | 6444 --------------------
+ drivers/staging/ath6kl/wmi/wmi_host.h | 102 -
+ drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +-
+ drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 12 +-
+ drivers/staging/et131x/et1310_tx.c | 12 +-
+ drivers/staging/et131x/et131x_netdev.c | 2 +-
+ drivers/staging/hv/netvsc_drv.c | 4 +-
+ drivers/staging/octeon/ethernet.c | 12 +-
+ drivers/staging/rtl8187se/r8180_core.c | 2 +-
+ drivers/staging/rtl8192e/r8192E_core.c | 2 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 2 +-
+ drivers/staging/slicoss/slicoss.c | 2 +-
+ drivers/staging/vt6655/device_main.c | 2 +-
+ drivers/staging/vt6656/main_usb.c | 2 +-
+ drivers/staging/winbond/wbusb.c | 2 +-
+ drivers/staging/wlags49_h2/wl_netdev.c | 2 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 2 +-
+ drivers/watchdog/bcm47xx_wdt.c | 27 +-
+ drivers/xen/xen-pciback/xenbus.c | 2 +
+ include/linux/atalk.h | 3 +-
+ include/linux/ax25.h | 2 +-
+ include/linux/bcma/bcma.h | 9 +-
+ include/linux/bcma/bcma_driver_chipcommon.h | 94 +
+ include/linux/bcma/bcma_driver_mips.h | 51 +
+ include/linux/bcma/bcma_soc.h | 16 +
+ include/linux/caif/caif_socket.h | 7 +-
+ include/linux/can.h | 2 +-
+ include/linux/can/Kbuild | 1 +
+ include/linux/can/bcm.h | 1 +
+ include/linux/can/gw.h | 164 +
+ include/linux/cn_proc.h | 11 +
+ include/linux/ethtool.h | 180 +-
+ include/linux/ieee80211.h | 71 +-
+ include/linux/if.h | 1 +
+ include/linux/if_ether.h | 1 +
+ include/linux/if_packet.h | 119 +
+ include/linux/if_pppol2tp.h | 2 +-
+ include/linux/if_pppox.h | 9 +-
+ include/linux/in.h | 2 +-
+ include/linux/ip6_tunnel.h | 2 +
+ include/linux/ipx.h | 2 +-
+ include/linux/irda.h | 9 +-
+ include/linux/l2tp.h | 7 +-
+ include/linux/lapb.h | 3 +-
+ include/linux/llc.h | 10 +-
+ include/linux/mii.h | 210 +-
+ include/linux/net_tstamp.h | 9 +
+ include/linux/netdevice.h | 13 +-
+ include/linux/netfilter/xt_connlimit.h | 1 +
+ include/linux/netfilter/xt_conntrack.h | 1 +
+ include/linux/netfilter/xt_iprange.h | 1 +
+ include/linux/netfilter_arp/arp_tables.h | 14 +-
+ include/linux/netfilter_decnet.h | 3 +
+ include/linux/netfilter_ipv4.h | 3 +
+ include/linux/netfilter_ipv4/ip_tables.h | 20 +-
+ include/linux/netfilter_ipv6.h | 3 +
+ include/linux/netfilter_ipv6/ip6_tables.h | 22 +-
+ include/linux/netlink.h | 2 +-
+ include/linux/netrom.h | 2 +
+ include/linux/nfc.h | 8 +
+ include/linux/nl80211.h | 192 +-
+ include/linux/pci.h | 2 +
+ include/linux/phonet.h | 5 +-
+ include/linux/rose.h | 7 +-
+ {arch/sh/include/asm => include/linux}/sh_eth.h | 2 +-
+ include/linux/skbuff.h | 181 +-
+ include/linux/ssb/ssb.h | 2 +-
+ include/linux/ssb/ssb_regs.h | 40 +
+ {drivers/net => include/linux}/sungem_phy.h | 2 +-
+ include/linux/sysctl.h | 2 +-
+ include/linux/tcp.h | 7 +-
+ include/linux/tipc_config.h | 4 +
+ include/linux/un.h | 4 +-
+ include/linux/x25.h | 3 +-
+ include/net/addrconf.h | 2 +-
+ include/net/bluetooth/hci.h | 10 +
+ include/net/bluetooth/hci_core.h | 25 +-
+ include/net/bluetooth/l2cap.h | 8 +-
+ include/net/bluetooth/mgmt.h | 16 +
+ include/net/bluetooth/smp.h | 17 +
+ include/net/cfg80211-wext.h | 55 +
+ include/net/cfg80211.h | 353 +-
+ include/net/dst.h | 9 +-
+ include/net/if_inet6.h | 1 +
+ include/net/iucv/af_iucv.h | 52 +
+ include/net/iucv/iucv.h | 36 +-
+ include/net/lapb.h | 2 +-
+ include/net/lib80211.h | 3 -
+ include/net/mac80211.h | 55 +-
+ include/net/nfc/nci.h | 313 +
+ include/net/nfc/nci_core.h | 184 +
+ include/net/{ => nfc}/nfc.h | 11 +-
+ include/net/regulatory.h | 16 +-
+ include/net/scm.h | 5 +-
+ include/net/sctp/structs.h | 1 +
+ include/net/sock.h | 15 +-
+ include/net/tcp.h | 8 +-
+ include/rdma/ib_addr.h | 6 +-
+ kernel/sys.c | 1 +
+ kernel/sysctl_binary.c | 2 +-
+ net/802/garp.c | 4 +-
+ net/802/stp.c | 4 +-
+ net/8021q/vlan.c | 2 +-
+ net/8021q/vlan_dev.c | 4 +-
+ net/atm/lec.c | 2 +-
+ net/batman-adv/Makefile | 2 +-
+ net/batman-adv/aggregation.c | 293 -
+ net/batman-adv/aggregation.h | 46 -
+ net/batman-adv/bat_iv_ogm.c | 1170 ++++
+ net/batman-adv/bat_ogm.h | 35 +
+ net/batman-adv/bat_sysfs.c | 2 +
+ net/batman-adv/bitarray.c | 6 +-
+ net/batman-adv/gateway_client.c | 10 +-
+ net/batman-adv/hard-interface.c | 88 +-
+ net/batman-adv/hard-interface.h | 1 +
+ net/batman-adv/hash.h | 25 +-
+ net/batman-adv/main.c | 4 +-
+ net/batman-adv/main.h | 8 +-
+ net/batman-adv/originator.c | 21 +-
+ net/batman-adv/packet.h | 19 +-
+ net/batman-adv/routing.c | 669 +--
+ net/batman-adv/routing.h | 17 +-
+ net/batman-adv/send.c | 313 +-
+ net/batman-adv/send.h | 9 +-
+ net/batman-adv/soft-interface.c | 34 +-
+ net/batman-adv/translation-table.c | 199 +-
+ net/batman-adv/translation-table.h | 21 +-
+ net/batman-adv/types.h | 5 +-
+ net/batman-adv/unicast.c | 6 +-
+ net/batman-adv/unicast.h | 2 +-
+ net/batman-adv/vis.c | 10 +-
+ net/bluetooth/bnep/netdev.c | 2 +-
+ net/bluetooth/hci_conn.c | 2 +-
+ net/bluetooth/hci_core.c | 57 +-
+ net/bluetooth/hci_event.c | 16 +-
+ net/bluetooth/hci_sock.c | 18 +-
+ net/bluetooth/hci_sysfs.c | 2 +
+ net/bluetooth/hidp/core.c | 3 +
+ net/bluetooth/l2cap_core.c | 18 +-
+ net/bluetooth/mgmt.c | 212 +-
+ net/bluetooth/smp.c | 421 +-
+ net/bridge/br_device.c | 4 +-
+ net/bridge/br_fdb.c | 23 +-
+ net/bridge/br_if.c | 41 +-
+ net/bridge/br_input.c | 33 +-
+ net/bridge/br_private.h | 7 +
+ net/bridge/br_sysfs_br.c | 34 +
+ net/bridge/netfilter/ebtable_broute.c | 4 +-
+ net/caif/cfcnfg.c | 38 +-
+ net/caif/cfctrl.c | 23 +-
+ net/caif/cfdbgl.c | 7 +-
+ net/caif/cfdgml.c | 7 +-
+ net/caif/cffrml.c | 7 +-
+ net/caif/cfmuxl.c | 6 +-
+ net/caif/cfrfml.c | 7 +-
+ net/caif/cfserl.c | 7 +-
+ net/caif/cfsrvl.c | 8 +-
+ net/caif/cfutill.c | 7 +-
+ net/caif/cfveil.c | 7 +-
+ net/caif/cfvidl.c | 7 +-
+ net/can/Kconfig | 11 +
+ net/can/Makefile | 3 +
+ net/can/af_can.c | 4 +-
+ net/can/gw.c | 959 +++
+ net/core/datagram.c | 8 +-
+ net/core/dev.c | 163 +-
+ net/core/dev_addr_lists.c | 4 +-
+ net/core/dst.c | 15 +-
+ net/core/ethtool.c | 20 +-
+ net/core/fib_rules.c | 4 +-
+ net/core/filter.c | 2 +-
+ net/core/kmap_skb.h | 2 +-
+ net/core/link_watch.c | 9 +-
+ net/core/neighbour.c | 40 +-
+ net/core/net-sysfs.c | 12 +-
+ net/core/netpoll.c | 4 +-
+ net/core/pktgen.c | 3 +-
+ net/core/rtnetlink.c | 1 -
+ net/core/scm.c | 10 +-
+ net/core/skbuff.c | 31 +-
+ net/core/sock.c | 16 +-
+ net/core/user_dma.c | 2 +-
+ net/dccp/ccids/ccid2.c | 84 +-
+ net/dccp/ccids/ccid2.h | 6 +
+ net/dccp/dccp.h | 1 +
+ net/dccp/feat.c | 202 +-
+ net/dccp/feat.h | 1 +
+ net/dccp/proto.c | 1 -
+ net/decnet/dn_dev.c | 6 +-
+ net/dsa/slave.c | 3 -
+ net/ieee802154/6lowpan.c | 891 +++
+ net/ieee802154/6lowpan.h | 212 +
+ net/ieee802154/Kconfig | 6 +
+ net/ieee802154/Makefile | 8 +-
+ net/ipv4/devinet.c | 6 +-
+ net/ipv4/fib_trie.c | 12 +-
+ net/ipv4/gre.c | 4 +-
+ net/ipv4/igmp.c | 12 +-
+ net/ipv4/inet_lro.c | 2 +-
+ net/ipv4/ip_output.c | 7 +-
+ net/ipv4/ipip.c | 10 +-
+ net/ipv4/ipmr.c | 8 +-
+ net/ipv4/netfilter/nf_nat_amanda.c | 4 +-
+ net/ipv4/netfilter/nf_nat_core.c | 24 +-
+ net/ipv4/netfilter/nf_nat_ftp.c | 4 +-
+ net/ipv4/netfilter/nf_nat_h323.c | 36 +-
+ net/ipv4/netfilter/nf_nat_irc.c | 4 +-
+ net/ipv4/netfilter/nf_nat_pptp.c | 16 +-
+ net/ipv4/netfilter/nf_nat_sip.c | 28 +-
+ net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 +-
+ net/ipv4/netfilter/nf_nat_standalone.c | 6 +-
+ net/ipv4/netfilter/nf_nat_tftp.c | 4 +-
+ net/ipv4/route.c | 14 +-
+ net/ipv4/tcp.c | 56 +-
+ net/ipv4/tcp_input.c | 85 +-
+ net/ipv4/tcp_ipv4.c | 8 +-
+ net/ipv4/tcp_output.c | 72 +-
+ net/ipv4/udp.c | 11 +-
+ net/ipv6/addrconf.c | 81 +-
+ net/ipv6/exthdrs.c | 7 +-
+ net/ipv6/icmp.c | 25 +-
+ net/ipv6/inet6_connection_sock.c | 9 +-
+ net/ipv6/ip6_output.c | 7 +-
+ net/ipv6/ip6_tunnel.c | 54 +-
+ net/ipv6/ndisc.c | 31 +-
+ net/ipv6/raw.c | 8 +-
+ net/ipv6/sit.c | 12 +-
+ net/ipv6/tcp_ipv6.c | 8 +-
+ net/ipv6/udp.c | 4 +-
+ net/irda/irlan/irlan_eth.c | 2 +-
+ net/iucv/Kconfig | 14 +-
+ net/iucv/af_iucv.c | 868 +++-
+ net/iucv/iucv.c | 23 +
+ net/lapb/lapb_iface.c | 29 +-
+ net/mac80211/Kconfig | 13 +
+ net/mac80211/agg-rx.c | 23 +-
+ net/mac80211/agg-tx.c | 62 +-
+ net/mac80211/cfg.c | 99 +-
+ net/mac80211/debugfs.c | 71 +-
+ net/mac80211/debugfs_netdev.c | 59 +-
+ net/mac80211/driver-ops.h | 58 +-
+ net/mac80211/driver-trace.h | 40 +-
+ net/mac80211/ht.c | 6 +-
+ net/mac80211/ibss.c | 12 +-
+ net/mac80211/ieee80211_i.h | 73 +-
+ net/mac80211/iface.c | 22 +-
+ net/mac80211/main.c | 1 +
+ net/mac80211/mesh.c | 267 +-
+ net/mac80211/mesh.h | 42 +-
+ net/mac80211/mesh_hwmp.c | 168 +-
+ net/mac80211/mesh_pathtbl.c | 481 ++-
+ net/mac80211/mesh_plink.c | 251 +-
+ net/mac80211/mlme.c | 104 +-
+ net/mac80211/rate.c | 29 +-
+ net/mac80211/rc80211_minstrel_ht.c | 11 +-
+ net/mac80211/rx.c | 83 +-
+ net/mac80211/scan.c | 3 +-
+ net/mac80211/spectmgmt.c | 6 +-
+ net/mac80211/sta_info.c | 347 +-
+ net/mac80211/sta_info.h | 35 +-
+ net/mac80211/status.c | 60 +-
+ net/mac80211/tx.c | 60 +-
+ net/mac80211/util.c | 204 +-
+ net/mac80211/wme.c | 16 +-
+ net/mac80211/wme.h | 3 +-
+ net/mac80211/work.c | 8 +-
+ net/netfilter/core.c | 4 +-
+ net/netfilter/nf_conntrack_core.c | 12 +-
+ net/netfilter/nf_conntrack_ecache.c | 8 +-
+ net/netfilter/nf_conntrack_extend.c | 4 +-
+ net/netfilter/nf_conntrack_helper.c | 6 +-
+ net/netfilter/nf_conntrack_netlink.c | 6 +-
+ net/netfilter/nf_log.c | 10 +-
+ net/netfilter/nf_queue.c | 6 +-
+ net/netfilter/nfnetlink.c | 6 +-
+ net/netlabel/netlabel_domainhash.c | 6 +-
+ net/netlabel/netlabel_unlabeled.c | 6 +-
+ net/netlink/af_netlink.c | 7 +-
+ net/nfc/Kconfig | 2 +
+ net/nfc/Makefile | 1 +
+ net/nfc/core.c | 83 +-
+ net/nfc/nci/Kconfig | 10 +
+ net/nfc/nci/Makefile | 7 +
+ net/nfc/nci/core.c | 797 +++
+ net/nfc/nci/data.c | 247 +
+ net/nfc/nci/lib.c | 94 +
+ net/nfc/nci/ntf.c | 258 +
+ net/nfc/nci/rsp.c | 226 +
+ net/nfc/netlink.c | 56 +
+ net/nfc/nfc.h | 6 +-
+ net/nfc/rawsock.c | 13 +-
+ net/packet/af_packet.c | 946 +++-
+ net/phonet/af_phonet.c | 4 +-
+ net/phonet/pn_dev.c | 6 +-
+ net/phonet/socket.c | 6 +-
+ net/rds/Kconfig | 1 +
+ net/rds/ib_rdma.c | 112 +-
+ net/rds/xlist.h | 80 -
+ net/rfkill/core.c | 2 +-
+ net/rfkill/rfkill-regulator.c | 1 -
+ net/sched/sch_sfb.c | 13 +-
+ net/sctp/associola.c | 1 +
+ net/sctp/outqueue.c | 4 +
+ net/sctp/sm_make_chunk.c | 1 +
+ net/sctp/sm_statefuns.c | 5 +
+ net/socket.c | 4 +-
+ net/sunrpc/auth_gss/auth_gss.c | 4 +-
+ net/tipc/bcast.c | 111 +-
+ net/tipc/bcast.h | 1 -
+ net/tipc/bearer.c | 8 +-
+ net/tipc/bearer.h | 4 +-
+ net/tipc/config.h | 1 -
+ net/tipc/discover.c | 6 -
+ net/tipc/eth_media.c | 32 +-
+ net/tipc/link.c | 111 +-
+ net/tipc/link.h | 1 +
+ net/tipc/name_distr.c | 35 +-
+ net/tipc/net.c | 11 -
+ net/tipc/node.c | 45 +-
+ net/tipc/node.h | 10 +-
+ net/tipc/socket.c | 51 +-
+ net/tipc/subscr.c | 3 +-
+ net/tipc/subscr.h | 6 -
+ net/unix/af_unix.c | 24 +-
+ net/wireless/core.c | 2 +-
+ net/wireless/core.h | 6 +-
+ net/wireless/lib80211.c | 15 +-
+ net/wireless/lib80211_crypt_ccmp.c | 2 -
+ net/wireless/lib80211_crypt_tkip.c | 4 -
+ net/wireless/lib80211_crypt_wep.c | 4 -
+ net/wireless/mesh.c | 3 +
+ net/wireless/mlme.c | 16 +-
+ net/wireless/nl80211.c | 294 +-
+ net/wireless/nl80211.h | 4 +
+ net/wireless/reg.c | 47 +-
+ net/wireless/reg.h | 2 +
+ net/wireless/scan.c | 28 +
+ net/wireless/sme.c | 19 +-
+ net/wireless/util.c | 189 +-
+ net/wireless/wext-compat.c | 137 +-
+ net/wireless/wext-compat.h | 8 +
+ net/wireless/wext-sme.c | 3 +-
+ net/xfrm/xfrm_ipcomp.c | 11 +-
+ net/xfrm/xfrm_user.c | 4 +-
+ virt/kvm/assigned-dev.c | 2 +
+ virt/kvm/iommu.c | 4 +
+ 1918 files changed, 88676 insertions(+), 97784 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt
+ create mode 100644 arch/mips/bcm47xx/Kconfig
+ create mode 100644 drivers/bcma/driver_mips.c
+ create mode 100644 drivers/bcma/host_soc.c
+ rename drivers/net/{pcmcia => arcnet}/com20020_cs.c (100%)
+ delete mode 100644 drivers/net/arm/Kconfig
+ delete mode 100644 drivers/net/arm/Makefile
+ delete mode 100644 drivers/net/benet/Kconfig
+ delete mode 100644 drivers/net/bna/bfa_ioc_ct.c
+ delete mode 100644 drivers/net/bna/bfi_ctreg.h
+ delete mode 100644 drivers/net/bna/bfi_ll.h
+ delete mode 100644 drivers/net/bna/bna_ctrl.c
+ delete mode 100644 drivers/net/bna/bna_hw.h
+ delete mode 100644 drivers/net/bna/bna_txrx.c
+ create mode 100644 drivers/net/can/sja1000/ems_pcmcia.c
+ create mode 100644 drivers/net/can/sja1000/peak_pci.c
+ rename drivers/net/{ => ethernet/3com}/3c501.c (99%)
+ rename drivers/net/{ => ethernet/3com}/3c501.h (100%)
+ rename drivers/net/{ => ethernet/3com}/3c509.c (99%)
+ rename drivers/net/{ => ethernet/3com}/3c515.c (99%)
+ rename drivers/net/{pcmcia => ethernet/3com}/3c574_cs.c (99%)
+ rename drivers/net/{pcmcia => ethernet/3com}/3c589_cs.c (99%)
+ rename drivers/net/{ => ethernet/3com}/3c59x.c (99%)
+ create mode 100644 drivers/net/ethernet/3com/Kconfig
+ create mode 100644 drivers/net/ethernet/3com/Makefile
+ rename drivers/net/{ => ethernet/3com}/typhoon.c (99%)
+ rename drivers/net/{ => ethernet/3com}/typhoon.h (100%)
+ rename drivers/net/{ => ethernet/8390}/3c503.c (99%)
+ rename drivers/net/{ => ethernet/8390}/3c503.h (100%)
+ rename drivers/net/{ => ethernet/8390}/8390.c (97%)
+ rename drivers/net/{ => ethernet/8390}/8390.h (100%)
+ rename drivers/net/{ => ethernet/8390}/8390p.c (97%)
+ create mode 100644 drivers/net/ethernet/8390/Kconfig
+ create mode 100644 drivers/net/ethernet/8390/Makefile
+ rename drivers/net/{ => ethernet/8390}/ac3200.c (99%)
+ rename drivers/net/{ => ethernet/8390}/apne.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ax88796.c (99%)
+ rename drivers/net/{pcmcia => ethernet/8390}/axnet_cs.c (99%)
+ rename drivers/net/{ => ethernet/8390}/e2100.c (99%)
+ rename drivers/net/{ => ethernet/8390}/es3210.c (100%)
+ rename drivers/net/{arm => ethernet/8390}/etherh.c (99%)
+ rename drivers/net/{ => ethernet/8390}/hp-plus.c (99%)
+ rename drivers/net/{ => ethernet/8390}/hp.c (100%)
+ rename drivers/net/{ => ethernet/8390}/hydra.c (99%)
+ rename drivers/net/{ => ethernet/8390}/lib8390.c (100%)
+ rename drivers/net/{ => ethernet/8390}/lne390.c (100%)
+ rename drivers/net/{ => ethernet/8390}/mac8390.c (99%)
+ rename drivers/net/{ => ethernet/8390}/ne-h8300.c (99%)
+ rename drivers/net/{ => ethernet/8390}/ne.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ne2.c (100%)
+ rename drivers/net/{ => ethernet/8390}/ne2k-pci.c (99%)
+ rename drivers/net/{ => ethernet/8390}/ne3210.c (100%)
+ rename drivers/net/{pcmcia => ethernet/8390}/pcnet_cs.c (99%)
+ rename drivers/net/{ => ethernet/8390}/smc-mca.c (99%)
+ rename drivers/net/{ => ethernet/8390}/smc-ultra.c (99%)
+ rename drivers/net/{ => ethernet/8390}/smc-ultra32.c (99%)
+ rename drivers/net/{ => ethernet/8390}/stnic.c (100%)
+ rename drivers/net/{ => ethernet/8390}/wd.c (99%)
+ rename drivers/net/{ => ethernet/8390}/zorro8390.c (99%)
+ create mode 100644 drivers/net/ethernet/Kconfig
+ create mode 100644 drivers/net/ethernet/Makefile
+ create mode 100644 drivers/net/ethernet/adaptec/Kconfig
+ create mode 100644 drivers/net/ethernet/adaptec/Makefile
+ rename drivers/net/{ => ethernet/adaptec}/starfire.c (99%)
+ create mode 100644 drivers/net/ethernet/adi/Kconfig
+ create mode 100644 drivers/net/ethernet/adi/Makefile
+ rename drivers/net/{ => ethernet/adi}/bfin_mac.c (99%)
+ rename drivers/net/{ => ethernet/adi}/bfin_mac.h (100%)
+ create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
+ create mode 100644 drivers/net/ethernet/aeroflex/Makefile
+ rename drivers/net/{ => ethernet/aeroflex}/greth.c (99%)
+ rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
+ create mode 100644 drivers/net/ethernet/alteon/Kconfig
+ create mode 100644 drivers/net/ethernet/alteon/Makefile
+ rename drivers/net/{ => ethernet/alteon}/acenic.c (99%)
+ rename drivers/net/{ => ethernet/alteon}/acenic.h (100%)
+ rename drivers/net/{ => ethernet/amd}/7990.c (100%)
+ rename drivers/net/{ => ethernet/amd}/7990.h (100%)
+ create mode 100644 drivers/net/ethernet/amd/Kconfig
+ create mode 100644 drivers/net/ethernet/amd/Makefile
+ rename drivers/net/{ => ethernet/amd}/a2065.c (99%)
+ rename drivers/net/{ => ethernet/amd}/a2065.h (100%)
+ rename drivers/net/{arm => ethernet/amd}/am79c961a.c (99%)
+ rename drivers/net/{arm => ethernet/amd}/am79c961a.h (100%)
+ rename drivers/net/{ => ethernet/amd}/amd8111e.c (99%)
+ rename drivers/net/{ => ethernet/amd}/amd8111e.h (100%)
+ rename drivers/net/{ => ethernet/amd}/ariadne.c (99%)
+ rename drivers/net/{ => ethernet/amd}/ariadne.h (100%)
+ rename drivers/net/{ => ethernet/amd}/atarilance.c (99%)
+ rename drivers/net/{ => ethernet/amd}/au1000_eth.c (99%)
+ rename drivers/net/{ => ethernet/amd}/au1000_eth.h (100%)
+ rename drivers/net/{ => ethernet/amd}/declance.c (99%)
+ rename drivers/net/{ => ethernet/amd}/depca.c (99%)
+ rename drivers/net/{ => ethernet/amd}/depca.h (99%)
+ rename drivers/net/{ => ethernet/amd}/hplance.c (99%)
+ rename drivers/net/{ => ethernet/amd}/hplance.h (100%)
+ rename drivers/net/{ => ethernet/amd}/lance.c (99%)
+ rename drivers/net/{ => ethernet/amd}/mvme147.c (99%)
+ rename drivers/net/{ => ethernet/amd}/ni65.c (99%)
+ rename drivers/net/{ => ethernet/amd}/ni65.h (100%)
+ rename drivers/net/{pcmcia => ethernet/amd}/nmclan_cs.c (99%)
+ rename drivers/net/{ => ethernet/amd}/pcnet32.c (94%)
+ rename drivers/net/{ => ethernet/amd}/sun3lance.c (99%)
+ rename drivers/net/{ => ethernet/amd}/sunlance.c (99%)
+ create mode 100644 drivers/net/ethernet/apple/Kconfig
+ create mode 100644 drivers/net/ethernet/apple/Makefile
+ rename drivers/net/{ => ethernet/apple}/bmac.c (99%)
+ rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
+ rename drivers/net/{ => ethernet/apple}/cs89x0.c (99%)
+ rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
+ rename drivers/net/{ => ethernet/apple}/mac89x0.c (99%)
+ rename drivers/net/{ => ethernet/apple}/mace.c (99%)
+ rename drivers/net/{ => ethernet/apple}/mace.h (100%)
+ rename drivers/net/{ => ethernet/apple}/macmace.c (98%)
+ create mode 100644 drivers/net/ethernet/atheros/Kconfig
+ create mode 100644 drivers/net/ethernet/atheros/Makefile
+ rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (99%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (99%)
+ rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (99%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (99%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
+ rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
+ create mode 100644 drivers/net/ethernet/broadcom/Kconfig
+ create mode 100644 drivers/net/ethernet/broadcom/Makefile
+ rename drivers/net/{ => ethernet/broadcom}/b44.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/b44.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2_fw.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h (98%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c (98%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h (99%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c (98%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_fw_file_hdr.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h (99%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.c (98%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_sp.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c (98%)
+ rename drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic.h (99%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic_defs.h (99%)
+ rename drivers/net/{ => ethernet/broadcom}/cnic_if.h (100%)
+ rename drivers/net/{ => ethernet/broadcom}/sb1250-mac.c (99%)
+ rename drivers/net/{ => ethernet/broadcom}/tg3.c (98%)
+ rename drivers/net/{ => ethernet/broadcom}/tg3.h (99%)
+ create mode 100644 drivers/net/ethernet/brocade/Kconfig
+ create mode 100644 drivers/net/ethernet/brocade/Makefile
+ create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
+ rename drivers/net/{ => ethernet/brocade}/bna/Makefile (52%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (97%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (81%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (94%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (73%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (85%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (84%)
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.c
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfa_msgq.h
+ rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (65%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfi_enet.h
+ create mode 100644 drivers/net/ethernet/brocade/bna/bfi_reg.h
+ rename drivers/net/{ => ethernet/brocade}/bna/bna.h (66%)
+ create mode 100644 drivers/net/ethernet/brocade/bna/bna_enet.c
+ create mode 100644 drivers/net/ethernet/brocade/bna/bna_hw_defs.h
+ create mode 100644 drivers/net/ethernet/brocade/bna/bna_tx_rx.c
+ rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (58%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (76%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (74%)
+ rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (66%)
+ rename drivers/net/{ => ethernet/brocade}/bna/cna.h (62%)
+ rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (53%)
+ create mode 100644 drivers/net/ethernet/cadence/Kconfig
+ create mode 100644 drivers/net/ethernet/cadence/Makefile
+ rename drivers/net/{arm => ethernet/cadence}/at91_ether.c (99%)
+ rename drivers/net/{arm => ethernet/cadence}/at91_ether.h (100%)
+ rename drivers/net/{ => ethernet/cadence}/macb.c (99%)
+ rename drivers/net/{ => ethernet/cadence}/macb.h (100%)
+ create mode 100644 drivers/net/ethernet/chelsio/Kconfig
+ create mode 100644 drivers/net/ethernet/chelsio/Makefile
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/Makefile (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/common.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cphy.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c (99%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/elmer0.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/espi.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/gmac.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/my3126.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/pm3393.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/regs.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.c (99%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/sge.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/subr.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/suni1x10gexp_regs.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/tp.h (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326.c (100%)
+ rename drivers/net/{chelsio => ethernet/chelsio/cxgb}/vsc7326_reg.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/common.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c (99%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/firmware_exports.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c (99%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/sge_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/version.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c (99%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/Makefile (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/adapter.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c (99%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h (100%)
+ rename drivers/net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c (100%)
+ create mode 100644 drivers/net/ethernet/cirrus/Kconfig
+ create mode 100644 drivers/net/ethernet/cirrus/Makefile
+ rename drivers/net/{arm => ethernet/cirrus}/ep93xx_eth.c (100%)
+ create mode 100644 drivers/net/ethernet/cisco/Kconfig
+ create mode 100644 drivers/net/ethernet/cisco/Makefile
+ create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
+ rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic.h (90%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (78%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (94%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (52%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (68%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (97%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (97%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
+ rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
+ create mode 100644 drivers/net/ethernet/davicom/Kconfig
+ create mode 100644 drivers/net/ethernet/davicom/Makefile
+ rename drivers/net/{ => ethernet/davicom}/dm9000.c (99%)
+ rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
+ create mode 100644 drivers/net/ethernet/dec/Kconfig
+ create mode 100644 drivers/net/ethernet/dec/Makefile
+ rename drivers/net/{ => ethernet/dec}/ewrk3.c (99%)
+ rename drivers/net/{ => ethernet/dec}/ewrk3.h (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/21142.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/Kconfig (96%)
+ rename drivers/net/{ => ethernet/dec}/tulip/Makefile (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/de2104x.c (99%)
+ rename drivers/net/{ => ethernet/dec}/tulip/de4x5.c (99%)
+ rename drivers/net/{ => ethernet/dec}/tulip/de4x5.h (99%)
+ rename drivers/net/{ => ethernet/dec}/tulip/dmfe.c (99%)
+ rename drivers/net/{ => ethernet/dec}/tulip/eeprom.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/interrupt.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/media.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/pnic.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/pnic2.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/timer.c (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/tulip.h (100%)
+ rename drivers/net/{ => ethernet/dec}/tulip/tulip_core.c (99%)
+ rename drivers/net/{ => ethernet/dec}/tulip/uli526x.c (99%)
+ rename drivers/net/{ => ethernet/dec}/tulip/winbond-840.c (99%)
+ rename drivers/net/{ => ethernet/dec}/tulip/xircom_cb.c (100%)
+ create mode 100644 drivers/net/ethernet/dlink/Kconfig
+ create mode 100644 drivers/net/ethernet/dlink/Makefile
+ rename drivers/net/{ => ethernet/dlink}/de600.c (100%)
+ rename drivers/net/{ => ethernet/dlink}/de600.h (100%)
+ rename drivers/net/{ => ethernet/dlink}/de620.c (99%)
+ rename drivers/net/{ => ethernet/dlink}/de620.h (100%)
+ rename drivers/net/{ => ethernet/dlink}/dl2k.c (95%)
+ rename drivers/net/{ => ethernet/dlink}/dl2k.h (81%)
+ rename drivers/net/{ => ethernet/dlink}/sundance.c (99%)
+ rename drivers/net/{ => ethernet}/dnet.c (100%)
+ rename drivers/net/{ => ethernet}/dnet.h (100%)
+ create mode 100644 drivers/net/ethernet/emulex/Kconfig
+ create mode 100644 drivers/net/ethernet/emulex/Makefile
+ create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig
+ rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be.h (84%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (93%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (95%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (84%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (94%)
+ rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (90%)
+ rename drivers/net/{ => ethernet}/ethoc.c (99%)
+ create mode 100644 drivers/net/ethernet/faraday/Kconfig
+ create mode 100644 drivers/net/ethernet/faraday/Makefile
+ rename drivers/net/{ => ethernet/faraday}/ftgmac100.c (100%)
+ rename drivers/net/{ => ethernet/faraday}/ftgmac100.h (100%)
+ rename drivers/net/{ => ethernet/faraday}/ftmac100.c (100%)
+ rename drivers/net/{ => ethernet/faraday}/ftmac100.h (100%)
+ rename drivers/net/{ => ethernet}/fealnx.c (99%)
+ create mode 100644 drivers/net/ethernet/freescale/Kconfig
+ create mode 100644 drivers/net/ethernet/freescale/Makefile
+ rename drivers/net/{ => ethernet/freescale}/fec.c (93%)
+ rename drivers/net/{ => ethernet/freescale}/fec.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.c (99%)
+ rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fec_mpc52xx_phy.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (89%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (99%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar.c (99%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (99%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
+ rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (99%)
+ rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
+ rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
+ create mode 100644 drivers/net/ethernet/fujitsu/Kconfig
+ create mode 100644 drivers/net/ethernet/fujitsu/Makefile
+ rename drivers/net/{ => ethernet/fujitsu}/at1700.c (99%)
+ rename drivers/net/{ => ethernet/fujitsu}/eth16i.c (99%)
+ rename drivers/net/{pcmcia => ethernet/fujitsu}/fmvj18x_cs.c (99%)
+ create mode 100644 drivers/net/ethernet/hp/Kconfig
+ create mode 100644 drivers/net/ethernet/hp/Makefile
+ rename drivers/net/{ => ethernet/hp}/hp100.c (99%)
+ rename drivers/net/{ => ethernet/hp}/hp100.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c505.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/3c505.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c507.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c523.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/3c523.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/3c527.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/3c527.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/82596.c (99%)
+ create mode 100644 drivers/net/ethernet/i825xx/Kconfig
+ create mode 100644 drivers/net/ethernet/i825xx/Makefile
+ rename drivers/net/{ => ethernet/i825xx}/eepro.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/eexpress.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/eexpress.h (100%)
+ rename drivers/net/{arm => ethernet/i825xx}/ether1.c (99%)
+ rename drivers/net/{arm => ethernet/i825xx}/ether1.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/lasi_82596.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/lib82596.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/lp486e.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/ni52.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/ni52.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/sni_82596.c (100%)
+ rename drivers/net/{ => ethernet/i825xx}/sun3_82586.c (99%)
+ rename drivers/net/{ => ethernet/i825xx}/sun3_82586.h (100%)
+ rename drivers/net/{ => ethernet/i825xx}/znet.c (99%)
+ create mode 100644 drivers/net/ethernet/ibm/Kconfig
+ create mode 100644 drivers/net/ethernet/ibm/Makefile
+ rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (99%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (99%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
+ rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/Kconfig (63%)
+ create mode 100644 drivers/net/ethernet/ibm/emac/Makefile
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.c (99%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/core.h (97%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/debug.h (98%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/emac.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.c (99%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/mal.h (99%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/phy.h (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/rgmii.h (96%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/tah.h (97%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.c (100%)
+ rename drivers/net/{ibm_newemac => ethernet/ibm/emac}/zmii.h (96%)
+ rename drivers/net/{ => ethernet/ibm}/ibmveth.c (99%)
+ rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
+ rename drivers/net/{ => ethernet/ibm}/iseries_veth.c (99%)
+ create mode 100644 drivers/net/ethernet/icplus/Kconfig
+ create mode 100644 drivers/net/ethernet/icplus/Makefile
+ rename drivers/net/{ => ethernet/icplus}/ipg.c (92%)
+ rename drivers/net/{ => ethernet/icplus}/ipg.h (100%)
+ create mode 100644 drivers/net/ethernet/intel/Kconfig
+ create mode 100644 drivers/net/ethernet/intel/Makefile
+ rename drivers/net/{ => ethernet/intel}/e100.c (99%)
+ rename drivers/net/{ => ethernet/intel}/e1000/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000.h (99%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_main.c (99%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_osdep.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000/e1000_param.c (100%)
+ rename drivers/net/{e1000e/es2lan.c => ethernet/intel/e1000e/80003es2lan.c} (99%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/82571.c (98%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/Makefile (96%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/e1000.h (97%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/ethtool.c (96%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/hw.h (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c (99%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/lib.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/netdev.c (96%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/param.c (100%)
+ rename drivers/net/{ => ethernet/intel}/e1000e/phy.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_82575.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_hw.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.c (99%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mac.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.c (99%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_phy.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/e1000_regs.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igb/igb.h (87%)
+ rename drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c (99%)
+ rename drivers/net/{ => ethernet/intel}/igb/igb_main.c (95%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/ethtool.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/igbvf.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/netdev.c (99%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/regs.h (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/vf.c (100%)
+ rename drivers/net/{ => ethernet/intel}/igbvf/vf.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb.h (98%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c (99%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c (90%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c (99%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h (99%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h (98%)
+ rename drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h (92%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c (95%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.c (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_common.h (99%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c (84%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h (95%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c (88%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h (98%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c (90%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c (94%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c (98%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_main.c (86%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c (98%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c (78%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h (90%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_type.h (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c (91%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/Makefile (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/defines.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c (94%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h (98%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf_main.c (97%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/regs.h (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.c (100%)
+ rename drivers/net/{ => ethernet/intel}/ixgbevf/vf.h (100%)
+ rename drivers/net/{ => ethernet}/jme.c (99%)
+ rename drivers/net/{ => ethernet}/jme.h (99%)
+ rename drivers/net/{ => ethernet}/korina.c (99%)
+ rename drivers/net/{ => ethernet}/lantiq_etop.c (99%)
+ create mode 100644 drivers/net/ethernet/marvell/Kconfig
+ create mode 100644 drivers/net/ethernet/marvell/Makefile
+ rename drivers/net/{ => ethernet/marvell}/mv643xx_eth.c (99%)
+ rename drivers/net/{ => ethernet/marvell}/pxa168_eth.c (100%)
+ rename drivers/net/{ => ethernet/marvell}/skge.c (98%)
+ rename drivers/net/{ => ethernet/marvell}/skge.h (100%)
+ rename drivers/net/{ => ethernet/marvell}/sky2.c (98%)
+ rename drivers/net/{ => ethernet/marvell}/sky2.h (100%)
+ create mode 100644 drivers/net/ethernet/mellanox/Kconfig
+ create mode 100644 drivers/net/ethernet/mellanox/Makefile
+ create mode 100644 drivers/net/ethernet/mellanox/mlx4/Kconfig
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/Makefile (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/alloc.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/catas.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/cmd.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/cq.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_cq.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_main.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_netdev.c (99%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_port.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_resources.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_rx.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_selftest.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/en_tx.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/eq.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/fw.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/icm.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/intf.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/main.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mcg.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mlx4_en.h (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/mr.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/pd.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/port.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/profile.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/qp.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/reset.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/sense.c (100%)
+ rename drivers/net/{ => ethernet/mellanox}/mlx4/srq.c (100%)
+ create mode 100644 drivers/net/ethernet/micrel/Kconfig
+ create mode 100644 drivers/net/ethernet/micrel/Makefile
+ rename drivers/net/{arm => ethernet/micrel}/ks8695net.c (99%)
+ rename drivers/net/{arm => ethernet/micrel}/ks8695net.h (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
+ rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
+ rename drivers/net/{ => ethernet/micrel}/ksz884x.c (99%)
+ create mode 100644 drivers/net/ethernet/microchip/Kconfig
+ create mode 100644 drivers/net/ethernet/microchip/Makefile
+ rename drivers/net/{ => ethernet/microchip}/enc28j60.c (99%)
+ rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%)
+ rename drivers/net/{ => ethernet}/mipsnet.c (99%)
+ create mode 100644 drivers/net/ethernet/myricom/Kconfig
+ create mode 100644 drivers/net/ethernet/myricom/Makefile
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (99%)
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
+ rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
+ create mode 100644 drivers/net/ethernet/natsemi/Kconfig
+ create mode 100644 drivers/net/ethernet/natsemi/Makefile
+ rename drivers/net/{ => ethernet/natsemi}/ibmlana.c (99%)
+ rename drivers/net/{ => ethernet/natsemi}/ibmlana.h (100%)
+ rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (99%)
+ rename drivers/net/{ => ethernet/natsemi}/macsonic.c (98%)
+ rename drivers/net/{ => ethernet/natsemi}/natsemi.c (99%)
+ rename drivers/net/{ => ethernet/natsemi}/ns83820.c (99%)
+ rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
+ rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
+ rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (99%)
+ create mode 100644 drivers/net/ethernet/neterion/Kconfig
+ create mode 100644 drivers/net/ethernet/neterion/Makefile
+ rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/s2io.c (99%)
+ rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (99%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (99%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (99%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (99%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
+ rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
+ rename drivers/net/{ => ethernet}/netx-eth.c (99%)
+ create mode 100644 drivers/net/ethernet/nuvoton/Kconfig
+ create mode 100644 drivers/net/ethernet/nuvoton/Makefile
+ rename drivers/net/{arm => ethernet/nuvoton}/w90p910_ether.c (99%)
+ create mode 100644 drivers/net/ethernet/nvidia/Kconfig
+ create mode 100644 drivers/net/ethernet/nvidia/Makefile
+ rename drivers/net/{ => ethernet/nvidia}/forcedeth.c (99%)
+ rename drivers/net/{ => ethernet}/octeon/Kconfig (85%)
+ create mode 100644 drivers/net/ethernet/octeon/Makefile
+ rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (99%)
+ create mode 100644 drivers/net/ethernet/oki-semi/Kconfig
+ create mode 100644 drivers/net/ethernet/oki-semi/Makefile
+ create mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (99%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%)
+ rename drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%)
+ create mode 100644 drivers/net/ethernet/packetengines/Kconfig
+ create mode 100644 drivers/net/ethernet/packetengines/Makefile
+ rename drivers/net/{ => ethernet/packetengines}/hamachi.c (99%)
+ rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (99%)
+ create mode 100644 drivers/net/ethernet/pasemi/Kconfig
+ create mode 100644 drivers/net/ethernet/pasemi/Makefile
+ rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (99%)
+ rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%)
+ rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%)
+ create mode 100644 drivers/net/ethernet/qlogic/Kconfig
+ create mode 100644 drivers/net/ethernet/qlogic/Makefile
+ rename drivers/net/{ => ethernet/qlogic}/netxen/Makefile (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic.h (99%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_hw.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_init.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/netxen/netxen_nic_main.c (94%)
+ rename drivers/net/{ => ethernet/qlogic}/qla3xxx.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qla3xxx.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h (98%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c (82%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c (96%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c (98%)
+ rename drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c (95%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/Makefile (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge.h (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c (99%)
+ rename drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c (100%)
+ create mode 100644 drivers/net/ethernet/racal/Kconfig
+ create mode 100644 drivers/net/ethernet/racal/Makefile
+ rename drivers/net/{ => ethernet/racal}/ni5010.c (99%)
+ rename drivers/net/{ => ethernet/racal}/ni5010.h (100%)
+ create mode 100644 drivers/net/ethernet/rdc/Kconfig
+ create mode 100644 drivers/net/ethernet/rdc/Makefile
+ rename drivers/net/{ => ethernet/rdc}/r6040.c (99%)
+ rename drivers/net/{ => ethernet/realtek}/8139cp.c (99%)
+ rename drivers/net/{ => ethernet/realtek}/8139too.c (99%)
+ create mode 100644 drivers/net/ethernet/realtek/Kconfig
+ create mode 100644 drivers/net/ethernet/realtek/Makefile
+ rename drivers/net/{ => ethernet/realtek}/atp.c (99%)
+ rename drivers/net/{ => ethernet/realtek}/atp.h (100%)
+ rename drivers/net/{ => ethernet/realtek}/r8169.c (91%)
+ rename drivers/net/{ => ethernet/realtek}/sc92031.c (98%)
+ create mode 100644 drivers/net/ethernet/renesas/Kconfig
+ create mode 100644 drivers/net/ethernet/renesas/Makefile
+ rename drivers/net/{ => ethernet/renesas}/sh_eth.c (98%)
+ rename drivers/net/{ => ethernet/renesas}/sh_eth.h (97%)
+ rename drivers/net/{ => ethernet}/s6gmac.c (100%)
+ create mode 100644 drivers/net/ethernet/seeq/Kconfig
+ create mode 100644 drivers/net/ethernet/seeq/Makefile
+ rename drivers/net/{arm => ethernet/seeq}/ether3.c (99%)
+ rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
+ rename drivers/net/{ => ethernet/seeq}/seeq8005.c (99%)
+ rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
+ rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (99%)
+ rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/Kconfig (96%)
+ rename drivers/net/{ => ethernet}/sfc/Makefile (100%)
+ rename drivers/net/{ => ethernet}/sfc/bitfield.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/efx.c (98%)
+ rename drivers/net/{ => ethernet}/sfc/efx.h (95%)
+ rename drivers/net/{ => ethernet}/sfc/enum.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/ethtool.c (91%)
+ rename drivers/net/{ => ethernet}/sfc/falcon.c (99%)
+ rename drivers/net/{ => ethernet}/sfc/falcon_boards.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/falcon_xmac.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/filter.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/filter.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/io.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mac.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi_mac.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi_pcol.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mcdi_phy.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mdio_10g.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/mdio_10g.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/mtd.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/net_driver.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/nic.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/nic.h (99%)
+ rename drivers/net/{ => ethernet}/sfc/phy.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/qt202x_phy.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/regs.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/rx.c (99%)
+ rename drivers/net/{ => ethernet}/sfc/selftest.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/selftest.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/siena.c (99%)
+ rename drivers/net/{ => ethernet}/sfc/spi.h (100%)
+ rename drivers/net/{ => ethernet}/sfc/tenxpress.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/tx.c (99%)
+ rename drivers/net/{ => ethernet}/sfc/txc43128_phy.c (100%)
+ rename drivers/net/{ => ethernet}/sfc/workarounds.h (100%)
+ create mode 100644 drivers/net/ethernet/sgi/Kconfig
+ create mode 100644 drivers/net/ethernet/sgi/Makefile
+ rename drivers/net/{ => ethernet/sgi}/ioc3-eth.c (99%)
+ rename drivers/net/{ => ethernet/sgi}/meth.c (100%)
+ rename drivers/net/{ => ethernet/sgi}/meth.h (100%)
+ create mode 100644 drivers/net/ethernet/sis/Kconfig
+ create mode 100644 drivers/net/ethernet/sis/Makefile
+ rename drivers/net/{ => ethernet/sis}/sis190.c (99%)
+ rename drivers/net/{ => ethernet/sis}/sis900.c (99%)
+ rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
+ create mode 100644 drivers/net/ethernet/smsc/Kconfig
+ create mode 100644 drivers/net/ethernet/smsc/Makefile
+ rename drivers/net/{ => ethernet/smsc}/epic100.c (99%)
+ rename drivers/net/{ => ethernet/smsc}/smc911x.c (99%)
+ rename drivers/net/{ => ethernet/smsc}/smc911x.h (100%)
+ rename drivers/net/{ => ethernet/smsc}/smc9194.c (99%)
+ rename drivers/net/{ => ethernet/smsc}/smc9194.h (100%)
+ rename drivers/net/{pcmcia => ethernet/smsc}/smc91c92_cs.c (99%)
+ rename drivers/net/{ => ethernet/smsc}/smc91x.c (99%)
+ rename drivers/net/{ => ethernet/smsc}/smc91x.h (100%)
+ rename drivers/net/{ => ethernet/smsc}/smsc911x.c (96%)
+ rename drivers/net/{ => ethernet/smsc}/smsc911x.h (100%)
+ rename drivers/net/{ => ethernet/smsc}/smsc9420.c (99%)
+ rename drivers/net/{ => ethernet/smsc}/smsc9420.h (100%)
+ create mode 100644 drivers/net/ethernet/stmicro/Kconfig
+ create mode 100644 drivers/net/ethernet/stmicro/Makefile
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (80%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (68%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (89%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (96%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (95%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (91%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (98%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/mmc.h
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (95%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (66%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (84%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
+ rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
+ create mode 100644 drivers/net/ethernet/sun/Kconfig
+ create mode 100644 drivers/net/ethernet/sun/Makefile
+ rename drivers/net/{ => ethernet/sun}/cassini.c (99%)
+ rename drivers/net/{ => ethernet/sun}/cassini.h (100%)
+ rename drivers/net/{ => ethernet/sun}/niu.c (99%)
+ rename drivers/net/{ => ethernet/sun}/niu.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunbmac.c (97%)
+ rename drivers/net/{ => ethernet/sun}/sunbmac.h (95%)
+ rename drivers/net/{ => ethernet/sun}/sungem.c (99%)
+ rename drivers/net/{ => ethernet/sun}/sungem.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunhme.c (99%)
+ rename drivers/net/{ => ethernet/sun}/sunhme.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunqe.c (99%)
+ rename drivers/net/{ => ethernet/sun}/sunqe.h (100%)
+ rename drivers/net/{ => ethernet/sun}/sunvnet.c (99%)
+ rename drivers/net/{ => ethernet/sun}/sunvnet.h (100%)
+ create mode 100644 drivers/net/ethernet/tehuti/Kconfig
+ create mode 100644 drivers/net/ethernet/tehuti/Makefile
+ rename drivers/net/{ => ethernet/tehuti}/tehuti.c (99%)
+ rename drivers/net/{ => ethernet/tehuti}/tehuti.h (100%)
+ create mode 100644 drivers/net/ethernet/ti/Kconfig
+ create mode 100644 drivers/net/ethernet/ti/Makefile
+ rename drivers/net/{ => ethernet/ti}/cpmac.c (99%)
+ rename drivers/net/{ => ethernet/ti}/davinci_cpdma.c (100%)
+ rename drivers/net/{ => ethernet/ti}/davinci_cpdma.h (100%)
+ rename drivers/net/{ => ethernet/ti}/davinci_emac.c (99%)
+ rename drivers/net/{ => ethernet/ti}/davinci_mdio.c (100%)
+ rename drivers/net/{ => ethernet/ti}/tlan.c (99%)
+ rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
+ create mode 100644 drivers/net/ethernet/tile/Kconfig
+ rename drivers/net/{ => ethernet}/tile/Makefile (100%)
+ rename drivers/net/{ => ethernet}/tile/tilepro.c (100%)
+ create mode 100644 drivers/net/ethernet/toshiba/Kconfig
+ create mode 100644 drivers/net/ethernet/toshiba/Makefile
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.c (99%)
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_net.h (100%)
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.c (99%)
+ rename drivers/net/{ => ethernet/toshiba}/ps3_gelic_wireless.h (100%)
+ rename drivers/net/{ => ethernet/toshiba}/spider_net.c (99%)
+ rename drivers/net/{ => ethernet/toshiba}/spider_net.h (99%)
+ rename drivers/net/{ => ethernet/toshiba}/spider_net_ethtool.c (100%)
+ rename drivers/net/{ => ethernet/toshiba}/tc35815.c (99%)
+ create mode 100644 drivers/net/ethernet/tundra/Kconfig
+ create mode 100644 drivers/net/ethernet/tundra/Makefile
+ rename drivers/net/{ => ethernet/tundra}/tsi108_eth.c (99%)
+ rename drivers/net/{ => ethernet/tundra}/tsi108_eth.h (100%)
+ create mode 100644 drivers/net/ethernet/via/Kconfig
+ create mode 100644 drivers/net/ethernet/via/Makefile
+ rename drivers/net/{ => ethernet/via}/via-rhine.c (99%)
+ rename drivers/net/{ => ethernet/via}/via-velocity.c (97%)
+ rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
+ create mode 100644 drivers/net/ethernet/xilinx/Kconfig
+ create mode 100644 drivers/net/ethernet/xilinx/Makefile
+ rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
+ rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (99%)
+ rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
+ rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
+ create mode 100644 drivers/net/ethernet/xircom/Kconfig
+ create mode 100644 drivers/net/ethernet/xircom/Makefile
+ rename drivers/net/{pcmcia => ethernet/xircom}/xirc2ps_cs.c (99%)
+ create mode 100644 drivers/net/ethernet/xscale/Kconfig
+ create mode 100644 drivers/net/ethernet/xscale/Makefile
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/Kconfig (94%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/Makefile (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/caleb.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/enp2611.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400-msf.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.uc (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_rx.ucode (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.uc (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixp2400_tx.ucode (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/ixpdev_priv.h (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.c (100%)
+ rename drivers/net/{ => ethernet/xscale}/ixp2000/pm3386.h (100%)
+ rename drivers/net/{arm => ethernet/xscale}/ixp4xx_eth.c (99%)
+ create mode 100644 drivers/net/fddi/Kconfig
+ create mode 100644 drivers/net/fddi/Makefile
+ rename drivers/net/{ => fddi}/defxx.c (99%)
+ rename drivers/net/{ => fddi}/defxx.h (100%)
+ rename drivers/net/{ => fddi}/skfp/Makefile (100%)
+ rename drivers/net/{ => fddi}/skfp/cfm.c (100%)
+ rename drivers/net/{ => fddi}/skfp/drvfbi.c (100%)
+ rename drivers/net/{ => fddi}/skfp/ecm.c (100%)
+ rename drivers/net/{ => fddi}/skfp/ess.c (100%)
+ rename drivers/net/{ => fddi}/skfp/fplustm.c (100%)
+ rename drivers/net/{ => fddi}/skfp/h/cmtdef.h (99%)
+ rename drivers/net/{ => fddi}/skfp/h/fddi.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/fddimib.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/fplustm.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/hwmtm.h (99%)
+ rename drivers/net/{ => fddi}/skfp/h/mbuf.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/osdef1st.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/sba.h (98%)
+ rename drivers/net/{ => fddi}/skfp/h/sba_def.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/skfbi.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/skfbiinc.h (99%)
+ rename drivers/net/{ => fddi}/skfp/h/smc.h (98%)
+ rename drivers/net/{ => fddi}/skfp/h/smt.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/smt_p.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/smtstate.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/supern_2.h (100%)
+ rename drivers/net/{ => fddi}/skfp/h/targethw.h (98%)
+ rename drivers/net/{ => fddi}/skfp/h/targetos.h (99%)
+ rename drivers/net/{ => fddi}/skfp/h/types.h (100%)
+ rename drivers/net/{ => fddi}/skfp/hwmtm.c (100%)
+ rename drivers/net/{ => fddi}/skfp/hwt.c (100%)
+ rename drivers/net/{ => fddi}/skfp/pcmplc.c (100%)
+ rename drivers/net/{ => fddi}/skfp/pmf.c (100%)
+ rename drivers/net/{ => fddi}/skfp/queue.c (100%)
+ rename drivers/net/{ => fddi}/skfp/rmt.c (100%)
+ rename drivers/net/{ => fddi}/skfp/skfddi.c (99%)
+ rename drivers/net/{ => fddi}/skfp/smt.c (100%)
+ rename drivers/net/{ => fddi}/skfp/smtdef.c (100%)
+ rename drivers/net/{ => fddi}/skfp/smtinit.c (100%)
+ rename drivers/net/{ => fddi}/skfp/smttimer.c (100%)
+ rename drivers/net/{ => fddi}/skfp/srf.c (100%)
+ create mode 100644 drivers/net/hippi/Kconfig
+ create mode 100644 drivers/net/hippi/Makefile
+ rename drivers/net/{ => hippi}/rrunner.c (100%)
+ rename drivers/net/{ => hippi}/rrunner.h (100%)
+ delete mode 100644 drivers/net/ibm_newemac/Makefile
+ delete mode 100644 drivers/net/octeon/Makefile
+ delete mode 100644 drivers/net/pci-skeleton.c
+ delete mode 100644 drivers/net/pcmcia/Kconfig
+ delete mode 100644 drivers/net/pcmcia/Makefile
+ create mode 100644 drivers/net/plip/Kconfig
+ create mode 100644 drivers/net/plip/Makefile
+ rename drivers/net/{ => plip}/plip.c (100%)
+ create mode 100644 drivers/net/ppp/Kconfig
+ create mode 100644 drivers/net/ppp/Makefile
+ rename drivers/net/{ => ppp}/bsd_comp.c (100%)
+ rename drivers/net/{ => ppp}/ppp_async.c (100%)
+ rename drivers/net/{ => ppp}/ppp_deflate.c (100%)
+ rename drivers/net/{ => ppp}/ppp_generic.c (100%)
+ rename drivers/net/{ => ppp}/ppp_mppe.c (100%)
+ rename drivers/net/{ => ppp}/ppp_mppe.h (100%)
+ rename drivers/net/{ => ppp}/ppp_synctty.c (100%)
+ rename drivers/net/{ => ppp}/pppoe.c (100%)
+ rename drivers/net/{ => ppp}/pppox.c (100%)
+ rename drivers/net/{ => ppp}/pptp.c (100%)
+ create mode 100644 drivers/net/slip/Kconfig
+ create mode 100644 drivers/net/slip/Makefile
+ rename drivers/net/{ => slip}/slhc.c (100%)
+ rename drivers/net/{ => slip}/slip.c (98%)
+ rename drivers/net/{ => slip}/slip.h (94%)
+ rename drivers/net/{pcmcia => tokenring}/ibmtr_cs.c (99%)
+ create mode 100644 drivers/net/wireless/ath/ath6kl/Kconfig
+ create mode 100644 drivers/net/wireless/ath/ath6kl/Makefile
+ create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/bmi.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/cfg80211.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/common.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/core.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/debug.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/debug.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/hif-ops.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/hif.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/init.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/main.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/node.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/sdio.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/target.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/txrx.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/wmi.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9480_1p0_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9480_2p0_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
+ delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-cfg.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-shared.h
+ delete mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+ rename drivers/net/wireless/iwlwifi/{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c} (53%)
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+ delete mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
+ create mode 100644 drivers/nfc/nfcwilink.c
+ delete mode 100644 drivers/staging/ath6kl/Kconfig
+ delete mode 100644 drivers/staging/ath6kl/Makefile
+ delete mode 100644 drivers/staging/ath6kl/TODO
+ delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
+ delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
+ delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
+ delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
+ delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+ delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
+ delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
+ delete mode 100644 drivers/staging/ath6kl/include/a_config.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
+ delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
+ delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
+ delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
+ delete mode 100644 drivers/staging/ath6kl/include/bmi.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
+ delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
+ delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
+ delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
+ delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/hif.h
+ delete mode 100644 drivers/staging/ath6kl/include/host_version.h
+ delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
+ delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
+ delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
+ delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
+ delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
+ delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
+ delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
+ delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
+ delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
+ delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
+ delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
+ delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
+ delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
+ delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h
+ create mode 100644 include/linux/bcma/bcma_driver_mips.h
+ create mode 100644 include/linux/bcma/bcma_soc.h
+ create mode 100644 include/linux/can/gw.h
+ rename {arch/sh/include/asm => include/linux}/sh_eth.h (90%)
+ rename {drivers/net => include/linux}/sungem_phy.h (98%)
+ create mode 100644 include/net/cfg80211-wext.h
+ create mode 100644 include/net/nfc/nci.h
+ create mode 100644 include/net/nfc/nci_core.h
+ rename include/net/{ => nfc}/nfc.h (94%)
+ delete mode 100644 net/batman-adv/aggregation.c
+ delete mode 100644 net/batman-adv/aggregation.h
+ create mode 100644 net/batman-adv/bat_iv_ogm.c
+ create mode 100644 net/batman-adv/bat_ogm.h
+ create mode 100644 net/can/gw.c
+ create mode 100644 net/ieee802154/6lowpan.c
+ create mode 100644 net/ieee802154/6lowpan.h
+ create mode 100644 net/nfc/nci/Kconfig
+ create mode 100644 net/nfc/nci/Makefile
+ create mode 100644 net/nfc/nci/core.c
+ create mode 100644 net/nfc/nci/data.c
+ create mode 100644 net/nfc/nci/lib.c
+ create mode 100644 net/nfc/nci/ntf.c
+ create mode 100644 net/nfc/nci/rsp.c
+ delete mode 100644 net/rds/xlist.h
+Merging wireless/master
+$ git merge wireless/master
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Removing drivers/net/wireless/ath/ath6kl/node.c
+Auto-merging drivers/net/wireless/libertas/main.c
+Auto-merging drivers/net/wireless/mwifiex/main.c
+Auto-merging include/linux/if_ether.h
+Auto-merging net/mac80211/agg-rx.c
+Auto-merging net/mac80211/cfg.c
+Auto-merging net/mac80211/ibss.c
+Auto-merging net/mac80211/iface.c
+Auto-merging net/mac80211/sta_info.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a890405] Merge remote-tracking branch 'wireless/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/80211.tmpl | 11 +-
+ Documentation/feature-removal-schedule.txt | 8 +
+ drivers/bluetooth/btusb.c | 6 +-
+ drivers/net/wireless/Makefile | 2 +-
+ drivers/net/wireless/at76c50x-usb.c | 18 +-
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +-
+ drivers/net/wireless/ath/ath6kl/Makefile | 4 +-
+ drivers/net/wireless/ath/ath6kl/bmi.c | 23 +-
+ drivers/net/wireless/ath/ath6kl/bmi.h | 4 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 894 ++++++++++++-----
+ drivers/net/wireless/ath/ath6kl/common.h | 83 --
+ drivers/net/wireless/ath/ath6kl/core.h | 145 +++-
+ drivers/net/wireless/ath/ath6kl/debug.c | 784 +++++++++++++++
+ drivers/net/wireless/ath/ath6kl/debug.h | 49 +-
+ drivers/net/wireless/ath/ath6kl/hif-ops.h | 5 +
+ drivers/net/wireless/ath/ath6kl/hif.h | 1 +
+ drivers/net/wireless/ath/ath6kl/htc.c | 271 +++---
+ drivers/net/wireless/ath/ath6kl/init.c | 794 ++++++++++++----
+ drivers/net/wireless/ath/ath6kl/main.c | 448 ++++++---
+ drivers/net/wireless/ath/ath6kl/node.c | 234 -----
+ drivers/net/wireless/ath/ath6kl/sdio.c | 79 ++-
+ drivers/net/wireless/ath/ath6kl/target.h | 41 +-
+ drivers/net/wireless/ath/ath6kl/testmode.c | 167 ++++
+ drivers/net/wireless/ath/ath6kl/testmode.h | 36 +
+ drivers/net/wireless/ath/ath6kl/txrx.c | 61 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 1126 +++++++++++++++-------
+ drivers/net/wireless/ath/ath6kl/wmi.h | 350 ++++++-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 3 +-
+ drivers/net/wireless/ath/ath9k/eeprom.h | 7 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 7 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 1 +
+ drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 10 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 11 +-
+ drivers/net/wireless/ath/ath9k/main.c | 6 +-
+ drivers/net/wireless/ath/ath9k/rc.c | 6 -
+ drivers/net/wireless/ath/ath9k/recv.c | 23 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 19 +-
+ drivers/net/wireless/ath/carl9170/main.c | 3 +-
+ drivers/net/wireless/b43/main.c | 3 +-
+ drivers/net/wireless/b43legacy/main.c | 3 +-
+ drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 2 +-
+ drivers/net/wireless/iwlegacy/iwl-core.c | 3 +-
+ drivers/net/wireless/iwlegacy/iwl-core.h | 3 +-
+ drivers/net/wireless/iwlwifi/Kconfig | 22 +-
+ drivers/net/wireless/iwlwifi/Makefile | 40 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 3 -
+ drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-agn.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-core.c | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-core.h | 3 +-
+ drivers/net/wireless/iwlwifi/iwl-shared.h | 2 +-
+ drivers/net/wireless/libertas/dev.h | 1 +
+ drivers/net/wireless/libertas/main.c | 35 +
+ drivers/net/wireless/mac80211_hwsim.c | 3 +-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 2 -
+ drivers/net/wireless/mwifiex/11n_aggr.h | 1 +
+ drivers/net/wireless/mwifiex/cfg80211.c | 176 +++-
+ drivers/net/wireless/mwifiex/cfg80211.h | 3 +-
+ drivers/net/wireless/mwifiex/decl.h | 8 -
+ drivers/net/wireless/mwifiex/init.c | 2 +-
+ drivers/net/wireless/mwifiex/main.c | 266 +----
+ drivers/net/wireless/mwifiex/main.h | 19 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 46 +-
+ drivers/net/wireless/mwifiex/wmm.c | 32 +-
+ drivers/net/wireless/mwl8k.c | 5 +-
+ drivers/net/wireless/p54/main.c | 3 +-
+ drivers/net/wireless/p54/txrx.c | 2 +-
+ drivers/net/wireless/rt2x00/rt2400pci.c | 5 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 5 +-
+ drivers/net/wireless/rt2x00/rt2800lib.h | 3 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 3 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 3 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 5 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 5 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 3 +-
+ drivers/net/wireless/rtlwifi/core.c | 3 +-
+ drivers/net/wireless/rtlwifi/usb.c | 40 -
+ drivers/net/wireless/rtlwifi/wifi.h | 8 +-
+ drivers/net/wireless/wl1251/main.c | 3 +-
+ drivers/net/wireless/wl12xx/main.c | 3 +-
+ drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 7 +-
+ include/linux/ieee80211.h | 85 ++
+ include/linux/if_ether.h | 1 +
+ include/linux/nl80211.h | 44 +
+ include/linux/rfkill-gpio.h | 4 +
+ include/net/bluetooth/l2cap.h | 3 +-
+ include/net/cfg80211.h | 29 +
+ include/net/ieee80211_radiotap.h | 1 +
+ include/net/mac80211.h | 229 +++++-
+ net/bluetooth/af_bluetooth.c | 30 +-
+ net/bluetooth/bnep/core.c | 5 +-
+ net/bluetooth/cmtp/core.c | 5 +-
+ net/bluetooth/hci_conn.c | 14 +-
+ net/bluetooth/hci_event.c | 20 +-
+ net/bluetooth/hidp/core.c | 10 +-
+ net/bluetooth/l2cap_core.c | 255 ++----
+ net/bluetooth/rfcomm/core.c | 5 +-
+ net/mac80211/Kconfig | 12 +
+ net/mac80211/agg-rx.c | 2 +-
+ net/mac80211/agg-tx.c | 2 +-
+ net/mac80211/cfg.c | 380 +++++++-
+ net/mac80211/debugfs_sta.c | 37 +-
+ net/mac80211/driver-ops.h | 33 +-
+ net/mac80211/driver-trace.h | 77 ++
+ net/mac80211/ht.c | 2 +-
+ net/mac80211/ibss.c | 4 +-
+ net/mac80211/ieee80211_i.h | 16 +-
+ net/mac80211/iface.c | 4 +-
+ net/mac80211/key.c | 4 +-
+ net/mac80211/main.c | 18 +
+ net/mac80211/mesh.c | 58 --
+ net/mac80211/mesh.h | 4 -
+ net/mac80211/mesh_plink.c | 12 +-
+ net/mac80211/mlme.c | 34 +-
+ net/mac80211/pm.c | 2 +-
+ net/mac80211/rate.c | 8 +-
+ net/mac80211/rc80211_minstrel_ht.c | 2 +
+ net/mac80211/rx.c | 118 ++-
+ net/mac80211/sta_info.c | 636 ++++++++++---
+ net/mac80211/sta_info.h | 136 ++--
+ net/mac80211/status.c | 54 +-
+ net/mac80211/tx.c | 187 +++--
+ net/mac80211/util.c | 76 ++-
+ net/mac80211/wme.c | 4 +-
+ net/rfkill/rfkill-gpio.c | 11 +
+ net/wireless/nl80211.c | 109 ++-
+ net/wireless/util.c | 5 +-
+ 128 files changed, 6628 insertions(+), 2696 deletions(-)
+ delete mode 100644 drivers/net/wireless/ath/ath6kl/node.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/testmode.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/testmode.h
+Merging bluetooth/master
+$ git merge bluetooth/master
+Resolved 'net/bluetooth/hci_core.c' using previous resolution.
+Resolved 'net/bluetooth/l2cap_core.c' using previous resolution.
+Resolved 'net/bluetooth/mgmt.c' using previous resolution.
+Resolved 'net/bluetooth/smp.c' using previous resolution.
+Auto-merging net/bluetooth/hci_core.c
+CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
+Auto-merging net/bluetooth/l2cap_core.c
+CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
+Auto-merging net/bluetooth/mgmt.c
+CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
+Auto-merging net/bluetooth/smp.c
+CONFLICT (content): Merge conflict in net/bluetooth/smp.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 79684ff] Merge remote-tracking branch 'bluetooth/master'
+$ git diff -M --stat --summary HEAD^..
+Merging mtd/master
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master
+$ git merge l2-mtd/master
+Resolved 'arch/arm/mach-at91/board-afeb-9260v1.c' using previous resolution.
+Resolved 'arch/arm/mach-at91/board-neocore926.c' using previous resolution.
+Resolved 'arch/arm/mach-at91/board-rm9200dk.c' using previous resolution.
+Resolved 'arch/arm/mach-at91/board-sam9g20ek.c' using previous resolution.
+Resolved 'arch/arm/mach-at91/board-sam9m10g45ek.c' using previous resolution.
+Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
+Auto-merging arch/arm/mach-at91/board-cam60.c
+Auto-merging arch/arm/mach-at91/board-cap9adk.c
+Auto-merging arch/arm/mach-at91/board-kb9202.c
+Auto-merging arch/arm/mach-at91/board-neocore926.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
+Auto-merging arch/arm/mach-at91/board-qil-a9260.c
+Auto-merging arch/arm/mach-at91/board-rm9200dk.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
+Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
+Auto-merging arch/arm/mach-at91/board-sam9260ek.c
+Auto-merging arch/arm/mach-at91/board-sam9261ek.c
+Auto-merging arch/arm/mach-at91/board-sam9263ek.c
+Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
+Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
+Auto-merging arch/arm/mach-at91/board-sam9rlek.c
+Auto-merging arch/arm/mach-at91/board-snapper9260.c
+CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
+Auto-merging arch/arm/mach-at91/board-usb-a926x.c
+Auto-merging arch/arm/mach-at91/board-yl-9200.c
+Auto-merging arch/arm/mach-at91/include/mach/board.h
+Auto-merging arch/arm/mach-davinci/board-da830-evm.c
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
+Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
+Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
+Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
+Auto-merging arch/arm/mach-ep93xx/ts72xx.c
+Auto-merging arch/arm/mach-mmp/aspenite.c
+Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c
+Auto-merging arch/arm/mach-pxa/cm-x300.c
+Auto-merging arch/arm/mach-pxa/littleton.c
+Auto-merging arch/arm/mach-pxa/raumfeld.c
+Auto-merging arch/arm/mach-pxa/zylonite.c
+Removing drivers/mtd/maps/ceiva.c
+Removing drivers/mtd/maps/edb7312.c
+Auto-merging drivers/mtd/nand/Kconfig
+Auto-merging drivers/mtd/nand/atmel_nand.c
+Auto-merging drivers/mtd/nand/au1550nd.c
+Removing drivers/mtd/nand/edb7312.c
+Auto-merging drivers/mtd/onenand/omap2.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
+arch/arm/mach-at91/board-afeb-9260v1.c: needs merge
+arch/arm/mach-at91/board-neocore926.c: needs merge
+arch/arm/mach-at91/board-rm9200dk.c: needs merge
+arch/arm/mach-at91/board-sam9g20ek.c: needs merge
+arch/arm/mach-at91/board-sam9m10g45ek.c: needs merge
+arch/arm/mach-at91/board-usb-a9260.c: needs merge
+rm 'arch/arm/mach-at91/board-usb-a9260.c'
+$ git commit -v -a
+[master ea661b9] Merge remote-tracking branch 'l2-mtd/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/mtdnand.tmpl | 19 +-
+ .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 +
+ arch/arm/mach-at91/board-afeb-9260v1.c | 9 +-
+ arch/arm/mach-at91/board-cam60.c | 9 +-
+ arch/arm/mach-at91/board-cap9adk.c | 9 +-
+ arch/arm/mach-at91/board-kb9202.c | 9 +-
+ arch/arm/mach-at91/board-neocore926.c | 9 +-
+ arch/arm/mach-at91/board-qil-a9260.c | 9 +-
+ arch/arm/mach-at91/board-rm9200dk.c | 9 +-
+ arch/arm/mach-at91/board-sam9-l9260.c | 9 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9g20ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 9 +-
+ arch/arm/mach-at91/board-snapper9260.c | 10 +-
+ arch/arm/mach-at91/board-usb-a926x.c | 9 +-
+ arch/arm/mach-at91/board-yl-9200.c | 9 +-
+ arch/arm/mach-at91/include/mach/board.h | 3 +-
+ arch/arm/mach-davinci/board-da830-evm.c | 2 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 3 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
+ arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
+ arch/arm/mach-davinci/include/mach/nand.h | 4 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 23 +-
+ arch/arm/mach-mmp/aspenite.c | 5 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
+ arch/arm/mach-pxa/cm-x300.c | 5 +-
+ arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +-
+ arch/arm/mach-pxa/littleton.c | 5 +-
+ arch/arm/mach-pxa/mxm8x10.c | 9 +-
+ arch/arm/mach-pxa/raumfeld.c | 5 +-
+ arch/arm/mach-pxa/zylonite.c | 5 +-
+ arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +-
+ arch/avr32/boards/atngw100/setup.c | 8 +-
+ arch/avr32/boards/atstk1000/atstk1002.c | 9 +-
+ arch/avr32/mach-at32ap/include/mach/board.h | 3 +-
+ arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +-
+ arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +-
+ drivers/mtd/Kconfig | 16 +-
+ drivers/mtd/Makefile | 2 +-
+ drivers/mtd/afs.c | 4 +-
+ drivers/mtd/ar7part.c | 2 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 31 +-
+ drivers/mtd/chips/fwh_lock.h | 3 +-
+ drivers/mtd/chips/jedec_probe.c | 34 +-
+ drivers/mtd/cmdlinepart.c | 7 +-
+ drivers/mtd/devices/doc2000.c | 17 +-
+ drivers/mtd/devices/doc2001.c | 11 +-
+ drivers/mtd/devices/doc2001plus.c | 11 +-
+ drivers/mtd/devices/docecc.c | 2 +-
+ drivers/mtd/devices/lart.c | 18 +-
+ drivers/mtd/devices/m25p80.c | 85 +-
+ drivers/mtd/devices/mtd_dataflash.c | 91 +-
+ drivers/mtd/devices/sst25l.c | 42 +-
+ drivers/mtd/ftl.c | 40 +-
+ drivers/mtd/inftlcore.c | 69 +-
+ drivers/mtd/inftlmount.c | 116 +-
+ drivers/mtd/maps/Kconfig | 26 -
+ drivers/mtd/maps/Makefile | 2 -
+ drivers/mtd/maps/bfin-async-flash.c | 16 +-
+ drivers/mtd/maps/ceiva.c | 341 ----
+ drivers/mtd/maps/dc21285.c | 9 +-
+ drivers/mtd/maps/edb7312.c | 134 --
+ drivers/mtd/maps/gpio-addr-flash.c | 16 +-
+ drivers/mtd/maps/h720x-flash.c | 23 +-
+ drivers/mtd/maps/impa7.c | 28 +-
+ drivers/mtd/maps/intel_vr_nor.c | 7 +-
+ drivers/mtd/maps/ixp2000.c | 11 +-
+ drivers/mtd/maps/ixp4xx.c | 29 +-
+ drivers/mtd/maps/lantiq-flash.c | 17 +-
+ drivers/mtd/maps/latch-addr-flash.c | 24 +-
+ drivers/mtd/maps/pcmciamtd.c | 124 +-
+ drivers/mtd/maps/physmap.c | 38 +-
+ drivers/mtd/maps/physmap_of.c | 80 +-
+ drivers/mtd/maps/plat-ram.c | 23 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 20 +-
+ drivers/mtd/maps/rbtx4939-flash.c | 24 +-
+ drivers/mtd/maps/sa1100-flash.c | 30 +-
+ drivers/mtd/maps/solutionengine.c | 30 +-
+ drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +-
+ drivers/mtd/mtdblock.c | 18 +-
+ drivers/mtd/mtdchar.c | 162 ++-
+ drivers/mtd/mtdconcat.c | 10 +-
+ drivers/mtd/mtdcore.c | 70 +-
+ drivers/mtd/mtdcore.h | 3 +
+ drivers/mtd/mtdoops.c | 2 +-
+ drivers/mtd/mtdpart.c | 62 +-
+ drivers/mtd/mtdsuper.c | 20 +-
+ drivers/mtd/mtdswap.c | 31 +-
+ drivers/mtd/nand/Kconfig | 27 +-
+ drivers/mtd/nand/Makefile | 2 +-
+ drivers/mtd/nand/atmel_nand.c | 74 +-
+ drivers/mtd/nand/au1550nd.c | 29 +-
+ drivers/mtd/nand/autcpu12.c | 4 +-
+ drivers/mtd/nand/bcm_umi_nand.c | 57 +-
+ drivers/mtd/nand/cafe_nand.c | 21 +-
+ drivers/mtd/nand/cmx270_nand.c | 23 +-
+ drivers/mtd/nand/cs553x_nand.c | 15 +-
+ drivers/mtd/nand/davinci_nand.c | 39 +-
+ drivers/mtd/nand/denali.c | 6 +-
+ drivers/mtd/nand/diskonchip.c | 8 +-
+ drivers/mtd/nand/edb7312.c | 203 ---
+ drivers/mtd/nand/fsl_elbc_nand.c | 75 +-
+ drivers/mtd/nand/fsl_upm.c | 16 +-
+ drivers/mtd/nand/fsmc_nand.c | 77 +-
+ drivers/mtd/nand/gpmi-nand/Makefile | 3 +
+ drivers/mtd/nand/gpmi-nand/bch-regs.h | 84 +
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 1057 +++++++++++++
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 1619 ++++++++++++++++++++
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 273 ++++
+ drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 172 +++
+ drivers/mtd/nand/h1910.c | 19 +-
+ drivers/mtd/nand/jz4740_nand.c | 18 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 22 +-
+ drivers/mtd/nand/mxc_nand.c | 37 +-
+ drivers/mtd/nand/nand_base.c | 1105 +++++++-------
+ drivers/mtd/nand/nand_bbt.c | 692 ++++-----
+ drivers/mtd/nand/nand_bch.c | 4 +-
+ drivers/mtd/nand/nand_ecc.c | 10 +-
+ drivers/mtd/nand/nandsim.c | 4 +-
+ drivers/mtd/nand/ndfc.c | 22 +-
+ drivers/mtd/nand/nomadik_nand.c | 1 +
+ drivers/mtd/nand/nuc900_nand.c | 1 +
+ drivers/mtd/nand/omap2.c | 22 +-
+ drivers/mtd/nand/orion_nand.c | 16 +-
+ drivers/mtd/nand/pasemi_nand.c | 3 +-
+ drivers/mtd/nand/plat_nand.c | 25 +-
+ drivers/mtd/nand/ppchameleonevb.c | 47 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 471 ++++---
+ drivers/mtd/nand/r852.c | 6 +-
+ drivers/mtd/nand/rtc_from4.c | 5 +-
+ drivers/mtd/nand/s3c2410.c | 27 +-
+ drivers/mtd/nand/sharpsl.c | 13 +-
+ drivers/mtd/nand/sm_common.c | 2 +-
+ drivers/mtd/nand/socrates_nand.c | 28 +-
+ drivers/mtd/nand/tmio_nand.c | 17 +-
+ drivers/mtd/nand/txx9ndfmc.c | 8 +-
+ drivers/mtd/nftlcore.c | 37 +-
+ drivers/mtd/nftlmount.c | 26 +-
+ drivers/mtd/ofpart.c | 112 ++-
+ drivers/mtd/onenand/generic.c | 14 +-
+ drivers/mtd/onenand/omap2.c | 16 +-
+ drivers/mtd/onenand/onenand_base.c | 114 +-
+ drivers/mtd/onenand/onenand_bbt.c | 8 +-
+ drivers/mtd/onenand/samsung.c | 13 +-
+ drivers/mtd/redboot.c | 13 +-
+ drivers/mtd/sm_ftl.c | 26 +-
+ drivers/mtd/ssfdc.c | 46 +-
+ drivers/mtd/tests/mtd_oobtest.c | 24 +-
+ drivers/mtd/tests/mtd_pagetest.c | 28 +-
+ drivers/mtd/tests/mtd_readtest.c | 5 +-
+ drivers/mtd/tests/mtd_speedtest.c | 8 +-
+ drivers/mtd/tests/mtd_stresstest.c | 2 +-
+ drivers/mtd/tests/mtd_subpagetest.c | 8 +-
+ drivers/mtd/tests/mtd_torturetest.c | 2 +-
+ drivers/mtd/ubi/eba.c | 2 +-
+ drivers/mtd/ubi/io.c | 24 +-
+ drivers/mtd/ubi/kapi.c | 2 +-
+ drivers/mtd/ubi/misc.c | 2 +-
+ drivers/mtd/ubi/scan.c | 4 +-
+ drivers/mtd/ubi/vtbl.c | 2 +-
+ drivers/staging/spectra/lld_mtd.c | 6 +-
+ fs/jffs2/scan.c | 4 +-
+ fs/jffs2/wbuf.c | 9 +-
+ include/linux/mtd/bbm.h | 39 +-
+ include/linux/mtd/mtd.h | 82 +-
+ include/linux/mtd/nand.h | 92 +-
+ include/linux/mtd/onenand.h | 4 +
+ include/linux/mtd/partitions.h | 46 +-
+ include/linux/mtd/physmap.h | 17 -
+ include/mtd/mtd-abi.h | 122 ++-
+ 178 files changed, 5862 insertions(+), 3991 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
+ delete mode 100644 drivers/mtd/maps/ceiva.c
+ delete mode 100644 drivers/mtd/maps/edb7312.c
+ delete mode 100644 drivers/mtd/nand/edb7312.c
+ create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile
+ create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h
+ create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+ create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+ create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+ create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h
+Merging crypto/master
+$ git merge crypto/master
+Auto-merging arch/x86/include/asm/cpufeature.h
+Auto-merging crypto/blowfish_common.c
+Merge made by recursive.
+ .../devicetree/bindings/crypto/picochip-spacc.txt | 23 +
+ arch/x86/crypto/Makefile | 10 +
+ arch/x86/crypto/aes_glue.c | 1 +
+ arch/x86/crypto/blowfish-x86_64-asm_64.S | 392 ++++++++++++++
+ arch/x86/crypto/blowfish_glue.c | 487 +++++++++++++++++
+ arch/x86/crypto/sha1_ssse3_asm.S | 558 ++++++++++++++++++++
+ arch/x86/crypto/sha1_ssse3_glue.c | 240 +++++++++
+ arch/x86/include/asm/cpufeature.h | 3 +
+ crypto/Kconfig | 35 ++
+ crypto/Makefile | 3 +-
+ crypto/{blowfish.c => blowfish_common.c} | 98 +----
+ crypto/blowfish_generic.c | 142 +++++
+ crypto/cryptd.c | 2 +-
+ crypto/sha1_generic.c | 9 +-
+ crypto/tcrypt.c | 4 +
+ drivers/crypto/n2_core.c | 4 +-
+ drivers/crypto/padlock-aes.c | 4 +-
+ drivers/crypto/picoxcell_crypto.c | 121 ++---
+ include/crypto/blowfish.h | 23 +
+ include/crypto/sha.h | 5 +
+ 20 files changed, 2002 insertions(+), 162 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/picochip-spacc.txt
+ create mode 100644 arch/x86/crypto/blowfish-x86_64-asm_64.S
+ create mode 100644 arch/x86/crypto/blowfish_glue.c
+ create mode 100644 arch/x86/crypto/sha1_ssse3_asm.S
+ create mode 100644 arch/x86/crypto/sha1_ssse3_glue.c
+ rename crypto/{blowfish.c => blowfish_common.c} (87%)
+ create mode 100644 crypto/blowfish_generic.c
+ create mode 100644 include/crypto/blowfish.h
+Merging sound/for-next
+$ git merge sound/for-next
+Resolved 'arch/mips/alchemy/devboards/db1x00/platform.c' using previous resolution.
+Resolved 'sound/mips/Kconfig' using previous resolution.
+Auto-merging arch/arm/mach-ep93xx/edb93xx.c
+Auto-merging arch/arm/mach-ep93xx/simone.c
+Auto-merging arch/arm/mach-ep93xx/snappercl15.c
+Auto-merging arch/arm/mach-omap2/devices.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+Auto-merging arch/arm/plat-omap/devices.c
+Auto-merging arch/mips/alchemy/devboards/db1200/platform.c
+Auto-merging arch/mips/alchemy/devboards/db1x00/platform.c
+CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
+Auto-merging drivers/base/regmap/regmap.c
+Auto-merging include/linux/regulator/consumer.h
+Auto-merging sound/mips/Kconfig
+CONFLICT (content): Merge conflict in sound/mips/Kconfig
+Removing sound/pci/hda/alc268_quirks.c
+Removing sound/pci/hda/alc269_quirks.c
+Removing sound/pci/hda/alc662_quirks.c
+Removing sound/pci/hda/alc680_quirks.c
+Removing sound/pci/hda/alc861_quirks.c
+Removing sound/pci/hda/alc861vd_quirks.c
+Auto-merging sound/soc/au1x/Kconfig
+Removing sound/soc/omap/mcpdm.c
+Removing sound/soc/omap/mcpdm.h
+Auto-merging sound/soc/samsung/ac97.c
+Removing sound/usb/urb.c
+Removing sound/usb/urb.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5a42e6d] Merge remote-tracking branch 'sound/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/writing-an-alsa-driver.tmpl | 36 +-
+ .../bindings/sound/soc/codecs/fsl-sgtl5000.txt | 11 +
+ Documentation/devicetree/bindings/sound/wm8510.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8523.txt | 16 +
+ Documentation/devicetree/bindings/sound/wm8580.txt | 16 +
+ Documentation/devicetree/bindings/sound/wm8711.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8728.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8731.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8737.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8741.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8750.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8753.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8770.txt | 16 +
+ Documentation/devicetree/bindings/sound/wm8776.txt | 18 +
+ Documentation/devicetree/bindings/sound/wm8804.txt | 18 +
+ Documentation/sound/alsa/ALSA-Configuration.txt | 6 +
+ Documentation/sound/alsa/HD-Audio-Controls.txt | 16 +
+ Documentation/sound/alsa/HD-Audio-Models.txt | 67 +-
+ Documentation/sound/alsa/HD-Audio.txt | 53 +-
+ arch/arm/mach-ep93xx/edb93xx.c | 6 +
+ arch/arm/mach-ep93xx/simone.c | 13 +-
+ arch/arm/mach-ep93xx/snappercl15.c | 13 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 1 -
+ arch/arm/mach-omap2/devices.c | 33 +
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
+ arch/arm/plat-omap/devices.c | 36 -
+ arch/mips/alchemy/devboards/db1200/platform.c | 16 +
+ arch/mips/alchemy/devboards/db1x00/platform.c | 47 +
+ drivers/base/regmap/regmap.c | 9 +
+ drivers/input/misc/twl6040-vibra.c | 2 +-
+ drivers/mfd/twl6040-core.c | 38 +-
+ drivers/mfd/wm8994-core.c | 27 +
+ drivers/regulator/core.c | 59 +
+ include/linux/input.h | 1 +
+ include/linux/mfd/twl6040.h | 21 +-
+ include/linux/mfd/wm8994/core.h | 1 +
+ include/linux/mfd/wm8994/registers.h | 88 +
+ include/linux/regmap.h | 52 +
+ include/linux/regulator/consumer.h | 7 +
+ include/linux/regulator/driver.h | 3 +
+ include/linux/usb/ch9.h | 17 +-
+ include/sound/adau1373.h | 34 +
+ include/sound/initval.h | 2 +-
+ include/sound/jack.h | 1 +
+ include/sound/mpu401.h | 7 +-
+ include/sound/pcm.h | 4 +
+ include/sound/saif.h | 16 +
+ include/sound/soc-dai.h | 37 +-
+ include/sound/soc-dapm.h | 8 +
+ include/sound/soc.h | 21 +-
+ include/sound/tpa6130a2-plat.h | 6 -
+ include/sound/wm1250-ev1.h | 27 +
+ include/sound/wm5100.h | 59 +
+ include/trace/events/asoc.h | 25 +
+ sound/aoa/codecs/onyx.c | 4 +-
+ sound/arm/aaci.c | 2 +-
+ sound/arm/pxa2xx-ac97-lib.c | 2 +-
+ sound/core/control.c | 4 +-
+ sound/core/jack.c | 1 +
+ sound/core/oss/mixer_oss.c | 2 +-
+ sound/core/pcm_lib.c | 26 +
+ sound/core/pcm_native.c | 7 +-
+ sound/drivers/aloop.c | 13 +-
+ sound/drivers/ml403-ac97cr.c | 4 +-
+ sound/drivers/mpu401/mpu401.c | 3 +-
+ sound/drivers/mpu401/mpu401_uart.c | 20 +-
+ sound/drivers/mtpav.c | 2 +-
+ sound/drivers/serial-u16550.c | 2 +-
+ sound/firewire/isight.c | 1 -
+ sound/firewire/speakers.c | 5 +-
+ sound/isa/ad1816a/ad1816a.c | 2 +-
+ sound/isa/ad1816a/ad1816a_lib.c | 2 +-
+ sound/isa/als100.c | 1 -
+ sound/isa/azt2320.c | 3 +-
+ sound/isa/cmi8330.c | 2 +-
+ sound/isa/cs423x/cs4231.c | 1 -
+ sound/isa/cs423x/cs4236.c | 3 +-
+ sound/isa/es1688/es1688.c | 2 +-
+ sound/isa/es1688/es1688_lib.c | 2 +-
+ sound/isa/es18xx.c | 6 +-
+ sound/isa/galaxy/galaxy.c | 3 +-
+ sound/isa/gus/gus_main.c | 2 +-
+ sound/isa/gus/gusextreme.c | 3 +-
+ sound/isa/gus/gusmax.c | 2 +-
+ sound/isa/gus/interwave.c | 2 +-
+ sound/isa/msnd/msnd_pinnacle.c | 2 +-
+ sound/isa/opl3sa2.c | 7 +-
+ sound/isa/opti9xx/miro.c | 3 +-
+ sound/isa/opti9xx/opti92x-ad1848.c | 4 +-
+ sound/isa/sb/jazz16.c | 1 -
+ sound/isa/sb/sb16.c | 5 +-
+ sound/isa/sb/sb_common.c | 2 +-
+ sound/isa/sc6000.c | 3 +-
+ sound/isa/sscape.c | 3 +-
+ sound/isa/wavefront/wavefront.c | 5 +-
+ sound/isa/wss/wss_lib.c | 2 +-
+ sound/mips/Kconfig | 5 +-
+ sound/mips/au1x00.c | 4 +-
+ sound/oss/sound_timer.c | 2 +-
+ sound/pci/als4000.c | 5 +-
+ sound/pci/au88x0/au88x0_mpu401.c | 6 +-
+ sound/pci/azt3328.c | 5 +-
+ sound/pci/cmipci.c | 5 +-
+ sound/pci/ctxfi/ctpcm.c | 2 +-
+ sound/pci/ctxfi/ctsrc.c | 2 +-
+ sound/pci/ctxfi/ctvmem.h | 2 +-
+ sound/pci/emu10k1/emupcm.c | 5 +
+ sound/pci/es1938.c | 5 +-
+ sound/pci/es1968.c | 5 +-
+ sound/pci/fm801.c | 20 +-
+ sound/pci/hda/Makefile | 3 +
+ sound/pci/hda/alc260_quirks.c | 304 --
+ sound/pci/hda/alc262_quirks.c | 530 +--
+ sound/pci/hda/alc268_quirks.c | 636 ---
+ sound/pci/hda/alc269_quirks.c | 674 ---
+ sound/pci/hda/alc662_quirks.c | 1408 ------
+ sound/pci/hda/alc680_quirks.c | 222 -
+ sound/pci/hda/alc861_quirks.c | 725 ---
+ sound/pci/hda/alc861vd_quirks.c | 605 ---
+ sound/pci/hda/alc880_quirks.c | 17 +-
+ sound/pci/hda/alc882_quirks.c | 85 +-
+ sound/pci/hda/alc_quirks.c | 13 +
+ sound/pci/hda/hda_codec.c | 104 +-
+ sound/pci/hda/hda_eld.c | 39 +-
+ sound/pci/hda/hda_hwdep.c | 6 +-
+ sound/pci/hda/hda_intel.c | 225 +-
+ sound/pci/hda/hda_local.h | 29 +-
+ sound/pci/hda/hda_proc.c | 12 +-
+ sound/pci/hda/hda_trace.h | 117 +
+ sound/pci/hda/patch_analog.c | 176 +-
+ sound/pci/hda/patch_conexant.c | 93 +-
+ sound/pci/hda/patch_hdmi.c | 99 +-
+ sound/pci/hda/patch_realtek.c | 1071 +++--
+ sound/pci/hda/patch_sigmatel.c | 32 +-
+ sound/pci/hda/patch_via.c | 68 +-
+ sound/pci/ice1712/ice1712.c | 10 +-
+ sound/pci/maestro3.c | 4 +-
+ sound/pci/oxygen/oxygen_lib.c | 6 +-
+ sound/pci/oxygen/xonar_pcm179x.c | 1 +
+ sound/pci/riptide/riptide.c | 2 +-
+ sound/pci/rme9652/hdspm.c | 153 +-
+ sound/pci/sis7019.c | 4 +-
+ sound/pci/sonicvibes.c | 7 +-
+ sound/pci/trident/trident.c | 5 +-
+ sound/pci/via82xx.c | 13 +-
+ sound/pci/ymfpci/ymfpci.c | 5 +-
+ sound/pci/ymfpci/ymfpci_main.c | 32 +-
+ sound/ppc/keywest.c | 1 -
+ sound/ppc/snd_ps3.c | 2 +-
+ sound/soc/Kconfig | 3 +
+ sound/soc/Makefile | 1 +
+ sound/soc/atmel/playpaq_wm8510.c | 5 +-
+ sound/soc/au1x/Kconfig | 28 +
+ sound/soc/au1x/Makefile | 10 +
+ sound/soc/au1x/ac97c.c | 363 ++
+ sound/soc/au1x/db1000.c | 75 +
+ sound/soc/au1x/db1200.c | 64 +-
+ sound/soc/au1x/dbdma2.c | 91 +-
+ sound/soc/au1x/dma.c | 377 ++
+ sound/soc/au1x/i2sc.c | 346 ++
+ sound/soc/au1x/psc-ac97.c | 48 +-
+ sound/soc/au1x/psc-i2s.c | 42 +-
+ sound/soc/au1x/psc.h | 16 +-
+ sound/soc/blackfin/Kconfig | 13 +
+ sound/soc/blackfin/Makefile | 2 +
+ sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +-
+ sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +-
+ sound/soc/blackfin/bfin-eval-adau1373.c | 202 +
+ sound/soc/codecs/88pm860x-codec.c | 14 +-
+ sound/soc/codecs/Kconfig | 12 +
+ sound/soc/codecs/Makefile | 6 +
+ sound/soc/codecs/ad193x.c | 65 +-
+ sound/soc/codecs/ad193x.h | 34 +-
+ sound/soc/codecs/ad1980.c | 11 +-
+ sound/soc/codecs/adau1373.c | 1414 ++++++
+ sound/soc/codecs/adau1373.h | 29 +
+ sound/soc/codecs/adau1701.c | 3 +-
+ sound/soc/codecs/adav80x.c | 3 +-
+ sound/soc/codecs/ak4671.c | 2 -
+ sound/soc/codecs/alc5623.c | 4 -
+ sound/soc/codecs/cs4270.c | 6 +-
+ sound/soc/codecs/cs4271.c | 5 -
+ sound/soc/codecs/cs42l51.c | 6 +-
+ sound/soc/codecs/max98088.c | 36 +-
+ sound/soc/codecs/max98095.c | 34 +-
+ sound/soc/codecs/rt5631.c | 1775 +++++++
+ sound/soc/codecs/rt5631.h | 701 +++
+ sound/soc/codecs/sgtl5000.c | 8 +
+ sound/soc/codecs/sn95031.c | 16 +-
+ sound/soc/codecs/ssm2602.c | 77 +-
+ sound/soc/codecs/ssm2602.h | 6 +-
+ sound/soc/codecs/sta32x.c | 21 +-
+ sound/soc/codecs/tlv320aic3x.c | 16 +-
+ sound/soc/codecs/tlv320dac33.c | 8 +-
+ sound/soc/codecs/tpa6130a2.c | 13 +-
+ sound/soc/codecs/twl6040.c | 570 +--
+ sound/soc/codecs/twl6040.h | 13 +
+ sound/soc/codecs/wl1273.c | 1 -
+ sound/soc/codecs/wm1250-ev1.c | 140 +-
+ sound/soc/codecs/wm5100-tables.c | 1530 ++++++
+ sound/soc/codecs/wm5100.c | 2644 ++++++++++
+ sound/soc/codecs/wm5100.h | 5146 ++++++++++++++++++++
+ sound/soc/codecs/wm8510.c | 8 +
+ sound/soc/codecs/wm8523.c | 35 +-
+ sound/soc/codecs/wm8580.c | 9 +-
+ sound/soc/codecs/wm8711.c | 19 +-
+ sound/soc/codecs/wm8728.c | 13 +-
+ sound/soc/codecs/wm8731.c | 10 +
+ sound/soc/codecs/wm8737.c | 10 +
+ sound/soc/codecs/wm8741.c | 137 +-
+ sound/soc/codecs/wm8750.c | 14 +-
+ sound/soc/codecs/wm8753.c | 13 +-
+ sound/soc/codecs/wm8770.c | 8 +
+ sound/soc/codecs/wm8776.c | 51 +-
+ sound/soc/codecs/wm8782.c | 2 +-
+ sound/soc/codecs/wm8804.c | 9 +
+ sound/soc/codecs/wm8904.c | 2 -
+ sound/soc/codecs/wm8940.c | 3 -
+ sound/soc/codecs/wm8960.c | 3 -
+ sound/soc/codecs/wm8962.c | 201 +-
+ sound/soc/codecs/wm8971.c | 27 +-
+ sound/soc/codecs/wm8978.c | 3 -
+ sound/soc/codecs/wm8988.c | 15 +-
+ sound/soc/codecs/wm8993.c | 7 +-
+ sound/soc/codecs/wm8994-tables.c | 16 +-
+ sound/soc/codecs/wm8994.c | 364 ++-
+ sound/soc/codecs/wm8994.h | 2 +
+ sound/soc/codecs/wm8995.c | 22 +-
+ sound/soc/codecs/wm8996.c | 319 +-
+ sound/soc/codecs/wm9081.c | 7 +-
+ sound/soc/codecs/wm9090.c | 6 +-
+ sound/soc/codecs/wm_hubs.c | 48 +-
+ sound/soc/codecs/wm_hubs.h | 3 +-
+ sound/soc/davinci/davinci-i2s.c | 5 +-
+ sound/soc/davinci/davinci-mcasp.c | 20 +-
+ sound/soc/davinci/davinci-pcm.c | 123 +-
+ sound/soc/ep93xx/edb93xx.c | 60 +-
+ sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
+ sound/soc/ep93xx/ep93xx-pcm.c | 1 +
+ sound/soc/ep93xx/simone.c | 64 +-
+ sound/soc/ep93xx/snappercl15.c | 53 +-
+ sound/soc/fsl/fsl_dma.c | 1 -
+ sound/soc/fsl/fsl_ssi.c | 206 +-
+ sound/soc/fsl/mpc8610_hpcd.c | 2 +-
+ sound/soc/fsl/p1022_ds.c | 4 +-
+ sound/soc/imx/Kconfig | 1 +
+ sound/soc/imx/imx-pcm-fiq.c | 11 +-
+ sound/soc/imx/imx-ssi.c | 8 +-
+ sound/soc/jz4740/jz4740-pcm.c | 2 +-
+ sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
+ sound/soc/mid-x86/mfld_machine.c | 2 -
+ sound/soc/mid-x86/sst_platform.c | 19 +-
+ sound/soc/mxs/Kconfig | 20 +
+ sound/soc/mxs/Makefile | 10 +
+ sound/soc/mxs/mxs-pcm.c | 359 ++
+ sound/soc/mxs/mxs-pcm.h | 43 +
+ sound/soc/mxs/mxs-saif.c | 797 +++
+ sound/soc/mxs/mxs-saif.h | 134 +
+ sound/soc/mxs/mxs-sgtl5000.c | 173 +
+ sound/soc/nuc900/nuc900-pcm.c | 5 +-
+ sound/soc/omap/Makefile | 2 +-
+ sound/soc/omap/am3517evm.c | 22 +-
+ sound/soc/omap/igep0020.c | 23 +-
+ sound/soc/omap/mcpdm.c | 470 --
+ sound/soc/omap/mcpdm.h | 153 -
+ sound/soc/omap/n810.c | 19 +-
+ sound/soc/omap/omap-mcbsp.c | 24 +-
+ sound/soc/omap/omap-mcpdm.c | 481 ++-
+ sound/soc/omap/omap-mcpdm.h | 107 +
+ sound/soc/omap/omap-pcm.c | 8 +
+ sound/soc/omap/omap3evm.c | 23 +-
+ sound/soc/omap/omap3pandora.c | 20 +-
+ sound/soc/omap/osk5912.c | 23 +-
+ sound/soc/omap/overo.c | 23 +-
+ sound/soc/omap/rx51.c | 20 +-
+ sound/soc/omap/sdp3430.c | 70 +-
+ sound/soc/omap/sdp4430.c | 22 +-
+ sound/soc/omap/zoom2.c | 70 +-
+ sound/soc/pxa/magician.c | 3 +-
+ sound/soc/pxa/raumfeld.c | 4 +-
+ sound/soc/pxa/spitz.c | 2 +-
+ sound/soc/pxa/z2.c | 2 +-
+ sound/soc/s6000/s6000-pcm.c | 1 -
+ sound/soc/samsung/Kconfig | 12 +-
+ sound/soc/samsung/ac97.c | 4 +-
+ sound/soc/samsung/i2s.c | 2 +-
+ sound/soc/samsung/jive_wm8750.c | 2 +-
+ sound/soc/samsung/pcm.c | 2 +-
+ sound/soc/samsung/s3c-i2s-v2.c | 1 +
+ sound/soc/samsung/s3c2412-i2s.c | 6 +-
+ sound/soc/samsung/s3c24xx-i2s.c | 6 +-
+ sound/soc/samsung/s3c24xx_simtec.c | 2 +-
+ sound/soc/samsung/s3c24xx_uda134x.c | 8 +-
+ sound/soc/samsung/smartq_wm8987.c | 2 +-
+ sound/soc/samsung/smdk_wm8580.c | 6 +-
+ sound/soc/samsung/smdk_wm8580pcm.c | 4 +-
+ sound/soc/samsung/spdif.c | 4 +-
+ sound/soc/samsung/speyside.c | 10 +-
+ sound/soc/samsung/speyside_wm8962.c | 41 +-
+ sound/soc/sh/fsi.c | 12 +-
+ sound/soc/sh/ssi.c | 2 +-
+ sound/soc/soc-cache.c | 7 -
+ sound/soc/soc-core.c | 47 +-
+ sound/soc/soc-dapm.c | 158 +-
+ sound/soc/soc-io.c | 357 +--
+ sound/soc/soc-pcm.c | 42 +-
+ sound/soc/tegra/tegra_i2s.c | 2 +-
+ sound/soc/tegra/tegra_spdif.c | 5 +-
+ sound/soc/txx9/txx9aclc-ac97.c | 2 +-
+ sound/soc/txx9/txx9aclc-generic.c | 2 +-
+ sound/sparc/amd7930.c | 2 +-
+ sound/usb/6fire/firmware.c | 25 +-
+ sound/usb/Makefile | 12 +-
+ sound/usb/card.c | 4 +-
+ sound/usb/card.h | 2 +
+ sound/usb/clock.c | 12 +-
+ sound/usb/endpoint.c | 1199 ++++--
+ sound/usb/endpoint.h | 20 +-
+ sound/usb/format.c | 4 +-
+ sound/usb/helper.c | 4 +-
+ sound/usb/helper.h | 2 +-
+ sound/usb/midi.c | 27 +
+ sound/usb/mixer.c | 19 +-
+ sound/usb/mixer_quirks.c | 10 +-
+ sound/usb/pcm.c | 34 +-
+ sound/usb/pcm.h | 3 +
+ sound/usb/quirks-table.h | 25 +
+ sound/usb/quirks.c | 16 +-
+ sound/usb/stream.c | 452 ++
+ sound/usb/stream.h | 12 +
+ sound/usb/urb.c | 941 ----
+ sound/usb/urb.h | 21 -
+ sound/usb/usbaudio.h | 1 +
+ 333 files changed, 23480 insertions(+), 10217 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8770.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8804.txt
+ create mode 100644 include/sound/adau1373.h
+ create mode 100644 include/sound/saif.h
+ create mode 100644 include/sound/wm1250-ev1.h
+ create mode 100644 include/sound/wm5100.h
+ delete mode 100644 sound/pci/hda/alc268_quirks.c
+ delete mode 100644 sound/pci/hda/alc269_quirks.c
+ delete mode 100644 sound/pci/hda/alc662_quirks.c
+ delete mode 100644 sound/pci/hda/alc680_quirks.c
+ delete mode 100644 sound/pci/hda/alc861_quirks.c
+ delete mode 100644 sound/pci/hda/alc861vd_quirks.c
+ create mode 100644 sound/pci/hda/hda_trace.h
+ create mode 100644 sound/soc/au1x/ac97c.c
+ create mode 100644 sound/soc/au1x/db1000.c
+ create mode 100644 sound/soc/au1x/dma.c
+ create mode 100644 sound/soc/au1x/i2sc.c
+ create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
+ create mode 100644 sound/soc/codecs/adau1373.c
+ create mode 100644 sound/soc/codecs/adau1373.h
+ create mode 100644 sound/soc/codecs/rt5631.c
+ create mode 100644 sound/soc/codecs/rt5631.h
+ create mode 100644 sound/soc/codecs/wm5100-tables.c
+ create mode 100644 sound/soc/codecs/wm5100.c
+ create mode 100644 sound/soc/codecs/wm5100.h
+ create mode 100644 sound/soc/mxs/Kconfig
+ create mode 100644 sound/soc/mxs/Makefile
+ create mode 100644 sound/soc/mxs/mxs-pcm.c
+ create mode 100644 sound/soc/mxs/mxs-pcm.h
+ create mode 100644 sound/soc/mxs/mxs-saif.c
+ create mode 100644 sound/soc/mxs/mxs-saif.h
+ create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
+ delete mode 100644 sound/soc/omap/mcpdm.c
+ delete mode 100644 sound/soc/omap/mcpdm.h
+ create mode 100644 sound/soc/omap/omap-mcpdm.h
+ create mode 100644 sound/usb/stream.c
+ create mode 100644 sound/usb/stream.h
+ delete mode 100644 sound/usb/urb.c
+ delete mode 100644 sound/usb/urb.h
+Merging sound-asoc/for-next
+$ git merge sound-asoc/for-next
+Merge made by recursive.
+ drivers/regulator/core.c | 9 ++-
+ include/sound/soc-dapm.h | 3 +
+ include/sound/soc.h | 85 ++++++++-------
+ sound/soc/codecs/ak4671.c | 2 -
+ sound/soc/codecs/cs4270.c | 8 +-
+ sound/soc/codecs/cs42l51.c | 9 +-
+ sound/soc/codecs/lm4857.c | 2 +-
+ sound/soc/codecs/tlv320aic23.c | 14 +--
+ sound/soc/codecs/tlv320aic32x4.c | 4 +-
+ sound/soc/codecs/twl4030.c | 48 ++------
+ sound/soc/codecs/twl6040.c | 76 ++++----------
+ sound/soc/codecs/wm8350.c | 43 +++-----
+ sound/soc/codecs/wm8523.c | 1 -
+ sound/soc/codecs/wm8580.c | 38 +++-----
+ sound/soc/codecs/wm8711.c | 4 +-
+ sound/soc/codecs/wm8750.c | 26 ++---
+ sound/soc/codecs/wm8962.c | 21 ++--
+ sound/soc/codecs/wm8971.c | 2 +-
+ sound/soc/codecs/wm8974.c | 2 +-
+ sound/soc/codecs/wm8988.c | 1 -
+ sound/soc/codecs/wm8990.c | 36 ++++---
+ sound/soc/codecs/wm8991.c | 2 +-
+ sound/soc/codecs/wm8994.c | 2 +-
+ sound/soc/codecs/wm9090.c | 1 -
+ sound/soc/codecs/wm_hubs.c | 20 +---
+ sound/soc/imx/imx-pcm-fiq.c | 1 -
+ sound/soc/imx/imx-ssi.c | 1 -
+ sound/soc/imx/imx-ssi.h | 6 -
+ sound/soc/soc-core.c | 163 ++++++----------------------
+ sound/soc/soc-dapm.c | 217 +++++++++++++++++++++++++++-----------
+ sound/soc/soc-jack.c | 2 +
+ 31 files changed, 378 insertions(+), 471 deletions(-)
+Merging cpufreq/next
+$ git merge cpufreq/next
+Merge made by recursive.
+ Documentation/cpu-freq/governors.txt | 2 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 2 +-
+ drivers/cpufreq/db8500-cpufreq.c | 7 +-
+ drivers/cpufreq/e_powersaver.c | 135 +++++++++++++++++++++++++++++++---
+ drivers/cpufreq/exynos4210-cpufreq.c | 129 +++++++++++++++++++++++++++++++-
+ 5 files changed, 254 insertions(+), 21 deletions(-)
+Merging quilt/rr
+$ git merge quilt/rr
+Auto-merging drivers/net/virtio_net.c
+Merge made by recursive.
+ arch/x86/lguest/boot.c | 10 ++++
+ drivers/char/virtio_console.c | 120 +++++++++++++++++++++++++++--------------
+ drivers/lguest/core.c | 2 +-
+ drivers/net/virtio_net.c | 14 ++---
+ include/linux/virtio.h | 4 +-
+ include/linux/virtio_config.h | 3 +
+ include/linux/virtio_ring.h | 6 +-
+ kernel/kmod.c | 4 +-
+ 8 files changed, 106 insertions(+), 57 deletions(-)
+Merging input/next
+$ git merge input/next
+Removing Documentation/ABI/testing/sysfs-wacom
+Auto-merging drivers/input/keyboard/adp5588-keys.c
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging drivers/input/misc/Makefile
+Auto-merging drivers/input/misc/twl6040-vibra.c
+Auto-merging drivers/input/tablet/wacom_sys.c
+Auto-merging drivers/input/touchscreen/wacom_w8001.c
+Auto-merging include/linux/input.h
+Merge made by recursive.
+ Documentation/ABI/testing/sysfs-driver-wacom | 72 +++
+ Documentation/ABI/testing/sysfs-wacom | 10 -
+ Documentation/input/elantech.txt | 295 +++++++++++-
+ Documentation/input/multi-touch-protocol.txt | 14 +
+ drivers/input/input-mt.c | 1 +
+ drivers/input/input-polldev.c | 6 +-
+ drivers/input/keyboard/adp5588-keys.c | 2 +-
+ drivers/input/keyboard/davinci_keyscan.c | 2 +-
+ drivers/input/keyboard/ep93xx_keypad.c | 2 +-
+ drivers/input/keyboard/gpio_keys.c | 24 +-
+ drivers/input/keyboard/imx_keypad.c | 2 +-
+ drivers/input/keyboard/jornada720_kbd.c | 2 +-
+ drivers/input/keyboard/matrix_keypad.c | 1 -
+ drivers/input/keyboard/pxa27x_keypad.c | 2 +-
+ drivers/input/keyboard/pxa930_rotary.c | 2 +-
+ drivers/input/keyboard/tc3589x-keypad.c | 2 +-
+ drivers/input/keyboard/tegra-kbc.c | 85 ++--
+ drivers/input/keyboard/w90p910_keypad.c | 2 +-
+ drivers/input/misc/Kconfig | 45 ++-
+ drivers/input/misc/Makefile | 4 +-
+ drivers/input/misc/ad714x-i2c.c | 4 +-
+ drivers/input/misc/bma150.c | 691 ++++++++++++++++++++++++++
+ drivers/input/misc/ixp4xx-beeper.c | 2 +-
+ drivers/input/misc/pm8xxx-vibrator.c | 296 +++++++++++
+ drivers/input/misc/twl6040-vibra.c | 2 +-
+ drivers/input/mouse/elantech.c | 664 ++++++++++++++++++++++---
+ drivers/input/mouse/elantech.h | 57 ++-
+ drivers/input/mouse/pxa930_trkball.c | 2 +-
+ drivers/input/mouse/synaptics.c | 527 ++++++++++++++++++--
+ drivers/input/mouse/synaptics.h | 27 +-
+ drivers/input/mouse/synaptics_i2c.c | 2 +-
+ drivers/input/tablet/wacom.h | 10 +-
+ drivers/input/tablet/wacom_sys.c | 356 ++++++++++++--
+ drivers/input/touchscreen/Kconfig | 12 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
+ drivers/input/touchscreen/h3600_ts_input.c | 4 +-
+ drivers/input/touchscreen/hp680_ts_input.c | 2 +-
+ drivers/input/touchscreen/jornada720_ts.c | 2 +-
+ drivers/input/touchscreen/lpc32xx_ts.c | 2 +-
+ drivers/input/touchscreen/penmount.c | 199 +++++++-
+ drivers/input/touchscreen/s3c2410_ts.c | 2 +-
+ drivers/input/touchscreen/tsc2007.c | 194 ++++----
+ drivers/input/touchscreen/tsc40.c | 184 +++++++
+ drivers/input/touchscreen/w90p910_ts.c | 2 +-
+ drivers/input/touchscreen/wacom_w8001.c | 29 +-
+ include/linux/bma150.h | 46 ++
+ include/linux/input.h | 1 +
+ include/linux/input/adxl34x.h | 21 +-
+ include/linux/serio.h | 1 +
+ 50 files changed, 3503 insertions(+), 416 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-wacom
+ delete mode 100644 Documentation/ABI/testing/sysfs-wacom
+ create mode 100644 drivers/input/misc/bma150.c
+ create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
+ create mode 100644 drivers/input/touchscreen/tsc40.c
+ create mode 100644 include/linux/bma150.h
+Merging input-mt/next
+$ git merge input-mt/next
+Already up-to-date.
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Auto-merging block/blk-core.c
+Auto-merging block/blk-sysfs.c
+Auto-merging block/genhd.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/md.h
+Auto-merging drivers/md/multipath.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/raid5.c
+Auto-merging fs/block_dev.c
+Auto-merging include/linux/genhd.h
+Merge made by recursive.
+ .../ABI/testing/sysfs-bus-pci-devices-cciss | 7 +
+ Documentation/blockdev/cciss.txt | 10 +
+ arch/m68k/emu/nfblock.c | 3 +-
+ arch/powerpc/sysdev/axonram.c | 8 +-
+ block/blk-core.c | 261 +-
+ block/blk-sysfs.c | 6 +-
+ block/elevator.c | 2 +-
+ block/genhd.c | 4 +-
+ block/ioctl.c | 2 +-
+ drivers/block/Kconfig | 2 +
+ drivers/block/Makefile | 1 +
+ drivers/block/aoe/aoeblk.c | 14 +-
+ drivers/block/brd.c | 4 +-
+ drivers/block/cciss.c | 69 +-
+ drivers/block/cciss.h | 1 +
+ drivers/block/cpqarray.c | 2 +-
+ drivers/block/drbd/drbd_int.h | 2 +-
+ drivers/block/drbd/drbd_req.c | 8 +-
+ drivers/block/loop.c | 116 +-
+ drivers/block/mtip32xx/Kconfig | 9 +
+ drivers/block/mtip32xx/Makefile | 5 +
+ drivers/block/mtip32xx/mtip32xx.c | 3567 ++++++++++++++++++++
+ drivers/block/mtip32xx/mtip32xx.h | 408 +++
+ drivers/block/nbd.c | 69 +-
+ drivers/block/pktcdvd.c | 11 +-
+ drivers/block/ps3vram.c | 6 +-
+ drivers/block/umem.c | 4 +-
+ drivers/md/dm.c | 25 +-
+ drivers/md/faulty.c | 14 +-
+ drivers/md/linear.c | 17 +-
+ drivers/md/md.c | 12 +-
+ drivers/md/md.h | 2 +-
+ drivers/md/multipath.c | 8 +-
+ drivers/md/raid0.c | 22 +-
+ drivers/md/raid1.c | 8 +-
+ drivers/md/raid10.c | 19 +-
+ drivers/md/raid5.c | 8 +-
+ drivers/s390/block/dcssblk.c | 7 +-
+ drivers/s390/block/xpram.c | 5 +-
+ drivers/staging/zram/zram_drv.c | 8 +-
+ fs/block_dev.c | 2 +-
+ include/linux/blkdev.h | 27 +-
+ include/linux/genhd.h | 6 +-
+ include/linux/loop.h | 1 +
+ 44 files changed, 4449 insertions(+), 343 deletions(-)
+ create mode 100644 drivers/block/mtip32xx/Kconfig
+ create mode 100644 drivers/block/mtip32xx/Makefile
+ create mode 100644 drivers/block/mtip32xx/mtip32xx.c
+ create mode 100644 drivers/block/mtip32xx/mtip32xx.h
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Recorded preimage for 'drivers/md/dm-table.c'
+Auto-merging drivers/md/dm-table.c
+CONFLICT (content): Merge conflict in drivers/md/dm-table.c
+Auto-merging drivers/md/dm.c
+Auto-merging include/linux/device-mapper.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/md/dm-table.c'.
+[master 632c25c] Merge branch 'quilt/device-mapper'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/device-mapper/persistent-data.txt | 84 +
+ Documentation/device-mapper/thin-provisioning.txt | 275 +++
+ drivers/md/Kconfig | 9 +
+ drivers/md/Makefile | 3 +
+ drivers/md/dm-kcopyd.c | 31 +-
+ drivers/md/dm-table.c | 52 +
+ drivers/md/dm-thin-metadata.c | 1406 ++++++++++++
+ drivers/md/dm-thin-metadata.h | 168 ++
+ drivers/md/dm-thin.c | 2280 ++++++++++++++++++++
+ drivers/md/dm.c | 12 +-
+ drivers/md/persistent-data/Kconfig | 7 +
+ drivers/md/persistent-data/Makefile | 9 +
+ drivers/md/persistent-data/dm-block-manager.c | 998 +++++++++
+ drivers/md/persistent-data/dm-block-manager.h | 134 ++
+ drivers/md/persistent-data/dm-btree-internal.h | 133 ++
+ drivers/md/persistent-data/dm-btree-remove.c | 571 +++++
+ drivers/md/persistent-data/dm-btree-spine.c | 222 ++
+ drivers/md/persistent-data/dm-btree.c | 861 ++++++++
+ drivers/md/persistent-data/dm-btree.h | 158 ++
+ .../persistent-data/dm-persistent-data-internal.h | 20 +
+ drivers/md/persistent-data/dm-space-map-common.h | 94 +
+ drivers/md/persistent-data/dm-space-map-disk.c | 663 ++++++
+ drivers/md/persistent-data/dm-space-map-disk.h | 25 +
+ drivers/md/persistent-data/dm-space-map-metadata.c | 956 ++++++++
+ drivers/md/persistent-data/dm-space-map-metadata.h | 33 +
+ drivers/md/persistent-data/dm-space-map.h | 118 +
+ .../md/persistent-data/dm-transaction-manager.c | 414 ++++
+ .../md/persistent-data/dm-transaction-manager.h | 130 ++
+ include/linux/device-mapper.h | 35 +-
+ include/linux/dm-kcopyd.h | 4 +
+ 30 files changed, 9891 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/device-mapper/persistent-data.txt
+ create mode 100644 Documentation/device-mapper/thin-provisioning.txt
+ create mode 100644 drivers/md/dm-thin-metadata.c
+ create mode 100644 drivers/md/dm-thin-metadata.h
+ create mode 100644 drivers/md/dm-thin.c
+ create mode 100644 drivers/md/persistent-data/Kconfig
+ create mode 100644 drivers/md/persistent-data/Makefile
+ create mode 100644 drivers/md/persistent-data/dm-block-manager.c
+ create mode 100644 drivers/md/persistent-data/dm-block-manager.h
+ create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
+ create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
+ create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
+ create mode 100644 drivers/md/persistent-data/dm-btree.c
+ create mode 100644 drivers/md/persistent-data/dm-btree.h
+ create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
+ create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
+ create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map.h
+ create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
+ create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
+Merging embedded/master
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master
+$ git merge pcmcia/master
+Already up-to-date.
+Merging battery/master
+$ git merge battery/master
+Merge made by recursive.
+ .../bindings/power_supply/olpc_battery.txt | 5 +
+ drivers/power/ds2780_battery.c | 2 +-
+ drivers/power/max17042_battery.c | 17 ++--
+ drivers/power/max8903_charger.c | 2 +-
+ drivers/power/max8997_charger.c | 1 +
+ drivers/power/max8998_charger.c | 2 +
+ drivers/power/olpc_battery.c | 79 ++++++++++++++-----
+ drivers/power/pda_power.c | 74 ++++++++++++++++--
+ drivers/power/power_supply_sysfs.c | 4 +-
+ drivers/power/wm831x_power.c | 44 +++++++----
+ drivers/power/z2_battery.c | 2 +-
+ include/linux/pda_power.h | 2 +
+ 12 files changed, 175 insertions(+), 59 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
+Merging leds/for-mm
+$ git merge leds/for-mm
+Resolved 'drivers/leds/Kconfig' using previous resolution.
+Auto-merging drivers/leds/Kconfig
+CONFLICT (content): Merge conflict in drivers/leds/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f6fad29] Merge remote-tracking branch 'leds/for-mm'
+$ git diff -M --stat --summary HEAD^..
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Already up-to-date.
+Merging mmc/mmc-next
+$ git merge mmc/mmc-next
+Resolved 'drivers/mmc/core/core.c' using previous resolution.
+Resolved 'drivers/mmc/core/sd.c' using previous resolution.
+Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
+Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Auto-merging drivers/mmc/card/block.c
+Auto-merging drivers/mmc/core/core.c
+CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
+Auto-merging drivers/mmc/core/host.c
+Auto-merging drivers/mmc/core/sd.c
+CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
+Auto-merging drivers/mmc/host/Kconfig
+Auto-merging drivers/mmc/host/at91_mci.c
+Auto-merging drivers/mmc/host/mmci.c
+Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
+Auto-merging drivers/mmc/host/sdhci-s3c.c
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d5b835c] Merge remote-tracking branch 'mmc/mmc-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mmc/nvidia-sdhci.txt | 27 +
+ Documentation/fault-injection/fault-injection.txt | 8 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
+ arch/arm/mach-msm/devices-msm7x00.c | 24 -
+ arch/arm/mach-msm/devices-qsd8x50.c | 24 -
+ arch/arm/mach-msm/include/mach/mmc.h | 9 +-
+ arch/arm/mach-shmobile/board-ag5evm.c | 6 +
+ arch/arm/mach-shmobile/board-mackerel.c | 6 +
+ drivers/mmc/card/block.c | 223 ++++--
+ drivers/mmc/card/mmc_test.c | 30 +
+ drivers/mmc/card/queue.c | 2 +-
+ drivers/mmc/core/core.c | 172 ++++-
+ drivers/mmc/core/core.h | 1 +
+ drivers/mmc/core/debugfs.c | 27 +
+ drivers/mmc/core/host.c | 11 +
+ drivers/mmc/core/mmc.c | 120 +++-
+ drivers/mmc/core/mmc_ops.c | 4 +-
+ drivers/mmc/core/quirks.c | 11 +
+ drivers/mmc/core/sd.c | 3 +-
+ drivers/mmc/core/sd_ops.c | 8 +-
+ drivers/mmc/core/sdio.c | 3 +-
+ drivers/mmc/core/sdio_ops.c | 9 +-
+ drivers/mmc/host/Kconfig | 16 +-
+ drivers/mmc/host/at91_mci.c | 6 +-
+ drivers/mmc/host/atmel-mci-regs.h | 220 +++---
+ drivers/mmc/host/atmel-mci.c | 823 +++++++++++++-------
+ drivers/mmc/host/dw_mmc.c | 36 +-
+ drivers/mmc/host/dw_mmc.h | 2 +-
+ drivers/mmc/host/mmci.c | 2 +-
+ drivers/mmc/host/msm_sdcc.c | 78 ++-
+ drivers/mmc/host/msm_sdcc.h | 6 +-
+ drivers/mmc/host/omap_hsmmc.c | 5 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 80 ++-
+ drivers/mmc/host/sdhci-of-esdhc.c | 18 +-
+ drivers/mmc/host/sdhci-pci.c | 74 ++
+ drivers/mmc/host/sdhci-pxav2.c | 4 +-
+ drivers/mmc/host/sdhci-s3c.c | 28 +-
+ drivers/mmc/host/sdhci-spear.c | 2 -
+ drivers/mmc/host/sdhci-tegra.c | 54 +-
+ drivers/mmc/host/sdhci.c | 9 +
+ drivers/mmc/host/sdhci.h | 2 +-
+ drivers/mmc/host/sh_mmcif.c | 20 +-
+ drivers/mmc/host/sh_mobile_sdhi.c | 98 ++-
+ drivers/mmc/host/tmio_mmc.c | 4 +-
+ drivers/mmc/host/tmio_mmc.h | 7 +
+ drivers/mmc/host/tmio_mmc_pio.c | 149 +++--
+ include/linux/atmel-mci.h | 4 +-
+ include/linux/atmel_pdc.h | 2 +
+ include/linux/mmc/card.h | 8 +
+ include/linux/mmc/core.h | 3 +
+ include/linux/mmc/host.h | 20 +
+ include/linux/mmc/mmc.h | 18 +
+ include/linux/mmc/sh_mmcif.h | 4 +-
+ include/linux/mmc/sh_mobile_sdhi.h | 4 +
+ lib/Kconfig.debug | 11 +
+ lib/fault-inject.c | 5 +-
+ 56 files changed, 1859 insertions(+), 693 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Merge made by recursive.
+Merging slab/for-next
+$ git merge slab/for-next
+Merge made by recursive.
+ Documentation/vm/00-INDEX | 2 -
+ Documentation/vm/slub.txt | 2 +-
+ include/linux/mm_types.h | 14 +-
+ include/linux/slub_def.h | 4 +
+ mm/slab.c | 19 +-
+ mm/slub.c | 558 +++++++++++++++++++++++++++++++--------------
+ tools/slub/slabinfo.c | 8 +
+ 7 files changed, 425 insertions(+), 182 deletions(-)
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Recorded preimage for 'drivers/md/faulty.c'
+Recorded preimage for 'drivers/md/linear.c'
+Recorded preimage for 'drivers/md/md.c'
+Recorded preimage for 'drivers/md/md.h'
+Recorded preimage for 'drivers/md/multipath.c'
+Recorded preimage for 'drivers/md/raid0.c'
+Recorded preimage for 'drivers/md/raid1.c'
+Recorded preimage for 'drivers/md/raid5.c'
+Auto-merging drivers/md/dm-raid.c
+Auto-merging drivers/md/faulty.c
+CONFLICT (content): Merge conflict in drivers/md/faulty.c
+Auto-merging drivers/md/linear.c
+CONFLICT (content): Merge conflict in drivers/md/linear.c
+Auto-merging drivers/md/md.c
+CONFLICT (content): Merge conflict in drivers/md/md.c
+Auto-merging drivers/md/md.h
+CONFLICT (content): Merge conflict in drivers/md/md.h
+Auto-merging drivers/md/multipath.c
+CONFLICT (content): Merge conflict in drivers/md/multipath.c
+Auto-merging drivers/md/raid0.c
+CONFLICT (content): Merge conflict in drivers/md/raid0.c
+Auto-merging drivers/md/raid1.c
+CONFLICT (content): Merge conflict in drivers/md/raid1.c
+Auto-merging drivers/md/raid10.c
+CONFLICT (content): Merge conflict in drivers/md/raid10.c
+Auto-merging drivers/md/raid5.c
+CONFLICT (content): Merge conflict in drivers/md/raid5.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/md/faulty.c'.
+Recorded resolution for 'drivers/md/linear.c'.
+Recorded resolution for 'drivers/md/md.c'.
+Recorded resolution for 'drivers/md/md.h'.
+Recorded resolution for 'drivers/md/multipath.c'.
+Recorded resolution for 'drivers/md/raid0.c'.
+Recorded resolution for 'drivers/md/raid1.c'.
+Recorded resolution for 'drivers/md/raid10.c'.
+Recorded resolution for 'drivers/md/raid5.c'.
+[master bbe522c] Merge remote-tracking branch 'md/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/md/bitmap.c | 154 +++++++-------
+ drivers/md/bitmap.h | 12 +-
+ drivers/md/dm-raid.c | 6 +-
+ drivers/md/faulty.c | 36 ++--
+ drivers/md/linear.c | 44 ++--
+ drivers/md/linear.h | 12 +-
+ drivers/md/md.c | 586 ++++++++++++++++++++++++------------------------
+ drivers/md/md.h | 145 ++++++------
+ drivers/md/multipath.c | 62 +++---
+ drivers/md/multipath.h | 10 +-
+ drivers/md/raid0.c | 189 +++++++---------
+ drivers/md/raid0.h | 10 +-
+ drivers/md/raid1.c | 309 +++++++++++++-------------
+ drivers/md/raid1.h | 84 +++++---
+ drivers/md/raid10.c | 254 +++++++++++-----------
+ drivers/md/raid10.h | 20 +-
+ drivers/md/raid5.c | 352 +++++++++++++----------------
+ drivers/md/raid5.h | 20 +-
+ 18 files changed, 1113 insertions(+), 1192 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 56e135a Merge remote-tracking branch 'slab/for-next'
+Merging refs/next/20111006/md
+$ git merge refs/next/20111006/md
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/md.h
+Merge made by recursive.
+ drivers/md/bitmap.c | 71 +++++++++++++++++++++++++++-----------------------
+ drivers/md/md.c | 8 ++++-
+ drivers/md/md.h | 2 +-
+ 3 files changed, 45 insertions(+), 36 deletions(-)
+Merging mfd/for-next
+$ git merge mfd/for-next
+Resolved 'arch/arm/mach-u300/include/mach/irqs.h' using previous resolution.
+Auto-merging arch/arm/mach-imx/mach-mx27_3ds.c
+Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c
+Auto-merging arch/arm/mach-imx/mach-mx31lite.c
+Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
+Auto-merging arch/arm/mach-imx/mach-pcm038.c
+Auto-merging arch/arm/mach-mx5/mx51_efika.c
+Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
+Auto-merging arch/arm/mach-u300/include/mach/irqs.h
+CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
+Auto-merging arch/arm/mach-ux500/board-u5500.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging drivers/input/misc/Makefile
+Removing drivers/mfd/ab3550-core.c
+Auto-merging drivers/mfd/menelaus.c
+Auto-merging drivers/mfd/wm8994-core.c
+Auto-merging include/linux/mfd/wm8994/core.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ed78e29] Merge remote-tracking branch 'mfd/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-imx/mach-mx27_3ds.c | 3 +-
+ arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-mx31lite.c | 3 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 15 +-
+ arch/arm/mach-imx/mach-pcm038.c | 3 +-
+ arch/arm/mach-mx5/mx51_efika.c | 2 +-
+ arch/arm/mach-omap2/Kconfig | 1 -
+ arch/arm/mach-omap2/board-omap3beagle.c | 9 +-
+ arch/arm/mach-u300/i2c.c | 51 +--
+ arch/arm/mach-u300/include/mach/irqs.h | 10 +-
+ arch/arm/mach-ux500/board-u5500.c | 29 +-
+ arch/x86/include/asm/intel_scu_ipc.h | 22 +
+ arch/x86/platform/mrst/mrst.c | 174 ++++-
+ drivers/gpio/Kconfig | 3 +-
+ drivers/hwmon/mc13783-adc.c | 12 +-
+ drivers/i2c/busses/Kconfig | 1 -
+ drivers/input/misc/Kconfig | 10 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/mc13783-pwrbutton.c | 282 ++++++
+ drivers/input/touchscreen/mc13783_ts.c | 34 +-
+ drivers/leds/leds-asic3.c | 35 +-
+ drivers/leds/leds-mc13783.c | 60 +-
+ drivers/media/radio/Kconfig | 1 -
+ drivers/mfd/Kconfig | 64 +-
+ drivers/mfd/Makefile | 4 +-
+ drivers/mfd/aat2870-core.c | 2 +-
+ drivers/mfd/ab3100-core.c | 2 +-
+ drivers/mfd/ab3550-core.c | 1380 -----------------------------
+ drivers/mfd/ab5500-core.c | 1439 +++++++++++++++++++++++++++++++
+ drivers/mfd/ab5500-core.h | 87 ++
+ drivers/mfd/ab5500-debugfs.c | 806 +++++++++++++++++
+ drivers/mfd/ab5500-debugfs.h | 22 +
+ drivers/mfd/ab8500-gpadc.c | 56 +-
+ drivers/mfd/asic3.c | 26 +-
+ drivers/mfd/da903x.c | 2 +-
+ drivers/mfd/intel_msic.c | 501 +++++++++++
+ drivers/mfd/jz4740-adc.c | 2 +-
+ drivers/mfd/max8997.c | 27 +-
+ drivers/mfd/mc13xxx-core.c | 116 ++--
+ drivers/mfd/menelaus.c | 2 +-
+ drivers/mfd/pcf50633-core.c | 114 +--
+ drivers/mfd/tc3589x.c | 2 +
+ drivers/mfd/timberdale.c | 9 +-
+ drivers/mfd/tps65912-core.c | 6 +-
+ drivers/mfd/twl-core.c | 2 +-
+ drivers/mfd/twl4030-irq.c | 342 +++-----
+ drivers/mfd/twl4030-madc.c | 22 +
+ drivers/mfd/twl6030-irq.c | 75 ++-
+ drivers/mfd/wm831x-core.c | 11 +
+ drivers/mfd/wm831x-i2c.c | 8 +
+ drivers/mfd/wm831x-irq.c | 24 +-
+ drivers/mfd/wm831x-spi.c | 8 +
+ drivers/mfd/wm8994-core.c | 53 ++
+ drivers/regulator/mc13783-regulator.c | 6 +-
+ include/linux/i2c/twl4030-madc.h | 4 +
+ include/linux/mfd/ab5500/ab5500.h | 140 +++
+ include/linux/mfd/ab8500/gpadc.h | 5 +-
+ include/linux/mfd/abx500.h | 52 +--
+ include/linux/mfd/intel_msic.h | 456 ++++++++++
+ include/linux/mfd/max8997-private.h | 1 -
+ include/linux/mfd/mc13783.h | 111 ---
+ include/linux/mfd/mc13xxx.h | 38 +-
+ include/linux/mfd/pcf50633/core.h | 3 +-
+ include/linux/mfd/wm831x/core.h | 4 +
+ include/linux/mfd/wm831x/pdata.h | 3 +
+ include/linux/mfd/wm8994/core.h | 2 +
+ include/linux/mfd/wm8994/pdata.h | 7 +
+ 67 files changed, 4690 insertions(+), 2119 deletions(-)
+ create mode 100644 drivers/input/misc/mc13783-pwrbutton.c
+ delete mode 100644 drivers/mfd/ab3550-core.c
+ create mode 100644 drivers/mfd/ab5500-core.c
+ create mode 100644 drivers/mfd/ab5500-core.h
+ create mode 100644 drivers/mfd/ab5500-debugfs.c
+ create mode 100644 drivers/mfd/ab5500-debugfs.h
+ create mode 100644 drivers/mfd/intel_msic.c
+ create mode 100644 include/linux/mfd/ab5500/ab5500.h
+ create mode 100644 include/linux/mfd/intel_msic.h
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Already up-to-date.
+Merging drm/drm-next
+$ git merge drm/drm-next
+Already up-to-date.
+Merging fbdev/fbdev-next
+$ git merge fbdev/fbdev-next
+Resolved 'drivers/video/Kconfig' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Auto-merging drivers/video/Kconfig
+CONFLICT (content): Merge conflict in drivers/video/Kconfig
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/video/backlight/adp8870_bl.c
+Removing drivers/video/sh_mobile_meram.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 49d6b1b] Merge remote-tracking branch 'fbdev/fbdev-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/fb/udlfb.txt | 39 +-
+ MAINTAINERS | 6 +
+ arch/arm/mach-shmobile/board-mackerel.c | 1 +
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 24 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c | 47 +-
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 55 +-
+ arch/powerpc/sysdev/fsl_soc.h | 25 +-
+ drivers/staging/xgifb/XGI_main_26.c | 22 +-
+ drivers/video/68328fb.c | 4 +-
+ drivers/video/Kconfig | 34 +-
+ drivers/video/Makefile | 2 +
+ drivers/video/acornfb.c | 5 +-
+ drivers/video/arkfb.c | 9 +-
+ drivers/video/atmel_lcdfb.c | 15 +-
+ drivers/video/aty/radeon_base.c | 10 +-
+ drivers/video/au1100fb.c | 181 +--
+ drivers/video/au1100fb.h | 6 +-
+ drivers/video/au1200fb.c | 299 ++---
+ drivers/video/backlight/adp8860_bl.c | 1 -
+ drivers/video/backlight/adp8870_bl.c | 1 -
+ drivers/video/bf54x-lq043fb.c | 2 +-
+ drivers/video/bfin-lq035q1-fb.c | 2 +-
+ drivers/video/bfin-t350mcqb-fb.c | 2 +-
+ drivers/video/bfin_adv7393fb.c | 2 +-
+ drivers/video/carminefb.c | 6 +-
+ drivers/video/controlfb.c | 2 +-
+ drivers/video/da8xx-fb.c | 186 +++-
+ drivers/video/fb-puv3.c | 4 +-
+ drivers/video/fb_defio.c | 3 +-
+ drivers/video/fbmem.c | 3 -
+ drivers/video/fbmon.c | 21 +-
+ drivers/video/fbsysfs.c | 3 +
+ drivers/video/fsl-diu-fb.c | 992 +++++++-------
+ drivers/video/g364fb.c | 5 +-
+ drivers/video/grvga.c | 579 ++++++++
+ drivers/video/gxt4500.c | 4 +-
+ drivers/video/hgafb.c | 4 +-
+ drivers/video/imsttfb.c | 2 +-
+ drivers/video/intelfb/intelfbhw.c | 6 +-
+ drivers/video/mb862xx/mb862xx-i2c.c | 2 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c | 6 +-
+ drivers/video/modedb.c | 444 +++---
+ drivers/video/msm/mddi.c | 2 +-
+ drivers/video/msm/mdp.c | 6 +-
+ drivers/video/mx3fb.c | 19 +-
+ drivers/video/mxsfb.c | 1 +
+ drivers/video/neofb.c | 4 +-
+ drivers/video/nuc900fb.c | 3 +-
+ drivers/video/omap2/displays/panel-taal.c | 2 +-
+ drivers/video/platinumfb.c | 2 +-
+ drivers/video/pm2fb.c | 6 +-
+ drivers/video/pm3fb.c | 6 +-
+ drivers/video/ps3fb.c | 2 +-
+ drivers/video/pxa3xx-gcu.c | 4 +-
+ drivers/video/pxafb.c | 2 +-
+ drivers/video/s3c-fb.c | 117 ++-
+ drivers/video/s3c2410fb.c | 3 +-
+ drivers/video/s3fb.c | 9 +-
+ drivers/video/sa1100fb.c | 3 +-
+ drivers/video/savage/savagefb_driver.c | 16 +-
+ drivers/video/sh_mobile_hdmi.c | 47 +-
+ drivers/video/sh_mobile_lcdcfb.c | 1162 ++++++++--------
+ drivers/video/sh_mobile_lcdcfb.h | 12 +-
+ drivers/video/sh_mobile_meram.c | 208 +++-
+ drivers/video/sh_mobile_meram.h | 41 -
+ drivers/video/sis/sis_main.c | 30 +-
+ drivers/video/skeletonfb.c | 2 +-
+ drivers/video/sm501fb.c | 6 +-
+ drivers/video/smscufx.c | 1994 ++++++++++++++++++++++++++
+ drivers/video/tmiofb.c | 2 +-
+ drivers/video/tridentfb.c | 4 +-
+ drivers/video/udlfb.c | 187 ++-
+ drivers/video/valkyriefb.c | 2 +-
+ drivers/video/vfb.c | 4 +-
+ drivers/video/vga16fb.c | 2 +-
+ drivers/video/via/dvi.c | 34 +-
+ drivers/video/via/dvi.h | 3 +-
+ drivers/video/via/global.c | 2 +
+ drivers/video/via/global.h | 2 +
+ drivers/video/via/hw.c | 544 ++------
+ drivers/video/via/hw.h | 285 +----
+ drivers/video/via/lcd.c | 53 +-
+ drivers/video/via/lcd.h | 7 +-
+ drivers/video/via/share.h | 23 +-
+ drivers/video/via/via-core.c | 2 +-
+ drivers/video/via/via_modesetting.c | 104 ++
+ drivers/video/via/via_modesetting.h | 23 +
+ drivers/video/via/viafbdev.c | 182 ++--
+ drivers/video/via/viamode.c | 60 +-
+ drivers/video/via/viamode.h | 4 +-
+ drivers/video/vt8500lcdfb.c | 6 +-
+ drivers/video/vt8623fb.c | 9 +-
+ drivers/video/xilinxfb.c | 1 -
+ include/linux/fsl-diu-fb.h | 92 +-
+ include/video/sh_mobile_lcdc.h | 135 ++-
+ include/video/udlfb.h | 1 +
+ 96 files changed, 5526 insertions(+), 3022 deletions(-)
+ create mode 100644 drivers/video/grvga.c
+ delete mode 100644 drivers/video/sh_mobile_meram.h
+ create mode 100644 drivers/video/smscufx.c
+Merging viafb/viafb-next
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next
+$ git merge omap_dss2/for-next
+Resolved 'arch/arm/mach-omap2/board-2430sdp.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/board-4430sdp.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/board-apollon.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/board-h4.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/board-ldp.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/board-rx51.c' using previous resolution.
+Auto-merging arch/arm/mach-omap2/board-2430sdp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-2430sdp.c
+Auto-merging arch/arm/mach-omap2/board-3430sdp.c
+Auto-merging arch/arm/mach-omap2/board-4430sdp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
+Auto-merging arch/arm/mach-omap2/board-am3517evm.c
+Auto-merging arch/arm/mach-omap2/board-apollon.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-apollon.c
+Auto-merging arch/arm/mach-omap2/board-cm-t35.c
+Auto-merging arch/arm/mach-omap2/board-devkit8000.c
+Auto-merging arch/arm/mach-omap2/board-h4.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-h4.c
+Auto-merging arch/arm/mach-omap2/board-igep0020.c
+Auto-merging arch/arm/mach-omap2/board-ldp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
+Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
+Auto-merging arch/arm/mach-omap2/board-omap3evm.c
+Auto-merging arch/arm/mach-omap2/board-omap3pandora.c
+Auto-merging arch/arm/mach-omap2/board-omap3stalker.c
+Auto-merging arch/arm/mach-omap2/board-omap3touchbook.c
+Auto-merging arch/arm/mach-omap2/board-omap4panda.c
+Auto-merging arch/arm/mach-omap2/board-overo.c
+Auto-merging arch/arm/mach-omap2/board-rx51.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
+Auto-merging drivers/media/video/omap/omap_vout.c
+Removing drivers/video/omap/lcd_2430sdp.c
+CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
+Removing drivers/video/omap/lcd_h4.c
+CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
+Removing drivers/video/omap/lcd_omap3beagle.c
+Removing drivers/video/omap/lcd_omap3evm.c
+CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
+Auto-merging drivers/video/omap2/displays/panel-taal.c
+Auto-merging drivers/video/omap2/dss/hdmi_panel.c
+Auto-merging drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
+arch/arm/mach-omap2/board-2430sdp.c: needs merge
+arch/arm/mach-omap2/board-4430sdp.c: needs merge
+arch/arm/mach-omap2/board-apollon.c: needs merge
+arch/arm/mach-omap2/board-h4.c: needs merge
+arch/arm/mach-omap2/board-ldp.c: needs merge
+arch/arm/mach-omap2/board-rx51.c: needs merge
+drivers/video/omap/lcd_apollon.c: needs merge
+drivers/video/omap/lcd_ldp.c: needs merge
+drivers/video/omap/lcd_overo.c: needs merge
+rm 'drivers/video/omap/lcd_apollon.c'
+rm 'drivers/video/omap/lcd_ldp.c'
+rm 'drivers/video/omap/lcd_overo.c'
+$ git commit -v -a
+[master 3e31b30] Merge remote-tracking branch 'omap_dss2/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-omap2/board-2430sdp.c | 78 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 7 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 208 +++-
+ arch/arm/mach-omap2/board-am3517evm.c | 6 +-
+ arch/arm/mach-omap2/board-apollon.c | 35 +-
+ arch/arm/mach-omap2/board-cm-t35.c | 6 +-
+ arch/arm/mach-omap2/board-devkit8000.c | 10 +-
+ arch/arm/mach-omap2/board-h4.c | 42 +-
+ arch/arm/mach-omap2/board-igep0020.c | 8 +-
+ arch/arm/mach-omap2/board-ldp.c | 122 ++-
+ arch/arm/mach-omap2/board-omap3beagle.c | 8 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 7 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 40 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c | 18 -
+ arch/arm/mach-omap2/board-omap4panda.c | 8 +-
+ arch/arm/mach-omap2/board-overo.c | 7 +-
+ arch/arm/mach-omap2/board-rx51.c | 25 -
+ arch/arm/mach-omap2/display.c | 60 +-
+ arch/arm/mach-omap2/twl-common.c | 11 +-
+ drivers/media/video/omap/omap_vout.c | 18 +-
+ drivers/video/omap/Kconfig | 29 -
+ drivers/video/omap/Makefile | 8 -
+ drivers/video/omap/lcd_2430sdp.c | 203 ---
+ drivers/video/omap/lcd_apollon.c | 136 --
+ drivers/video/omap/lcd_h4.c | 117 --
+ drivers/video/omap/lcd_ldp.c | 201 ---
+ drivers/video/omap/lcd_omap3beagle.c | 130 --
+ drivers/video/omap/lcd_omap3evm.c | 193 ---
+ drivers/video/omap/lcd_overo.c | 180 ---
+ drivers/video/omap2/displays/Kconfig | 28 +-
+ drivers/video/omap2/displays/Makefile | 3 +
+ drivers/video/omap2/displays/panel-dvi.c | 363 +++++
+ drivers/video/omap2/displays/panel-generic-dpi.c | 113 +-
+ drivers/video/omap2/displays/panel-n8x0.c | 747 +++++++++
+ drivers/video/omap2/displays/panel-picodlp.c | 594 +++++++
+ drivers/video/omap2/displays/panel-picodlp.h | 288 ++++
+ drivers/video/omap2/displays/panel-taal.c | 123 +-
+ drivers/video/omap2/dss/Kconfig | 2 +-
+ drivers/video/omap2/dss/Makefile | 2 +-
+ drivers/video/omap2/dss/core.c | 4 +
+ drivers/video/omap2/dss/dispc.c | 1700 ++++++++------------
+ drivers/video/omap2/dss/dispc.h | 57 +
+ drivers/video/omap2/dss/display.c | 31 +-
+ drivers/video/omap2/dss/dpi.c | 28 +-
+ drivers/video/omap2/dss/dsi.c | 929 +++++++-----
+ drivers/video/omap2/dss/dss.c | 18 +-
+ drivers/video/omap2/dss/dss.h | 156 +-
+ drivers/video/omap2/dss/dss_features.c | 130 ++-
+ drivers/video/omap2/dss/dss_features.h | 17 +-
+ drivers/video/omap2/dss/hdmi.c | 1260 ++-------------
+ .../omap2/dss/{hdmi_omap4_panel.c => hdmi_panel.c} | 68 +-
+ drivers/video/omap2/dss/manager.c | 191 +--
+ drivers/video/omap2/dss/overlay.c | 122 +-
+ drivers/video/omap2/dss/rfbi.c | 45 +-
+ drivers/video/omap2/dss/sdi.c | 19 +-
+ drivers/video/omap2/dss/ti_hdmi.h | 138 ++
+ drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 1239 ++++++++++++++
+ .../video/omap2/dss/{hdmi.h => ti_hdmi_4xxx_ip.h} | 400 +++---
+ drivers/video/omap2/dss/venc.c | 27 +-
+ drivers/video/omap2/omapfb/Kconfig | 2 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 134 ++-
+ drivers/video/omap2/omapfb/omapfb-sysfs.c | 6 +-
+ include/video/omap-panel-dvi.h | 37 +
+ include/video/omap-panel-n8x0.h | 15 +
+ include/video/omap-panel-nokia-dsi.h | 8 +-
+ include/video/omap-panel-picodlp.h | 23 +
+ include/video/omapdss.h | 100 +-
+ 68 files changed, 6495 insertions(+), 4595 deletions(-)
+ delete mode 100644 drivers/video/omap/lcd_2430sdp.c
+ delete mode 100644 drivers/video/omap/lcd_apollon.c
+ delete mode 100644 drivers/video/omap/lcd_h4.c
+ delete mode 100644 drivers/video/omap/lcd_ldp.c
+ delete mode 100644 drivers/video/omap/lcd_omap3beagle.c
+ delete mode 100644 drivers/video/omap/lcd_omap3evm.c
+ delete mode 100644 drivers/video/omap/lcd_overo.c
+ create mode 100644 drivers/video/omap2/displays/panel-dvi.c
+ create mode 100644 drivers/video/omap2/displays/panel-n8x0.c
+ create mode 100644 drivers/video/omap2/displays/panel-picodlp.c
+ create mode 100644 drivers/video/omap2/displays/panel-picodlp.h
+ rename drivers/video/omap2/dss/{hdmi_omap4_panel.c => hdmi_panel.c} (79%)
+ create mode 100644 drivers/video/omap2/dss/ti_hdmi.h
+ create mode 100644 drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+ rename drivers/video/omap2/dss/{hdmi.h => ti_hdmi_4xxx_ip.h} (54%)
+ create mode 100644 include/video/omap-panel-dvi.h
+ create mode 100644 include/video/omap-panel-n8x0.h
+ create mode 100644 include/video/omap-panel-picodlp.h
+Merging voltage/for-next
+$ git merge voltage/for-next
+Auto-merging drivers/regulator/core.c
+Merge made by recursive.
+ drivers/regulator/88pm8607.c | 2 +-
+ drivers/regulator/aat2870-regulator.c | 1 +
+ drivers/regulator/core.c | 41 +++++++
+ drivers/regulator/max8649.c | 2 +-
+ drivers/regulator/max8952.c | 3 -
+ drivers/regulator/tps65023-regulator.c | 190 +++++++++++++++++++++++++++----
+ drivers/regulator/tps6507x-regulator.c | 8 +-
+ drivers/regulator/tps6586x-regulator.c | 32 +++++-
+ drivers/regulator/tps65912-regulator.c | 2 -
+ include/linux/mfd/tps6586x.h | 16 +++
+ 10 files changed, 257 insertions(+), 40 deletions(-)
+Merging security/next
+$ git merge security/next
+Resolved 'fs/ocfs2/xattr.c' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging drivers/char/tpm/tpm.c
+Auto-merging fs/btrfs/xattr.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/ocfs2/xattr.c
+CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
+Auto-merging fs/xfs/xfs_iops.c
+Auto-merging kernel/cred.c
+Removing security/integrity/ima/ima_iint.c
+Auto-merging security/keys/encrypted-keys/encrypted.c
+Auto-merging security/keys/encrypted-keys/encrypted.h
+Auto-merging security/tomoyo/common.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cb7c438] Merge remote-tracking branch 'security/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/evm | 23 +
+ Documentation/kernel-parameters.txt | 6 +
+ MAINTAINERS | 7 +-
+ drivers/char/tpm/tpm.c | 3 +
+ drivers/target/target_core_fabric_lib.c | 12 +-
+ fs/attr.c | 5 +-
+ fs/btrfs/xattr.c | 50 +-
+ fs/cifs/xattr.c | 40 +-
+ fs/ext2/xattr_security.c | 34 +-
+ fs/ext3/xattr_security.c | 36 +-
+ fs/ext4/xattr_security.c | 36 +-
+ fs/gfs2/inode.c | 38 +-
+ fs/jffs2/security.c | 35 +-
+ fs/jfs/xattr.c | 57 +-
+ fs/ocfs2/xattr.c | 41 +-
+ fs/reiserfs/xattr_security.c | 4 +-
+ fs/xattr.c | 63 ++-
+ fs/xfs/xfs_iops.c | 39 +-
+ include/linux/evm.h | 100 +++
+ include/linux/ima.h | 13 -
+ include/linux/integrity.h | 39 +
+ include/linux/kernel.h | 2 +-
+ include/linux/security.h | 32 +-
+ include/linux/xattr.h | 19 +-
+ kernel/cred.c | 18 +-
+ lib/hexdump.c | 15 +-
+ mm/shmem.c | 4 +-
+ security/Kconfig | 6 +-
+ security/Makefile | 4 +-
+ security/apparmor/apparmorfs.c | 2 +-
+ security/apparmor/ipc.c | 1 +
+ security/apparmor/lib.c | 1 +
+ security/apparmor/policy_unpack.c | 12 +-
+ security/apparmor/procattr.c | 1 +
+ security/commoncap.c | 16 +-
+ security/integrity/Kconfig | 7 +
+ security/integrity/Makefile | 12 +
+ security/integrity/evm/Kconfig | 13 +
+ security/integrity/evm/Makefile | 7 +
+ security/integrity/evm/evm.h | 38 +
+ security/integrity/evm/evm_crypto.c | 216 ++++++
+ security/integrity/evm/evm_main.c | 384 ++++++++++
+ security/integrity/evm/evm_posix_acl.c | 26 +
+ security/integrity/evm/evm_secfs.c | 108 +++
+ security/integrity/iint.c | 172 +++++
+ security/integrity/ima/Kconfig | 1 +
+ security/integrity/ima/Makefile | 2 +-
+ security/integrity/ima/ima.h | 30 +-
+ security/integrity/ima/ima_api.c | 7 +-
+ security/integrity/ima/ima_fs.c | 2 +-
+ security/integrity/ima/ima_iint.c | 169 -----
+ security/integrity/ima/ima_main.c | 13 +-
+ security/integrity/integrity.h | 50 ++
+ security/keys/Makefile | 2 +-
+ security/keys/encrypted-keys/Makefile | 6 +
+ .../keys/{ => encrypted-keys}/ecryptfs_format.c | 0
+ .../keys/{ => encrypted-keys}/ecryptfs_format.h | 0
+ security/keys/{ => encrypted-keys}/encrypted.c | 49 +-
+ security/keys/{ => encrypted-keys}/encrypted.h | 11 +
+ security/keys/encrypted-keys/masterkey_trusted.c | 45 ++
+ security/keys/gc.c | 386 +++++++---
+ security/keys/internal.h | 4 +
+ security/keys/key.c | 121 +---
+ security/keys/keyring.c | 3 +-
+ security/keys/process_keys.c | 16 +-
+ security/keys/trusted.c | 19 +-
+ security/security.c | 76 ++-
+ security/selinux/exports.c | 1 +
+ security/selinux/hooks.c | 13 +-
+ security/selinux/include/avc_ss.h | 6 +
+ security/selinux/include/security.h | 8 +
+ security/selinux/netlink.c | 2 +
+ security/selinux/nlmsgtab.c | 1 +
+ security/selinux/selinuxfs.c | 5 +-
+ security/selinux/ss/conditional.c | 2 +-
+ security/selinux/ss/conditional.h | 1 +
+ security/selinux/ss/policydb.c | 2 -
+ security/selinux/ss/services.c | 3 -
+ security/tomoyo/Kconfig | 2 +
+ security/tomoyo/Makefile | 4 +-
+ security/tomoyo/audit.c | 7 +-
+ security/tomoyo/common.c | 217 +++++-
+ security/tomoyo/common.h | 189 +++++-
+ security/tomoyo/condition.c | 71 ++-
+ security/tomoyo/domain.c | 209 +++++-
+ security/tomoyo/environ.c | 122 +++
+ security/tomoyo/file.c | 42 +-
+ security/tomoyo/gc.c | 533 ++++++--------
+ security/tomoyo/group.c | 61 ++-
+ security/tomoyo/memory.c | 39 +-
+ security/tomoyo/network.c | 771 ++++++++++++++++++++
+ security/tomoyo/realpath.c | 32 +-
+ security/tomoyo/securityfs_if.c | 123 +++-
+ security/tomoyo/tomoyo.c | 62 ++
+ security/tomoyo/util.c | 69 ++-
+ 95 files changed, 4208 insertions(+), 1198 deletions(-)
+ create mode 100644 Documentation/ABI/testing/evm
+ create mode 100644 include/linux/evm.h
+ create mode 100644 include/linux/integrity.h
+ create mode 100644 security/integrity/Kconfig
+ create mode 100644 security/integrity/Makefile
+ create mode 100644 security/integrity/evm/Kconfig
+ create mode 100644 security/integrity/evm/Makefile
+ create mode 100644 security/integrity/evm/evm.h
+ create mode 100644 security/integrity/evm/evm_crypto.c
+ create mode 100644 security/integrity/evm/evm_main.c
+ create mode 100644 security/integrity/evm/evm_posix_acl.c
+ create mode 100644 security/integrity/evm/evm_secfs.c
+ create mode 100644 security/integrity/iint.c
+ delete mode 100644 security/integrity/ima/ima_iint.c
+ create mode 100644 security/integrity/integrity.h
+ create mode 100644 security/keys/encrypted-keys/Makefile
+ rename security/keys/{ => encrypted-keys}/ecryptfs_format.c (100%)
+ rename security/keys/{ => encrypted-keys}/ecryptfs_format.h (100%)
+ rename security/keys/{ => encrypted-keys}/encrypted.c (96%)
+ rename security/keys/{ => encrypted-keys}/encrypted.h (81%)
+ create mode 100644 security/keys/encrypted-keys/masterkey_trusted.c
+ create mode 100644 security/tomoyo/environ.c
+ create mode 100644 security/tomoyo/network.c
+Merging selinux/master
+$ git merge selinux/master
+Already up-to-date.
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging agp/agp-next
+$ git merge agp/agp-next
+Merge made by recursive.
+Merging watchdog/master
+$ git merge watchdog/master
+Merge made by recursive.
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next
+$ git merge iommu/next
+Auto-merging arch/arm/plat-omap/include/plat/iopgtable.h
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging drivers/iommu/omap-iommu-debug.c
+Auto-merging drivers/iommu/omap-iommu.c
+Auto-merging drivers/iommu/omap-iovmm.c
+Auto-merging drivers/media/video/Kconfig
+Auto-merging drivers/media/video/omap3isp/isp.c
+Auto-merging drivers/media/video/omap3isp/isp.h
+Auto-merging drivers/media/video/omap3isp/ispccdc.c
+Auto-merging drivers/media/video/omap3isp/ispvideo.c
+Auto-merging virt/kvm/iommu.c
+Merge made by recursive.
+ arch/arm/mach-omap2/iommu2.c | 31 +-
+ arch/arm/plat-omap/Kconfig | 12 -
+ arch/arm/plat-omap/Makefile | 2 -
+ arch/arm/plat-omap/include/plat/iommu.h | 78 ++--
+ arch/arm/plat-omap/include/plat/iommu2.h | 4 +-
+ arch/arm/plat-omap/{ => include/plat}/iopgtable.h | 20 +-
+ arch/arm/plat-omap/include/plat/iovmm.h | 30 +-
+ arch/ia64/kvm/kvm-ia64.c | 3 +-
+ arch/x86/kvm/x86.c | 3 +-
+ drivers/iommu/Kconfig | 19 +
+ drivers/iommu/Makefile | 3 +
+ drivers/iommu/amd_iommu.c | 2 +-
+ drivers/iommu/intel-iommu.c | 2 +-
+ drivers/iommu/iommu.c | 114 ++++-
+ drivers/iommu/msm_iommu.c | 9 +-
+ .../iommu/omap-iommu-debug.c | 36 +-
+ .../iommu.c => drivers/iommu/omap-iommu.c | 527 +++++++++++++-------
+ .../iovmm.c => drivers/iommu/omap-iovmm.c | 370 ++++----------
+ drivers/media/video/Kconfig | 3 +-
+ drivers/media/video/omap3isp/isp.c | 45 ++-
+ drivers/media/video/omap3isp/isp.h | 5 +-
+ drivers/media/video/omap3isp/ispccdc.c | 25 +-
+ drivers/media/video/omap3isp/ispstat.c | 11 +-
+ drivers/media/video/omap3isp/ispvideo.c | 4 +-
+ include/linux/device.h | 6 +
+ include/linux/iommu.h | 76 +++-
+ lib/dma-debug.c | 68 +++-
+ virt/kvm/iommu.c | 4 +-
+ 28 files changed, 867 insertions(+), 645 deletions(-)
+ rename arch/arm/plat-omap/{ => include/plat}/iopgtable.h (82%)
+ rename arch/arm/plat-omap/iommu-debug.c => drivers/iommu/omap-iommu-debug.c (91%)
+ rename arch/arm/plat-omap/iommu.c => drivers/iommu/omap-iommu.c (61%)
+ rename arch/arm/plat-omap/iovmm.c => drivers/iommu/omap-iovmm.c (62%)
+Merging cputime/cputime
+$ git merge cputime/cputime
+Already up-to-date.
+Merging osd/linux-next
+$ git merge osd/linux-next
+Merge made by recursive.
+ drivers/scsi/osd/Kconfig | 4 -
+ fs/exofs/exofs.h | 26 +-
+ fs/exofs/inode.c | 167 ++++++---
+ fs/exofs/ore.c | 330 +++++++++++------
+ fs/exofs/super.c | 205 +++++------
+ fs/nfs/objlayout/objio_osd.c | 848 +++++++++---------------------------------
+ fs/nfs/objlayout/objlayout.c | 209 ++++-------
+ fs/nfs/objlayout/objlayout.h | 48 ++--
+ include/scsi/osd_ore.h | 53 +++-
+ 9 files changed, 752 insertions(+), 1138 deletions(-)
+Merging jc_docs/docs-next
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging nommu/master
+$ git merge nommu/master
+Already up-to-date.
+Merging trivial/for-next
+$ git merge trivial/for-next
+Resolved 'Documentation/PCI/pci.txt' using previous resolution.
+Resolved 'drivers/net/Kconfig' using previous resolution.
+Auto-merging Documentation/PCI/pci.txt
+CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/laptops/thinkpad-acpi.txt
+Auto-merging Documentation/networking/scaling.txt
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/include/asm/io.h
+CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
+Auto-merging arch/arm/mach-omap2/smartreflex.c
+Auto-merging arch/arm/mach-pxa/xcep.c
+Auto-merging drivers/block/drbd/drbd_int.h
+Auto-merging drivers/block/rbd.c
+Auto-merging drivers/block/xen-blkback/common.h
+Auto-merging drivers/media/dvb/dvb-usb/af9005.c
+Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
+Auto-merging drivers/mtd/Kconfig
+Auto-merging drivers/net/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/Kconfig
+Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2.h
+Auto-merging drivers/net/ethernet/dec/tulip/21142.c
+Auto-merging drivers/net/ethernet/dec/tulip/eeprom.c
+Auto-merging drivers/net/ethernet/dec/tulip/interrupt.c
+Auto-merging drivers/net/ethernet/dec/tulip/media.c
+Auto-merging drivers/net/ethernet/dec/tulip/pnic.c
+Auto-merging drivers/net/ethernet/dec/tulip/pnic2.c
+Auto-merging drivers/net/ethernet/dec/tulip/timer.c
+Auto-merging drivers/net/ethernet/dec/tulip/tulip.h
+Auto-merging drivers/net/ethernet/dec/tulip/tulip_core.c
+Auto-merging drivers/net/ethernet/intel/igb/e1000_mbx.c
+Auto-merging drivers/net/ethernet/intel/igbvf/mbx.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
+Auto-merging drivers/net/ethernet/intel/ixgbevf/mbx.c
+Auto-merging drivers/net/ethernet/marvell/sky2.c
+Auto-merging drivers/net/ethernet/micrel/ks8695net.c
+Auto-merging drivers/net/ethernet/tile/tilepro.c
+Auto-merging drivers/net/wireless/rtlwifi/pci.c
+Auto-merging drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+Auto-merging drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+Auto-merging drivers/scsi/fcoe/fcoe.c
+Auto-merging drivers/scsi/isci/phy.c
+Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c
+Auto-merging drivers/scsi/mpt2sas/mpt2sas_ctl.c
+Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c
+Auto-merging drivers/scsi/mvsas/mv_sas.h
+Auto-merging drivers/target/target_core_transport.c
+Auto-merging drivers/target/tcm_fc/tfc_cmd.c
+Auto-merging drivers/target/tcm_fc/tfc_conf.c
+Auto-merging drivers/target/tcm_fc/tfc_io.c
+Auto-merging fs/cifs/connect.c
+Auto-merging fs/locks.c
+Auto-merging include/linux/ceph/messenger.h
+Auto-merging kernel/sched.c
+Auto-merging lib/Kconfig.debug
+Auto-merging scripts/checkpatch.pl
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-nuc93x/time.c
+Documentation/PCI/pci.txt: needs merge
+arch/arm/mach-nuc93x/time.c: needs merge
+drivers/net/Kconfig: needs merge
+rm 'arch/arm/mach-nuc93x/time.c'
+$ git commit -v -a
+[master 9a2500b] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/removed/o2cb | 2 +-
+ Documentation/ABI/removed/raw1394 | 2 +-
+ Documentation/ABI/testing/sysfs-bus-bcma | 8 ++--
+ .../testing/sysfs-class-backlight-driver-adp8870 | 16 ++++----
+ Documentation/blackfin/bfin-gpio-notes.txt | 2 +-
+ Documentation/block/biodoc.txt | 2 +-
+ Documentation/bus-virt-phys-mapping.txt | 2 +-
+ Documentation/cdrom/packet-writing.txt | 2 +-
+ Documentation/development-process/4.Coding | 2 +-
+ Documentation/devicetree/bindings/gpio/led.txt | 2 +-
+ Documentation/filesystems/caching/object.txt | 6 +-
+ Documentation/filesystems/locks.txt | 11 +++--
+ Documentation/filesystems/nfs/idmapper.txt | 2 +-
+ .../filesystems/pohmelfs/design_notes.txt | 5 +-
+ Documentation/filesystems/proc.txt | 2 +-
+ Documentation/filesystems/vfs.txt | 3 -
+ Documentation/frv/booting.txt | 6 ---
+ Documentation/input/input.txt | 2 +-
+ Documentation/kernel-docs.txt | 4 +-
+ Documentation/kernel-parameters.txt | 12 +++---
+ Documentation/laptops/thinkpad-acpi.txt | 4 +-
+ Documentation/media-framework.txt | 4 +-
+ Documentation/memory-barriers.txt | 2 +-
+ Documentation/networking/scaling.txt | 2 +-
+ Documentation/power/basic-pm-debugging.txt | 2 +-
+ Documentation/power/userland-swsusp.txt | 3 +-
+ Documentation/rfkill.txt | 3 +-
+ Documentation/scsi/aic7xxx_old.txt | 2 +-
+ Documentation/scsi/scsi_mid_low_api.txt | 5 --
+ Documentation/security/keys-trusted-encrypted.txt | 3 +-
+ Documentation/sound/oss/PAS16 | 3 +-
+ Documentation/spi/pxa2xx | 4 +-
+ Documentation/timers/highres.txt | 2 +-
+ Documentation/usb/dma.txt | 6 +-
+ Documentation/virtual/lguest/lguest.c | 2 +-
+ Documentation/vm/numa | 4 +-
+ arch/alpha/kernel/srm_env.c | 5 +-
+ arch/arm/Kconfig | 2 +-
+ arch/arm/include/asm/io.h | 2 +-
+ arch/arm/mach-bcmring/Kconfig | 2 -
+ arch/arm/mach-bcmring/irq.c | 1 -
+ arch/arm/mach-bcmring/timer.c | 1 -
+ arch/arm/mach-omap2/smartreflex.c | 2 +-
+ arch/arm/mach-pxa/xcep.c | 3 +-
+ arch/arm/mach-w90x900/cpu.c | 2 +-
+ arch/ia64/hp/common/sba_iommu.c | 12 +++---
+ arch/m68k/q40/README | 2 +-
+ arch/microblaze/include/asm/dma-mapping.h | 2 +-
+ arch/mips/include/asm/lasat/lasat.h | 6 +--
+ arch/mn10300/Kconfig | 2 +-
+ arch/mn10300/kernel/irq.c | 1 -
+ arch/openrisc/Kconfig | 2 +-
+ arch/openrisc/include/asm/dma-mapping.h | 2 +-
+ arch/parisc/include/asm/dma-mapping.h | 2 +-
+ arch/parisc/kernel/pci-dma.c | 2 +-
+ arch/powerpc/include/asm/qe.h | 2 +-
+ arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/qe.c | 2 +-
+ arch/s390/hypfs/hypfs_diag.c | 3 +-
+ arch/unicore32/include/asm/io.h | 2 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/Kconfig.debug | 2 +-
+ arch/x86/boot/header.S | 2 +-
+ arch/x86/include/asm/dma-mapping.h | 2 +-
+ arch/x86/kernel/amd_gart_64.c | 2 +-
+ arch/x86/kernel/apm_32.c | 2 -
+ arch/x86/kernel/pci-dma.c | 4 +-
+ arch/x86/kernel/process_32.c | 2 +-
+ arch/x86/mm/mmio-mod.c | 1 -
+ drivers/atm/idt77252.c | 11 +++--
+ drivers/atm/lanai.c | 3 +-
+ drivers/block/drbd/drbd_bitmap.c | 5 +-
+ drivers/block/drbd/drbd_int.h | 3 +-
+ drivers/block/drbd/drbd_nl.c | 4 +-
+ drivers/block/rbd.c | 2 +-
+ drivers/block/xen-blkback/common.h | 1 -
+ drivers/bluetooth/btmrvl_sdio.c | 4 +-
+ drivers/char/agp/backend.c | 3 +-
+ drivers/char/apm-emulation.c | 5 +--
+ drivers/char/raw.c | 3 +-
+ drivers/char/rtc.c | 7 +--
+ drivers/gpu/drm/radeon/radeon_fence.c | 2 +-
+ drivers/i2c/busses/i2c-designware.c | 2 +-
+ drivers/input/misc/rotary_encoder.c | 2 +-
+ drivers/isdn/i4l/isdn_common.c | 4 +-
+ drivers/isdn/mISDN/dsp_core.c | 3 +-
+ drivers/isdn/mISDN/l1oip_codec.c | 6 +--
+ drivers/leds/Kconfig | 2 +-
+ drivers/media/dvb/dvb-usb/af9005-remote.c | 2 +-
+ drivers/media/dvb/dvb-usb/af9005.c | 2 +-
+ drivers/media/dvb/frontends/dib3000.h | 2 +-
+ drivers/media/dvb/frontends/dib3000mb.c | 2 +-
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +-
+ drivers/media/video/cx18/cx18-mailbox.h | 2 +-
+ drivers/mtd/Kconfig | 2 +-
+ drivers/net/can/sja1000/sja1000_of_platform.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2.h | 12 +++---
+ drivers/net/ethernet/dec/tulip/21142.c | 3 -
+ drivers/net/ethernet/dec/tulip/eeprom.c | 2 -
+ drivers/net/ethernet/dec/tulip/interrupt.c | 3 -
+ drivers/net/ethernet/dec/tulip/media.c | 3 -
+ drivers/net/ethernet/dec/tulip/pnic.c | 3 -
+ drivers/net/ethernet/dec/tulip/pnic2.c | 3 -
+ drivers/net/ethernet/dec/tulip/timer.c | 3 -
+ drivers/net/ethernet/dec/tulip/tulip.h | 3 -
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 3 -
+ drivers/net/ethernet/intel/igb/e1000_mbx.c | 2 +-
+ drivers/net/ethernet/intel/igbvf/mbx.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/mbx.c | 2 +-
+ drivers/net/ethernet/marvell/sky2.c | 2 +-
+ drivers/net/ethernet/micrel/ks8695net.c | 2 +-
+ drivers/net/ethernet/tile/tilepro.c | 2 +-
+ drivers/net/phy/broadcom.c | 2 +-
+ drivers/net/wireless/ipw2x00/libipw_tx.c | 2 +-
+ drivers/net/wireless/libertas_tf/deb_defs.h | 2 +-
+ drivers/net/wireless/rtlwifi/pci.c | 6 +-
+ drivers/parisc/sba_iommu.c | 16 ++++----
+ drivers/platform/x86/Kconfig | 5 +--
+ drivers/s390/cio/blacklist.c | 3 +-
+ drivers/scsi/aacraid/src.c | 1 -
+ drivers/scsi/aic94xx/aic94xx_dump.c | 2 +-
+ drivers/scsi/bfa/bfad_drv.h | 1 -
+ drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 -
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 -
+ drivers/scsi/fcoe/fcoe.c | 1 -
+ drivers/scsi/isci/phy.c | 2 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 1 -
+ drivers/scsi/mpt2sas/mpt2sas_config.c | 1 -
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c | 1 -
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 -
+ drivers/scsi/mvsas/mv_sas.h | 1 -
+ drivers/scsi/pmcraid.c | 1 -
+ drivers/scsi/pmcraid.h | 1 -
+ drivers/scsi/sg.c | 18 +++++----
+ drivers/staging/cxt1e1/Kconfig | 3 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 2 +-
+ drivers/staging/iio/dds/ad9832.c | 2 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 2 +-
+ drivers/target/target_core_alua.c | 1 -
+ drivers/target/target_core_configfs.c | 1 -
+ drivers/target/target_core_fabric_configfs.c | 1 -
+ drivers/target/target_core_file.c | 1 -
+ drivers/target/target_core_iblock.c | 1 -
+ drivers/target/target_core_pr.c | 1 -
+ drivers/target/target_core_pscsi.c | 1 -
+ drivers/target/target_core_rd.c | 1 -
+ drivers/target/target_core_stat.c | 1 -
+ drivers/target/target_core_tmr.c | 1 -
+ drivers/target/target_core_tpg.c | 2 +-
+ drivers/target/target_core_transport.c | 1 -
+ drivers/target/target_core_ua.c | 1 -
+ drivers/target/tcm_fc/tfc_cmd.c | 1 -
+ drivers/target/tcm_fc/tfc_conf.c | 1 -
+ drivers/target/tcm_fc/tfc_io.c | 1 -
+ drivers/target/tcm_fc/tfc_sess.c | 1 -
+ drivers/tty/serial/mrst_max3110.c | 2 +-
+ drivers/usb/gadget/langwell_udc.c | 2 +-
+ drivers/usb/gadget/mv_udc_core.c | 4 +-
+ drivers/usb/gadget/net2280.c | 2 +-
+ drivers/usb/gadget/uvc.h | 1 +
+ drivers/usb/gadget/uvc_v4l2.c | 1 -
+ drivers/usb/musb/musb_gadget.c | 2 +-
+ drivers/usb/serial/digi_acceleport.c | 2 +-
+ drivers/usb/serial/mos7720.c | 1 -
+ drivers/usb/serial/mos7840.c | 1 -
+ drivers/usb/storage/realtek_cr.c | 1 -
+ drivers/uwb/uwb-internal.h | 1 -
+ drivers/video/igafb.c | 2 +-
+ drivers/watchdog/smsc37b787_wdt.c | 2 +-
+ fs/cifs/connect.c | 2 +-
+ fs/coda/coda_linux.h | 5 +-
+ fs/configfs/inode.c | 3 +-
+ fs/configfs/item.c | 2 +-
+ fs/eventpoll.c | 2 +-
+ fs/locks.c | 2 +-
+ fs/reiserfs/journal.c | 9 +---
+ fs/reiserfs/resize.c | 4 +-
+ fs/squashfs/Kconfig | 6 +-
+ fs/xfs/kmem.h | 7 +---
+ include/linux/ceph/messenger.h | 1 -
+ include/linux/drbd_tag_magic.h | 2 +-
+ include/linux/io-mapping.h | 2 +-
+ include/linux/isdn.h | 2 +-
+ include/linux/platform_data/ntc_thermistor.h | 2 +-
+ include/media/pwc-ioctl.h | 1 -
+ include/media/videobuf-dma-sg.h | 2 +-
+ include/target/configfs_macros.h | 4 +-
+ kernel/async.c | 4 +-
+ kernel/futex.c | 10 ++--
+ kernel/sched.c | 2 +-
+ lib/Kconfig.debug | 40 ++++++++++----------
+ lib/dynamic_debug.c | 1 -
+ lib/idr.c | 2 +-
+ mm/page_cgroup.c | 3 +-
+ mm/vmscan.c | 2 +-
+ net/netfilter/Kconfig | 2 +-
+ net/netfilter/x_tables.c | 5 +-
+ net/rds/ib_cm.c | 6 +--
+ scripts/checkpatch.pl | 4 +-
+ sound/core/memalloc.c | 4 +-
+ sound/oss/Kconfig | 4 +-
+ tools/perf/util/config.c | 4 +-
+ 205 files changed, 263 insertions(+), 380 deletions(-)
+Merging audit/for-next
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next
+$ git merge pm/linux-next
+Resolved 'arch/arm/mach-shmobile/board-ap4evb.c' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/power/basic-pm-debugging.txt
+Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
+CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Auto-merging arch/s390/Kconfig
+Auto-merging drivers/bluetooth/btusb.c
+Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
+Auto-merging drivers/net/usb/usbnet.c
+Auto-merging include/linux/device.h
+Auto-merging include/linux/netdevice.h
+Removing include/linux/pm_qos_params.h
+Auto-merging include/sound/pcm.h
+Auto-merging kernel/Makefile
+Auto-merging kernel/power/Kconfig
+Auto-merging kernel/power/qos.c
+Auto-merging net/mac80211/main.c
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/scan.c
+Auto-merging sound/core/pcm_native.c
+Auto-merging sound/usb/card.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 17f9286] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-devfreq | 52 +++
+ Documentation/kernel-parameters.txt | 4 +
+ Documentation/power/basic-pm-debugging.txt | 24 +
+ Documentation/power/devices.txt | 8 +-
+ Documentation/power/pm_qos_interface.txt | 92 ++++-
+ Documentation/power/runtime_pm.txt | 2 +
+ Documentation/usb/power-management.txt | 8 +-
+ arch/arm/mach-msm/clock.c | 2 +-
+ arch/arm/mach-omap1/pm_bus.c | 1 +
+ arch/arm/mach-shmobile/board-ap4evb.c | 1 +
+ arch/arm/mach-shmobile/board-mackerel.c | 2 +-
+ arch/arm/mach-shmobile/include/mach/common.h | 4 +-
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 3 +
+ arch/arm/mach-shmobile/pm-sh7372.c | 295 ++++++++++---
+ arch/arm/mach-shmobile/pm_runtime.c | 1 +
+ arch/arm/mach-shmobile/setup-sh7372.c | 3 +
+ arch/arm/mach-shmobile/sleep-sh7372.S | 221 ++--------
+ arch/s390/Kconfig | 1 +
+ arch/s390/kernel/suspend.c | 118 +++++
+ arch/s390/kernel/swsusp_asm64.S | 3 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 2 +
+ drivers/acpi/processor_idle.c | 2 +-
+ drivers/acpi/sleep.c | 16 +
+ drivers/base/power/Makefile | 4 +-
+ drivers/base/power/clock_ops.c | 123 +++---
+ drivers/base/power/common.c | 86 ++++
+ drivers/base/power/domain.c | 348 +++++++++------
+ drivers/base/power/main.c | 34 ++-
+ drivers/base/power/opp.c | 30 ++
+ drivers/base/power/power.h | 10 +-
+ drivers/base/power/qos.c | 419 +++++++++++++++++
+ drivers/base/power/runtime.c | 94 +++--
+ drivers/base/power/wakeup.c | 4 +-
+ drivers/bluetooth/btusb.c | 2 +-
+ drivers/cpuidle/cpuidle.c | 2 +-
+ drivers/cpuidle/governors/ladder.c | 2 +-
+ drivers/cpuidle/governors/menu.c | 2 +-
+ drivers/devfreq/Kconfig | 75 +++
+ drivers/devfreq/Makefile | 5 +
+ drivers/devfreq/devfreq.c | 601 +++++++++++++++++++++++++
+ drivers/devfreq/governor.h | 24 +
+ drivers/devfreq/governor_performance.c | 29 ++
+ drivers/devfreq/governor_powersave.c | 29 ++
+ drivers/devfreq/governor_simpleondemand.c | 88 ++++
+ drivers/devfreq/governor_userspace.c | 116 +++++
+ drivers/hid/hid-picolcd.c | 2 +-
+ drivers/hid/usbhid/hid-core.c | 7 +-
+ drivers/media/video/via-camera.c | 4 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
+ drivers/net/usb/usbnet.c | 2 +-
+ drivers/net/wimax/i2400m/usb.c | 4 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 4 +-
+ drivers/tty/Kconfig | 4 +
+ drivers/usb/class/cdc-acm.c | 2 +-
+ drivers/usb/class/cdc-wdm.c | 6 +-
+ drivers/usb/core/driver.c | 9 +-
+ drivers/usb/core/hcd.c | 9 +-
+ drivers/usb/core/hub.c | 15 +-
+ drivers/usb/serial/sierra.c | 2 +-
+ drivers/usb/serial/usb_wwan.c | 2 +-
+ include/linux/devfreq.h | 238 ++++++++++
+ include/linux/device.h | 5 +
+ include/linux/freezer.h | 4 +-
+ include/linux/netdevice.h | 4 +-
+ include/linux/opp.h | 12 +
+ include/linux/pm.h | 25 +-
+ include/linux/pm_clock.h | 71 +++
+ include/linux/pm_domain.h | 26 +-
+ include/linux/pm_qos.h | 155 +++++++
+ include/linux/pm_qos_params.h | 38 --
+ include/linux/pm_runtime.h | 42 --
+ include/linux/suspend.h | 95 ++++-
+ include/sound/pcm.h | 4 +-
+ include/trace/events/rpm.h | 99 ++++
+ kernel/Makefile | 2 +-
+ kernel/power/Kconfig | 3 +
+ kernel/power/Makefile | 4 +-
+ kernel/power/console.c | 4 +-
+ kernel/power/hibernate.c | 30 +-
+ kernel/power/main.c | 102 +++++
+ kernel/power/power.h | 3 +-
+ kernel/power/process.c | 30 +-
+ kernel/{pm_qos_params.c => power/qos.c} | 273 ++++++------
+ kernel/power/snapshot.c | 18 +
+ kernel/power/suspend.c | 17 +-
+ kernel/trace/Makefile | 3 +
+ kernel/trace/rpm-traces.c | 20 +
+ net/mac80211/main.c | 2 +-
+ net/mac80211/mlme.c | 2 +-
+ net/mac80211/scan.c | 2 +-
+ sound/core/pcm_native.c | 2 +-
+ sound/usb/card.c | 2 +-
+ 93 files changed, 3578 insertions(+), 827 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-devfreq
+ create mode 100644 drivers/base/power/common.c
+ create mode 100644 drivers/base/power/qos.c
+ create mode 100644 drivers/devfreq/Kconfig
+ create mode 100644 drivers/devfreq/Makefile
+ create mode 100644 drivers/devfreq/devfreq.c
+ create mode 100644 drivers/devfreq/governor.h
+ create mode 100644 drivers/devfreq/governor_performance.c
+ create mode 100644 drivers/devfreq/governor_powersave.c
+ create mode 100644 drivers/devfreq/governor_simpleondemand.c
+ create mode 100644 drivers/devfreq/governor_userspace.c
+ create mode 100644 include/linux/devfreq.h
+ create mode 100644 include/linux/pm_clock.h
+ create mode 100644 include/linux/pm_qos.h
+ delete mode 100644 include/linux/pm_qos_params.h
+ create mode 100644 include/trace/events/rpm.h
+ rename kernel/{pm_qos_params.c => power/qos.c} (71%)
+ create mode 100644 kernel/trace/rpm-traces.c
+Merging apm/for-next
+$ git merge apm/for-next
+Auto-merging drivers/char/apm-emulation.c
+Merge made by recursive.
+ drivers/char/apm-emulation.c | 16 ++++++----------
+ 1 files changed, 6 insertions(+), 10 deletions(-)
+Merging fsnotify/for-next
+$ git merge fsnotify/for-next
+Auto-merging fs/cachefiles/namei.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Auto-merging fs/notify/group.c
+Auto-merging fs/notify/mark.c
+Auto-merging include/linux/fsnotify_backend.h
+Merge made by recursive.
+ fs/cachefiles/namei.c | 1 -
+ fs/cachefiles/xattr.c | 1 -
+ fs/nfsd/vfs.c | 3 -
+ fs/notify/dnotify/dnotify.c | 15 +++---
+ fs/notify/fanotify/fanotify.c | 24 +++++----
+ fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
+ fs/notify/group.c | 1 +
+ fs/notify/mark.c | 36 +++++--------
+ include/linux/fanotify.h | 5 ++-
+ include/linux/fsnotify_backend.h | 14 ++++-
+ 10 files changed, 121 insertions(+), 80 deletions(-)
+Merging irda/for-next
+$ git merge irda/for-next
+Already up-to-date.
+Merging edac/linux_next
+$ git merge edac/linux_next
+Resolved 'arch/x86/kernel/cpu/mcheck/mce.c' using previous resolution.
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
+Removing drivers/edac/edac_mce.c
+Auto-merging drivers/edac/i7core_edac.c
+Auto-merging include/linux/edac.h
+Removing include/linux/edac_mce.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 30a53c2] Merge remote-tracking branch 'edac/linux_next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/kernel/cpu/mcheck/mce.c | 18 +-
+ drivers/edac/Kconfig | 8 +-
+ drivers/edac/Makefile | 1 -
+ drivers/edac/edac_core.h | 350 +--------------------------------
+ drivers/edac/edac_mce.c | 61 ------
+ drivers/edac/i7core_edac.c | 415 ++++++++++++++++++++++++++++++++++----
+ include/linux/edac.h | 350 ++++++++++++++++++++++++++++++++
+ include/linux/edac_mce.h | 31 ---
+ 8 files changed, 736 insertions(+), 498 deletions(-)
+ delete mode 100644 drivers/edac/edac_mce.c
+ delete mode 100644 include/linux/edac_mce.h
+Merging edac-amd/for-next
+$ git merge edac-amd/for-next
+Merge made by recursive.
+ drivers/edac/amd64_edac.c | 37 +++++++++++++++++++++++++----------
+ drivers/edac/mce_amd.c | 46 ++++++++++++++------------------------------
+ drivers/edac/mce_amd.h | 6 ++--
+ 3 files changed, 44 insertions(+), 45 deletions(-)
+Merging devicetree/devicetree/next
+$ git merge devicetree/devicetree/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/of/fdt.c
+Merge made by recursive.
+ .../devicetree/bindings/gpio/pl061-gpio.txt | 10 ++
+ .../devicetree/bindings/spi/spi_pl022.txt | 12 ++
+ .../devicetree/bindings/vendor-prefixes.txt | 40 +++++
+ MAINTAINERS | 2 +
+ drivers/of/base.c | 150 ++++++++++++++++++++
+ drivers/of/fdt.c | 6 +-
+ drivers/of/irq.c | 14 +-
+ drivers/of/pdt.c | 8 +
+ drivers/tty/serial/altera_jtaguart.c | 5 +-
+ drivers/tty/serial/altera_uart.c | 4 +-
+ drivers/tty/serial/imx.c | 11 +-
+ drivers/tty/serial/uartlite.c | 4 +-
+ include/linux/of.h | 27 ++++
+ 13 files changed, 269 insertions(+), 24 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/pl061-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi_pl022.txt
+ create mode 100644 Documentation/devicetree/bindings/vendor-prefixes.txt
+Merging spi/spi/next
+$ git merge spi/spi/next
+Auto-merging drivers/spi/spi-pl022.c
+Merge made by recursive.
+ drivers/spi/spi-dw-mid.c | 9 ++-
+ drivers/spi/spi-dw.c | 62 ++++++++++----------
+ drivers/spi/spi-dw.h | 97 +++++++++++++++++--------------
+ drivers/spi/spi-pl022.c | 146 +++++++++++++++++++++------------------------
+ 4 files changed, 157 insertions(+), 157 deletions(-)
+Merging gpio/gpio/next
+$ git merge gpio/gpio/next
+Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/gpio/gpio-mxc.c
+Auto-merging drivers/gpio/gpio-nomadik.c
+Merge made by recursive.
+ arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 3 +
+ drivers/gpio/Kconfig | 2 +
+ drivers/gpio/gpio-ml-ioh.c | 254 ++++++++++++++++++++-
+ drivers/gpio/gpio-mxc.c | 6 +
+ drivers/gpio/gpio-nomadik.c | 127 +++++++++--
+ drivers/gpio/gpio-pch.c | 250 ++++++++++++++++++++-
+ 6 files changed, 613 insertions(+), 29 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 91b0e47 Merge remote-tracking branch 'spi/spi/next'
+Merging refs/next/20111005/gpio
+$ git merge refs/next/20111005/gpio
+Auto-merging arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+Auto-merging drivers/gpio/gpio-nomadik.c
+Merge made by recursive.
+ arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 3 +
+ drivers/gpio/gpio-nomadik.c | 127 ++++++++++++++++++---
+ 2 files changed, 116 insertions(+), 14 deletions(-)
+Merging tip/auto-latest
+$ git merge tip/auto-latest
+Resolved 'drivers/iommu/Makefile' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging arch/arm/common/gic.c
+Auto-merging arch/arm/kernel/smp.c
+Auto-merging arch/arm/kernel/traps.c
+Auto-merging arch/arm/mach-footbridge/netwinder-hw.c
+Auto-merging arch/arm/mach-integrator/core.c
+Auto-merging arch/arm/mach-ixp4xx/common-pci.c
+Auto-merging arch/arm/mm/cache-l2x0.c
+Auto-merging arch/arm/mm/context.c
+Auto-merging arch/ia64/configs/generic_defconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/cpufeature.h
+Auto-merging drivers/acpi/processor_idle.c
+Auto-merging drivers/cpufreq/cpufreq_ondemand.c
+Auto-merging drivers/iommu/Kconfig
+Auto-merging drivers/iommu/Makefile
+CONFLICT (content): Merge conflict in drivers/iommu/Makefile
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/leds/Kconfig
+Removing drivers/leds/leds-alix2.c
+Removing drivers/staging/hv/hv_timesource.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/sched.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f3f0912] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 21 +-
+ Documentation/scheduler/sched-bwc.txt | 122 ++++
+ Documentation/x86/entry_64.txt | 3 -
+ arch/arm/common/gic.c | 26 +-
+ arch/arm/include/asm/dma.h | 6 +-
+ arch/arm/include/asm/mmu.h | 4 +-
+ arch/arm/kernel/dma.c | 2 +-
+ arch/arm/kernel/smp.c | 6 +-
+ arch/arm/kernel/traps.c | 20 +-
+ arch/arm/mach-footbridge/include/mach/hardware.h | 2 +-
+ arch/arm/mach-footbridge/netwinder-hw.c | 14 +-
+ arch/arm/mach-footbridge/netwinder-leds.c | 10 +-
+ arch/arm/mach-integrator/core.c | 6 +-
+ arch/arm/mach-integrator/pci_v3.c | 14 +-
+ arch/arm/mach-ixp4xx/common-pci.c | 22 +-
+ arch/arm/mach-shark/leds.c | 6 +-
+ arch/arm/mm/cache-l2x0.c | 46 +-
+ arch/arm/mm/context.c | 14 +-
+ arch/arm/mm/copypage-v4mc.c | 6 +-
+ arch/arm/mm/copypage-v6.c | 10 +-
+ arch/arm/mm/copypage-xscale.c | 6 +-
+ arch/ia64/configs/generic_defconfig | 2 +-
+ arch/ia64/dig/Makefile | 2 +-
+ arch/ia64/include/asm/device.h | 2 +-
+ arch/ia64/include/asm/iommu.h | 6 +-
+ arch/ia64/include/asm/pci.h | 2 +-
+ arch/ia64/kernel/Makefile | 2 +-
+ arch/ia64/kernel/acpi.c | 4 +-
+ arch/ia64/kernel/msi_ia64.c | 4 +-
+ arch/ia64/kernel/pci-dma.c | 2 +-
+ arch/powerpc/sysdev/uic.c | 24 +-
+ arch/s390/kernel/time.c | 13 +-
+ arch/x86/Kconfig | 30 +-
+ arch/x86/configs/x86_64_defconfig | 4 +-
+ arch/x86/include/asm/amd_nb.h | 6 +
+ arch/x86/include/asm/apic.h | 2 +-
+ arch/x86/include/asm/archrandom.h | 75 ++
+ arch/x86/include/asm/atomic.h | 8 +-
+ arch/x86/include/asm/atomic64_64.h | 6 +-
+ arch/x86/include/asm/cmpxchg.h | 205 ++++++
+ arch/x86/include/asm/cmpxchg_32.h | 114 ----
+ arch/x86/include/asm/cmpxchg_64.h | 131 ----
+ arch/x86/include/asm/cpufeature.h | 1 +
+ arch/x86/include/asm/device.h | 2 +-
+ arch/x86/include/asm/dwarf2.h | 2 +
+ arch/x86/include/asm/elf.h | 31 +
+ arch/x86/include/asm/hw_irq.h | 2 +-
+ arch/x86/include/asm/irq_remapping.h | 6 +-
+ arch/x86/include/asm/pgtable_types.h | 1 -
+ arch/x86/include/asm/rwsem.h | 8 +-
+ arch/x86/include/asm/spinlock.h | 114 +---
+ arch/x86/include/asm/spinlock_types.h | 22 +-
+ arch/x86/include/asm/unistd_64.h | 1 -
+ arch/x86/include/asm/uv/uv_bau.h | 7 +-
+ arch/x86/include/asm/uv/uv_hub.h | 37 +-
+ arch/x86/include/asm/x86_init.h | 12 -
+ arch/x86/kernel/apic/apic.c | 33 +-
+ arch/x86/kernel/apic/bigsmp_32.c | 20 +-
+ arch/x86/kernel/apic/io_apic.c | 284 ++++----
+ arch/x86/kernel/apic/probe_32.c | 10 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 7 +-
+ arch/x86/kernel/cpu/Makefile | 6 +
+ arch/x86/kernel/cpu/amd.c | 47 +-
+ arch/x86/kernel/cpu/common.c | 5 +
+ arch/x86/kernel/cpu/cpu.h | 1 +
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 127 ++---
+ arch/x86/kernel/cpu/mcheck/mce_intel.c | 10 +-
+ arch/x86/kernel/cpu/mshyperv.c | 23 +
+ arch/x86/kernel/cpu/perf_event.c | 373 +----------
+ arch/x86/kernel/cpu/perf_event.h | 493 ++++++++++++++
+ arch/x86/kernel/cpu/perf_event_amd.c | 21 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 55 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 79 +--
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c | 28 +-
+ arch/x86/kernel/cpu/perf_event_p4.c | 10 +-
+ arch/x86/kernel/cpu/perf_event_p6.c | 9 +-
+ arch/x86/kernel/cpu/rdrand.c | 73 ++
+ arch/x86/kernel/entry_64.S | 14 +-
+ arch/x86/kernel/process.c | 2 +-
+ arch/x86/kernel/sys_x86_64.c | 78 ++-
+ arch/x86/kernel/x86_init.c | 4 -
+ arch/x86/mm/fault.c | 10 +-
+ arch/x86/mm/init.c | 147 +++-
+ arch/x86/mm/mmap.c | 20 +-
+ arch/x86/oprofile/nmi_int.c | 4 +-
+ arch/x86/oprofile/op_model_ppro.c | 27 +-
+ arch/x86/platform/Makefile | 1 +
+ arch/x86/platform/geode/Makefile | 1 +
+ arch/x86/platform/geode/alix.c | 142 ++++
+ arch/x86/platform/uv/tlb_uv.c | 17 +-
+ arch/x86/vdso/vma.c | 9 +
+ arch/x86/xen/mmu.c | 15 -
+ drivers/acpi/apei/Kconfig | 1 -
+ drivers/acpi/processor_idle.c | 10 +-
+ drivers/char/agp/intel-gtt.c | 4 +-
+ drivers/char/random.c | 23 +-
+ drivers/cpufreq/cpufreq_conservative.c | 4 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 4 +-
+ drivers/dca/dca-core.c | 78 ++-
+ drivers/dma/ipu/ipu_irq.c | 48 +-
+ drivers/iommu/Kconfig | 25 +-
+ drivers/iommu/Makefile | 5 +-
+ drivers/iommu/dmar.c | 246 ++------
+ drivers/iommu/intel-iommu.c | 203 +++++-
+ drivers/iommu/intr_remapping.c | 93 ++-
+ drivers/leds/Kconfig | 8 -
+ drivers/leds/Makefile | 1 -
+ drivers/leds/leds-alix2.c | 239 -------
+ drivers/oprofile/event_buffer.c | 4 +-
+ drivers/oprofile/oprofile_perf.c | 4 +-
+ drivers/oprofile/oprofilefs.c | 6 +-
+ drivers/pci/quirks.c | 2 +-
+ drivers/staging/hv/Makefile | 2 +-
+ drivers/staging/hv/hv_timesource.c | 101 ---
+ drivers/video/console/vgacon.c | 42 +-
+ fs/proc/stat.c | 41 +-
+ include/asm-generic/cputime.h | 4 +-
+ include/linux/alarmtimer.h | 51 ++-
+ include/linux/clockchips.h | 12 +-
+ include/linux/dma_remapping.h | 10 +-
+ include/linux/dmar.h | 43 +-
+ include/linux/init_task.h | 2 +-
+ include/linux/intel-iommu.h | 10 +-
+ include/linux/interrupt.h | 38 +-
+ include/linux/irq.h | 18 +-
+ include/linux/irq_work.h | 15 +-
+ include/linux/irqdesc.h | 1 +
+ include/linux/jiffies.h | 2 +-
+ include/linux/kprobes.h | 2 +-
+ include/linux/llist.h | 71 ++-
+ include/linux/oprofile.h | 2 +-
+ include/linux/percpu_counter.h | 2 +-
+ include/linux/posix-timers.h | 5 +-
+ include/linux/proportions.h | 6 +-
+ include/linux/random.h | 13 +
+ include/linux/ratelimit.h | 6 +-
+ include/linux/rwsem-spinlock.h | 2 +-
+ include/linux/rwsem.h | 10 +-
+ include/linux/sched.h | 11 +-
+ include/linux/semaphore.h | 4 +-
+ include/trace/events/sched.h | 9 +-
+ include/trace/ftrace.h | 3 +
+ init/Kconfig | 12 +
+ kernel/cgroup.c | 18 +-
+ kernel/events/core.c | 97 +++-
+ kernel/irq/chip.c | 64 ++-
+ kernel/irq/internals.h | 19 +-
+ kernel/irq/irqdesc.c | 32 +-
+ kernel/irq/manage.c | 218 ++++++-
+ kernel/irq/settings.h | 7 +
+ kernel/irq_work.c | 91 +--
+ kernel/kprobes.c | 34 +-
+ kernel/latencytop.c | 14 +-
+ kernel/lockdep.c | 156 ++++-
+ kernel/posix-cpu-timers.c | 12 +-
+ kernel/printk.c | 46 +-
+ kernel/rtmutex-debug.c | 75 +--
+ kernel/sched.c | 622 ++++++++++++++---
+ kernel/sched_cpupri.c | 89 ++-
+ kernel/sched_cpupri.h | 7 +-
+ kernel/sched_fair.c | 716 +++++++++++++++++++-
+ kernel/sched_features.h | 5 -
+ kernel/sched_rt.c | 91 +--
+ kernel/sched_stats.h | 12 +-
+ kernel/sched_stoptask.c | 2 +
+ kernel/semaphore.c | 28 +-
+ kernel/sysctl.c | 10 +
+ kernel/time.c | 2 +-
+ kernel/time/Kconfig | 2 +
+ kernel/time/alarmtimer.c | 266 +++++---
+ kernel/time/clockevents.c | 129 ++++-
+ kernel/time/clocksource.c | 38 +-
+ kernel/time/tick-broadcast.c | 4 +-
+ kernel/time/tick-common.c | 4 +-
+ kernel/time/tick-internal.h | 2 -
+ kernel/time/tick-oneshot.c | 77 +--
+ kernel/time/tick-sched.c | 55 ++-
+ kernel/time/timer_stats.c | 6 +-
+ kernel/trace/ring_buffer.c | 52 +-
+ kernel/trace/trace.c | 10 +-
+ kernel/trace/trace_irqsoff.c | 6 +-
+ kernel/watchdog.c | 7 +-
+ lib/Kconfig | 3 -
+ lib/Makefile | 4 +-
+ lib/atomic64.c | 66 +-
+ lib/llist.c | 74 +--
+ lib/percpu_counter.c | 18 +-
+ lib/proportions.c | 12 +-
+ lib/ratelimit.c | 4 +-
+ lib/rwsem-spinlock.c | 38 +-
+ lib/rwsem.c | 14 +-
+ tools/perf/Documentation/perf-annotate.txt | 14 +
+ tools/perf/Documentation/perf-buildid-list.txt | 6 +
+ tools/perf/Documentation/perf-report.txt | 3 +
+ tools/perf/Documentation/perf-sched.txt | 6 +-
+ tools/perf/Documentation/perf-stat.txt | 16 +
+ tools/perf/builtin-annotate.c | 8 +
+ tools/perf/builtin-buildid-list.c | 52 ++-
+ tools/perf/builtin-record.c | 19 +-
+ tools/perf/builtin-report.c | 7 +-
+ tools/perf/builtin-stat.c | 190 ++++--
+ tools/perf/builtin-top.c | 34 +-
+ .../perf/scripts/python/bin/net_dropmonitor-record | 2 +
+ .../perf/scripts/python/bin/net_dropmonitor-report | 4 +
+ tools/perf/scripts/python/net_dropmonitor.py | 72 ++
+ tools/perf/util/annotate.c | 11 +-
+ tools/perf/util/annotate.h | 2 +
+ tools/perf/util/color.c | 2 +-
+ tools/perf/util/map.c | 98 ++--
+ tools/perf/util/map.h | 42 +-
+ tools/perf/util/symbol.c | 2 +
+ tools/perf/util/symbol.h | 4 +-
+ tools/perf/util/top.h | 3 +
+ tools/perf/util/ui/browsers/top.c | 28 +-
+ 214 files changed, 5794 insertions(+), 3208 deletions(-)
+ create mode 100644 Documentation/scheduler/sched-bwc.txt
+ create mode 100644 arch/x86/include/asm/archrandom.h
+ create mode 100644 arch/x86/kernel/cpu/perf_event.h
+ create mode 100644 arch/x86/kernel/cpu/rdrand.c
+ create mode 100644 arch/x86/platform/geode/Makefile
+ create mode 100644 arch/x86/platform/geode/alix.c
+ delete mode 100644 drivers/leds/leds-alix2.c
+ delete mode 100644 drivers/staging/hv/hv_timesource.c
+ create mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-record
+ create mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-report
+ create mode 100755 tools/perf/scripts/python/net_dropmonitor.py
+$ git am -3 ../patches/0001-llist-add-back-llist_add_batch-and-llist_del_first.patch
+Applying: llist: add back llist_add_batch and llist_del_first
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/linux/llist.h
+$ git add .
+$ git commit -v -a --amend
+[master e48c1d1] Merge remote-tracking branch 'tip/auto-latest'
+Merging rcu/rcu/next
+$ git merge rcu/rcu/next
+Auto-merging include/linux/sched.h
+Auto-merging init/Kconfig
+Auto-merging kernel/lockdep.c
+Auto-merging kernel/sched.c
+Auto-merging kernel/time/tick-sched.c
+Merge made by recursive.
+ Documentation/RCU/NMI-RCU.txt | 2 +-
+ Documentation/RCU/lockdep-splat.txt | 110 +++++++++
+ Documentation/RCU/lockdep.txt | 34 ++-
+ Documentation/RCU/torture.txt | 137 ++++++++---
+ Documentation/RCU/trace.txt | 38 ++--
+ include/linux/lockdep.h | 2 +-
+ include/linux/rcupdate.h | 300 +++++++++++-------------
+ include/linux/rcutiny.h | 20 ++-
+ include/linux/rcutree.h | 2 +
+ include/linux/sched.h | 4 -
+ include/linux/types.h | 10 +
+ include/trace/events/rcu.h | 459 +++++++++++++++++++++++++++++++++++
+ init/Kconfig | 6 +-
+ kernel/lockdep.c | 84 ++++---
+ kernel/pid.c | 4 +-
+ kernel/rcu.h | 85 +++++++
+ kernel/rcupdate.c | 26 ++-
+ kernel/rcutiny.c | 117 ++-------
+ kernel/rcutiny_plugin.h | 134 +++++++----
+ kernel/rcutorture.c | 77 +++----
+ kernel/rcutree.c | 290 ++++++++++++++--------
+ kernel/rcutree.h | 17 +-
+ kernel/rcutree_plugin.h | 150 +++++++-----
+ kernel/rcutree_trace.c | 13 +-
+ kernel/rtmutex.c | 8 +
+ kernel/sched.c | 13 +-
+ kernel/time/tick-sched.c | 6 -
+ 27 files changed, 1489 insertions(+), 659 deletions(-)
+ create mode 100644 Documentation/RCU/lockdep-splat.txt
+ create mode 100644 include/trace/events/rcu.h
+ create mode 100644 kernel/rcu.h
+Merging kmemleak/kmemleak
+$ git merge kmemleak/kmemleak
+Merge made by recursive.
+ Documentation/kmemleak.txt | 3 +
+ include/linux/kmemleak.h | 8 ++
+ mm/kmemleak.c | 152 +++++++++++++++++++++++++++++++++++++-------
+ mm/percpu.c | 12 +++-
+ 4 files changed, 150 insertions(+), 25 deletions(-)
+Merging kvm/kvm-updates/3.2
+$ git merge kvm/kvm-updates/3.2
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Auto-merging arch/powerpc/kernel/exceptions-64s.S
+Auto-merging arch/x86/include/asm/cpufeature.h
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging virt/kvm/assigned-dev.c
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 4 +
+ Documentation/virtual/kvm/api.txt | 71 +++-
+ arch/powerpc/include/asm/kvm.h | 13 +
+ arch/powerpc/include/asm/kvm_book3s.h | 40 ++-
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +
+ arch/powerpc/include/asm/kvm_host.h | 30 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 1 +
+ arch/powerpc/kernel/asm-offsets.c | 13 +-
+ arch/powerpc/kernel/exceptions-64s.S | 10 -
+ arch/powerpc/kvm/44x.c | 2 +
+ arch/powerpc/kvm/Makefile | 4 +
+ arch/powerpc/kvm/book3s_32_sr.S | 2 +-
+ arch/powerpc/kvm/book3s_64_mmu.c | 8 +-
+ arch/powerpc/kvm/book3s_64_slb.S | 2 +-
+ arch/powerpc/kvm/book3s_emulate.c | 29 +
+ arch/powerpc/kvm/book3s_exports.c | 4 +-
+ arch/powerpc/kvm/book3s_hv.c | 343 +++++++-----
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 33 --
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 300 +++++++++--
+ arch/powerpc/kvm/book3s_interrupts.S | 129 +----
+ arch/powerpc/kvm/book3s_pr.c | 58 ++-
+ arch/powerpc/kvm/book3s_pr_papr.c | 158 ++++++
+ arch/powerpc/kvm/book3s_rmhandlers.S | 54 +--
+ arch/powerpc/kvm/book3s_segment.S | 117 ++++-
+ arch/powerpc/kvm/booke.c | 10 +-
+ arch/powerpc/kvm/e500.c | 2 +
+ arch/powerpc/kvm/powerpc.c | 55 ++-
+ arch/x86/include/asm/apicdef.h | 2 +
+ arch/x86/include/asm/cpufeature.h | 1 +
+ arch/x86/include/asm/kvm_emulate.h | 4 +-
+ arch/x86/include/asm/kvm_host.h | 14 +-
+ arch/x86/include/asm/msr-index.h | 2 +
+ arch/x86/include/asm/vmx.h | 12 +
+ arch/x86/kvm/emulate.c | 867 ++++++++++++++---------------
+ arch/x86/kvm/i8254.c | 6 +-
+ arch/x86/kvm/i8259.c | 123 ++++-
+ arch/x86/kvm/irq.h | 4 +-
+ arch/x86/kvm/kvm_cache_regs.h | 7 -
+ arch/x86/kvm/kvm_timer.h | 2 +
+ arch/x86/kvm/lapic.c | 167 +++++--
+ arch/x86/kvm/lapic.h | 4 +
+ arch/x86/kvm/mmu.c | 5 +-
+ arch/x86/kvm/mmu_audit.c | 6 +-
+ arch/x86/kvm/paging_tmpl.h | 24 +-
+ arch/x86/kvm/svm.c | 92 +--
+ arch/x86/kvm/trace.h | 118 ++++-
+ arch/x86/kvm/vmx.c | 131 +++---
+ arch/x86/kvm/x86.c | 274 ++++++----
+ include/linux/kvm.h | 5 +-
+ include/linux/kvm_host.h | 32 +-
+ virt/kvm/assigned-dev.c | 62 ++-
+ virt/kvm/coalesced_mmio.c | 131 ++---
+ virt/kvm/coalesced_mmio.h | 7 +-
+ virt/kvm/eventfd.c | 3 +-
+ virt/kvm/ioapic.c | 3 +-
+ virt/kvm/kvm_main.c | 112 ++++-
+ 56 files changed, 2351 insertions(+), 1363 deletions(-)
+ create mode 100644 arch/powerpc/kvm/book3s_pr_papr.c
+Merging oprofile/for-next
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging ptrace/ptrace
+$ git merge ptrace/ptrace
+Auto-merging arch/mips/kernel/signal.c
+Auto-merging arch/openrisc/kernel/signal.c
+Auto-merging arch/s390/kernel/compat_signal.c
+Auto-merging arch/s390/kernel/signal.c
+Auto-merging arch/sparc/kernel/signal32.c
+Auto-merging arch/sparc/kernel/signal_32.c
+Auto-merging arch/sparc/kernel/signal_64.c
+Auto-merging include/linux/sched.h
+Merge made by recursive.
+ arch/alpha/kernel/signal.c | 31 ++++++------------
+ arch/arm/kernel/signal.c | 24 +++++---------
+ arch/avr32/kernel/signal.c | 26 +++++----------
+ arch/blackfin/kernel/signal.c | 17 ++--------
+ arch/cris/arch-v10/kernel/signal.c | 34 +++++++-------------
+ arch/cris/arch-v32/kernel/signal.c | 37 ++++++---------------
+ arch/frv/kernel/signal.c | 32 ++++++-------------
+ arch/h8300/kernel/signal.c | 33 +++++--------------
+ arch/ia64/kernel/signal.c | 15 +--------
+ arch/m32r/kernel/signal.c | 12 +------
+ arch/m68k/kernel/signal_mm.c | 22 +++++--------
+ arch/m68k/kernel/signal_no.c | 28 +++++-----------
+ arch/microblaze/kernel/signal.c | 42 ++++++++++---------------
+ arch/mips/kernel/signal.c | 27 +++-------------
+ arch/mips/kernel/signal32.c | 20 ++---------
+ arch/mips/kernel/signal_n32.c | 10 +-----
+ arch/mn10300/kernel/signal.c | 32 ++++++-------------
+ arch/openrisc/kernel/signal.c | 45 +++++++++++---------------
+ arch/parisc/kernel/signal.c | 12 +------
+ arch/powerpc/kernel/signal.c | 13 +------
+ arch/powerpc/kernel/signal_32.c | 11 +++---
+ arch/s390/kernel/compat_signal.c | 6 +---
+ arch/s390/kernel/signal.c | 6 +---
+ arch/score/kernel/signal.c | 13 ++------
+ arch/sh/kernel/signal_32.c | 35 ++++++---------------
+ arch/sh/kernel/signal_64.c | 40 ++++++-----------------
+ arch/sparc/include/asm/signal.h | 3 +-
+ arch/sparc/kernel/signal32.c | 17 ++--------
+ arch/sparc/kernel/signal_32.c | 28 +++++-----------
+ arch/sparc/kernel/signal_64.c | 29 ++++++-----------
+ arch/tile/kernel/compat_signal.c | 5 +--
+ arch/tile/kernel/signal.c | 13 +------
+ arch/um/kernel/signal.c | 28 +++++-----------
+ arch/um/sys-i386/signal.c | 12 +------
+ arch/um/sys-x86_64/signal.c | 6 +---
+ arch/unicore32/kernel/signal.c | 13 +------
+ arch/x86/kernel/signal.c | 6 +---
+ arch/xtensa/kernel/signal.c | 35 ++++++--------------
+ fs/autofs4/waitq.c | 14 ++------
+ fs/coda/upcall.c | 19 +++++------
+ fs/dlm/user.c | 1 -
+ fs/exec.c | 18 +---------
+ fs/ncpfs/sock.c | 15 +++------
+ include/linux/sched.h | 3 +-
+ include/linux/signal.h | 1 +
+ kernel/fork.c | 61 +++++++++++++++++++++++-------------
+ kernel/signal.c | 22 +++++++++++++
+ 47 files changed, 321 insertions(+), 651 deletions(-)
+Merging xen/upstream/xen
+$ git merge xen/upstream/xen
+Auto-merging arch/x86/xen/time.c
+Merge made by recursive.
+ arch/ia64/include/asm/xen/interface.h | 1 +
+ arch/x86/include/asm/microcode.h | 9 +
+ arch/x86/include/asm/xen/hypercall.h | 8 +
+ arch/x86/include/asm/xen/interface.h | 1 +
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/microcode_core.c | 5 +-
+ arch/x86/kernel/microcode_xen.c | 198 ++++++++++++++++++++
+ arch/x86/xen/Kconfig | 4 +
+ arch/x86/xen/time.c | 16 ++-
+ include/xen/interface/platform.h | 320 +++++++++++++++++++++++++++++++++
+ include/xen/interface/xen.h | 1 +
+ 11 files changed, 562 insertions(+), 2 deletions(-)
+ create mode 100644 arch/x86/kernel/microcode_xen.c
+ create mode 100644 include/xen/interface/platform.h
+Merging xen-two/linux-next
+$ git merge xen-two/linux-next
+Resolved 'arch/x86/xen/Kconfig' using previous resolution.
+Auto-merging arch/x86/xen/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
+Auto-merging arch/x86/xen/mmu.c
+Auto-merging drivers/block/xen-blkback/common.h
+Auto-merging drivers/xen/xen-pciback/xenbus.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4757873] Merge remote-tracking branch 'xen-two/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/include/asm/xen/page.h | 6 +-
+ arch/x86/pci/xen.c | 32 +++-
+ arch/x86/xen/Kconfig | 11 +-
+ arch/x86/xen/enlighten.c | 1 +
+ arch/x86/xen/mmu.c | 52 -----
+ arch/x86/xen/p2m.c | 128 ++++++++++--
+ arch/x86/xen/setup.c | 284 ++++++++++++---------------
+ drivers/block/xen-blkback/blkback.c | 94 +++++++--
+ drivers/block/xen-blkback/common.h | 93 +++++++--
+ drivers/block/xen-blkback/xenbus.c | 58 ++++++
+ drivers/block/xen-blkfront.c | 113 +++++++++---
+ drivers/pci/xen-pcifront.c | 5 +-
+ drivers/xen/Kconfig | 10 -
+ drivers/xen/Makefile | 4 +-
+ drivers/xen/balloon.c | 75 +++++---
+ drivers/xen/events.c | 56 ++++--
+ drivers/xen/gntdev.c | 37 +++-
+ drivers/xen/grant-table.c | 8 +-
+ drivers/xen/pci.c | 109 +++++++++--
+ drivers/xen/swiotlb-xen.c | 70 +++++--
+ drivers/xen/xen-balloon.c | 17 +-
+ drivers/xen/xen-pciback/conf_space.c | 1 -
+ drivers/xen/xen-pciback/conf_space_header.c | 5 +-
+ drivers/xen/xen-pciback/conf_space_quirks.c | 3 +-
+ drivers/xen/xen-pciback/passthrough.c | 34 ++--
+ drivers/xen/xen-pciback/pci_stub.c | 37 ++--
+ drivers/xen/xen-pciback/pciback.h | 32 ++--
+ drivers/xen/xen-pciback/pciback_ops.c | 1 -
+ drivers/xen/xen-pciback/vpci.c | 35 ++--
+ drivers/xen/xen-pciback/xenbus.c | 27 +--
+ drivers/xen/xenbus/xenbus_comms.c | 4 +-
+ drivers/xen/xenbus/xenbus_probe.c | 7 +-
+ drivers/xen/xenbus/xenbus_probe.h | 3 +-
+ drivers/xen/xenbus/xenbus_probe_backend.c | 2 -
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 121 ++++++++++++
+ drivers/xen/xenbus/xenbus_xs.c | 17 ++-
+ include/xen/balloon.h | 5 +-
+ include/xen/grant_table.h | 1 +
+ include/xen/interface/io/blkif.h | 36 ++++
+ include/xen/interface/io/xs_wire.h | 6 +-
+ include/xen/interface/physdev.h | 34 +++-
+ include/xen/page.h | 12 +-
+ 42 files changed, 1152 insertions(+), 534 deletions(-)
+Merging xen-pvhvm/linux-next
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next
+$ git merge percpu/for-next
+Auto-merging mm/percpu.c
+Merge made by recursive.
+ mm/percpu-vm.c | 5 ++---
+ mm/percpu.c | 17 +++++++++--------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+Merging workqueues/for-next
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging sfi/sfi-test
+$ git merge sfi/sfi-test
+Already up-to-date.
+Merging asm-generic/next
+$ git merge asm-generic/next
+Already up-to-date.
+Merging drivers-x86/linux-next
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging hwpoison/hwpoison
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master
+$ git merge sysctl/master
+Auto-merging fs/proc/proc_sysctl.c
+Merge made by recursive.
+ fs/proc/proc_sysctl.c | 14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
+Merging namespace/master
+$ git merge namespace/master
+Auto-merging fs/proc/inode.c
+Merge made by recursive.
+ fs/proc/inode.c | 6 +-
+ fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 142 insertions(+), 24 deletions(-)
+Merging regmap/for-next
+$ git merge regmap/for-next
+Resolved 'drivers/mfd/wm831x-spi.c' using previous resolution.
+Auto-merging drivers/base/regmap/regmap-spi.c
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/mfd/wm831x-core.c
+Auto-merging drivers/mfd/wm831x-i2c.c
+Auto-merging drivers/mfd/wm831x-spi.c
+CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
+Auto-merging drivers/mfd/wm8994-core.c
+Auto-merging include/linux/mfd/wm831x/core.h
+Auto-merging include/linux/mfd/wm8994/core.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 39365cb] Merge remote-tracking branch 'regmap/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/base/regmap/Kconfig | 2 +
+ drivers/base/regmap/Makefile | 3 +-
+ drivers/base/regmap/internal.h | 128 ++++++++++
+ drivers/base/regmap/regcache-indexed.c | 65 +++++
+ drivers/base/regmap/regcache-lzo.c | 361 +++++++++++++++++++++++++++
+ drivers/base/regmap/regcache-rbtree.c | 350 ++++++++++++++++++++++++++
+ drivers/base/regmap/regcache.c | 401 ++++++++++++++++++++++++++++++
+ drivers/base/regmap/regmap-debugfs.c | 209 ++++++++++++++++
+ drivers/base/regmap/regmap-i2c.c | 2 -
+ drivers/base/regmap/regmap-spi.c | 2 -
+ drivers/base/regmap/regmap.c | 190 +++++++++++----
+ drivers/mfd/Kconfig | 3 +
+ drivers/mfd/wm831x-core.c | 424 ++++++++++++++++++++++++++++----
+ drivers/mfd/wm831x-i2c.c | 68 +-----
+ drivers/mfd/wm831x-spi.c | 196 +++-------------
+ drivers/mfd/wm8400-core.c | 106 +++------
+ drivers/mfd/wm8994-core.c | 178 +++-----------
+ include/linux/mfd/wm831x/core.h | 9 +-
+ include/linux/mfd/wm8400-private.h | 7 +-
+ include/linux/mfd/wm8994/core.h | 9 +-
+ include/linux/regmap.h | 29 ++-
+ include/trace/events/regmap.h | 136 ++++++++++
+ 22 files changed, 2310 insertions(+), 568 deletions(-)
+ create mode 100644 drivers/base/regmap/internal.h
+ create mode 100644 drivers/base/regmap/regcache-indexed.c
+ create mode 100644 drivers/base/regmap/regcache-lzo.c
+ create mode 100644 drivers/base/regmap/regcache-rbtree.c
+ create mode 100644 drivers/base/regmap/regcache.c
+ create mode 100644 drivers/base/regmap/regmap-debugfs.c
+ create mode 100644 include/trace/events/regmap.h
+Merging driver-core/driver-core-next
+$ git merge driver-core/driver-core-next
+Resolved 'arch/arm/plat-mxc/devices.c' using previous resolution.
+Removing Documentation/zh_CN/SubmitChecklist
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/plat-mxc/devices.c
+CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
+Auto-merging arch/arm/plat-mxc/include/mach/devices-common.h
+Auto-merging drivers/base/platform.c
+Auto-merging include/linux/device.h
+Auto-merging include/linux/netdevice.h
+Auto-merging lib/dynamic_debug.c
+Auto-merging net/core/dev.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9fb956f] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-model/binding.txt | 4 -
+ Documentation/driver-model/device.txt | 65 +++++-----
+ Documentation/filesystems/sysfs.txt | 10 ++-
+ Documentation/zh_CN/SubmitChecklist | 109 ---------------
+ MAINTAINERS | 6 +
+ arch/arm/plat-mxc/devices.c | 53 -------
+ arch/arm/plat-mxc/include/mach/devices-common.h | 16 ++-
+ drivers/base/core.c | 5 +-
+ drivers/base/dd.c | 3 +
+ drivers/base/memory.c | 64 ++++++---
+ drivers/base/platform.c | 54 +++++---
+ drivers/misc/pch_phub.c | 10 +-
+ drivers/uio/uio.c | 7 +-
+ drivers/uio/uio_pci_generic.c | 5 -
+ drivers/uio/uio_pdrv_genirq.c | 2 +-
+ fs/debugfs/inode.c | 2 +-
+ fs/sysfs/dir.c | 168 +++++++++++++++--------
+ fs/sysfs/inode.c | 14 +--
+ fs/sysfs/sysfs.h | 17 ++-
+ include/linux/device.h | 5 +
+ include/linux/dynamic_debug.h | 34 ++++--
+ include/linux/netdevice.h | 10 +-
+ include/linux/platform_device.h | 48 ++++++-
+ lib/dynamic_debug.c | 158 +++++++++++++++------
+ lib/kobject_uevent.c | 2 +-
+ net/core/dev.c | 3 +-
+ 26 files changed, 477 insertions(+), 397 deletions(-)
+ delete mode 100644 Documentation/zh_CN/SubmitChecklist
+Merging tty/tty-next
+$ git merge tty/tty-next
+Resolved 'arch/powerpc/include/asm/udbg.h' using previous resolution.
+Resolved 'arch/powerpc/kernel/udbg.c' using previous resolution.
+Resolved 'drivers/tty/serial/8250.c' using previous resolution.
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/plat-s5p/Kconfig
+Auto-merging arch/arm/plat-samsung/Kconfig
+Auto-merging arch/arm/plat-samsung/Makefile
+Auto-merging arch/arm/plat-samsung/include/plat/irqs.h
+Removing arch/arm/plat-samsung/irq-uart.c
+Auto-merging arch/powerpc/include/asm/udbg.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
+Auto-merging arch/powerpc/kernel/udbg.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
+Auto-merging arch/x86/platform/mrst/mrst.c
+Auto-merging drivers/staging/Kconfig
+Auto-merging drivers/staging/Makefile
+Auto-merging drivers/tty/Kconfig
+Auto-merging drivers/tty/hvc/hvcs.c
+Auto-merging drivers/tty/serial/8250.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
+Auto-merging drivers/tty/serial/8250_pci.c
+Auto-merging drivers/tty/serial/altera_jtaguart.c
+Auto-merging drivers/tty/serial/altera_uart.c
+Auto-merging drivers/tty/serial/atmel_serial.c
+Auto-merging drivers/tty/serial/bfin_uart.c
+Auto-merging drivers/tty/serial/crisv10.c
+Auto-merging drivers/tty/serial/imx.c
+Auto-merging drivers/tty/serial/lantiq.c
+Auto-merging drivers/tty/serial/max3107.c
+Auto-merging drivers/tty/serial/mrst_max3110.c
+Auto-merging drivers/tty/serial/msm_serial.c
+Auto-merging drivers/tty/serial/pch_uart.c
+Auto-merging drivers/tty/serial/samsung.c
+Auto-merging drivers/tty/serial/serial_core.c
+Auto-merging drivers/tty/serial/sh-sci.c
+Auto-merging drivers/tty/serial/uartlite.c
+Auto-merging drivers/tty/serial/ucc_uart.c
+Auto-merging include/linux/tty.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 352bcd1] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/tty/serial/snps-dw-apb-uart.txt | 25 +
+ Documentation/serial/serial-rs485.txt | 3 +
+ arch/arm/Kconfig | 1 -
+ arch/arm/mach-s3c64xx/dev-uart.c | 60 +--
+ arch/arm/mach-s3c64xx/include/mach/irqs.h | 30 -
+ arch/arm/mach-s3c64xx/irq.c | 25 -
+ arch/arm/plat-s5p/Kconfig | 1 -
+ arch/arm/plat-s5p/dev-uart.c | 84 +--
+ arch/arm/plat-s5p/irq.c | 34 -
+ arch/arm/plat-samsung/Kconfig | 5 -
+ arch/arm/plat-samsung/Makefile | 1 -
+ arch/arm/plat-samsung/include/plat/irqs.h | 35 -
+ arch/arm/plat-samsung/include/plat/regs-serial.h | 5 +
+ arch/arm/plat-samsung/irq-uart.c | 96 ---
+ arch/mips/pmc-sierra/msp71xx/msp_serial.c | 73 ++-
+ arch/powerpc/include/asm/udbg.h | 1 +
+ arch/powerpc/kernel/udbg.c | 2 +
+ arch/x86/platform/mrst/mrst.c | 3 +
+ drivers/isdn/i4l/isdn_tty.c | 2 +-
+ drivers/staging/Kconfig | 2 +
+ drivers/staging/Makefile | 1 +
+ drivers/{tty => staging}/serial/68360serial.c | 0
+ drivers/staging/serial/Kconfig | 16 +
+ drivers/staging/serial/Makefile | 1 +
+ drivers/staging/serial/TODO | 6 +
+ drivers/tty/Kconfig | 34 +
+ drivers/tty/Makefile | 1 +
+ drivers/tty/amiserial.c | 12 +-
+ drivers/tty/cyclades.c | 14 +-
+ drivers/tty/ehv_bytechan.c | 881 ++++++++++++++++++++
+ drivers/tty/hvc/hvc_console.c | 2 +-
+ drivers/tty/hvc/hvc_irq.c | 2 +-
+ drivers/tty/hvc/hvcs.c | 4 +-
+ drivers/tty/hvc/hvsi.c | 2 +-
+ drivers/tty/isicom.c | 2 +-
+ drivers/tty/mxser.c | 13 +-
+ drivers/tty/n_gsm.c | 70 +-
+ drivers/tty/serial/68328serial.c | 37 +-
+ drivers/tty/serial/68328serial.h | 1 -
+ drivers/tty/serial/8250.c | 132 ++--
+ drivers/tty/serial/8250_dw.c | 194 +++++
+ drivers/tty/serial/8250_pci.c | 33 +
+ drivers/tty/serial/Kconfig | 30 +-
+ drivers/tty/serial/Makefile | 4 +-
+ drivers/tty/serial/altera_jtaguart.c | 2 +-
+ drivers/tty/serial/altera_uart.c | 2 +-
+ drivers/tty/serial/apbuart.c | 1 +
+ drivers/tty/serial/atmel_serial.c | 9 +-
+ drivers/tty/serial/bfin_sport_uart.c | 2 +-
+ drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} | 65 +-
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 1 +
+ drivers/tty/serial/crisv10.c | 30 +-
+ drivers/tty/serial/dz.c | 1 +
+ drivers/tty/serial/icom.c | 2 +-
+ drivers/tty/serial/imx.c | 10 +-
+ drivers/tty/serial/ioc3_serial.c | 1 +
+ drivers/tty/serial/ioc4_serial.c | 1 +
+ drivers/tty/serial/jsm/jsm.h | 10 -
+ drivers/tty/serial/jsm/jsm_driver.c | 19 -
+ drivers/tty/serial/jsm/jsm_neo.c | 29 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 94 +--
+ drivers/tty/serial/lantiq.c | 6 +-
+ drivers/tty/serial/m32r_sio.c | 1 +
+ drivers/tty/serial/max3100.c | 2 +
+ drivers/tty/serial/max3107.c | 2 +
+ drivers/tty/serial/mcf.c | 2 +-
+ drivers/tty/serial/mfd.c | 49 ++-
+ drivers/tty/serial/mpc52xx_uart.c | 3 +-
+ drivers/tty/serial/mrst_max3110.c | 115 ++--
+ drivers/tty/serial/mrst_max3110.h | 1 +
+ drivers/tty/serial/msm_serial.c | 2 -
+ drivers/tty/serial/msm_serial_hs.c | 2 +
+ drivers/tty/serial/mux.c | 2 +
+ drivers/tty/serial/nwpserial.c | 1 +
+ drivers/tty/serial/pch_uart.c | 2 +
+ drivers/tty/serial/pxa.c | 20 +
+ drivers/tty/serial/samsung.c | 107 +++-
+ drivers/tty/serial/samsung.h | 1 +
+ drivers/tty/serial/sb1250-duart.c | 1 +
+ drivers/tty/serial/serial_core.c | 71 +--
+ drivers/tty/serial/serial_ks8695.c | 9 +-
+ drivers/tty/serial/serial_txx9.c | 2 +
+ drivers/tty/serial/sh-sci.c | 2 +-
+ drivers/tty/serial/sn_console.c | 3 +-
+ drivers/tty/serial/timbuart.c | 2 +
+ drivers/tty/serial/uartlite.c | 1 +
+ drivers/tty/serial/ucc_uart.c | 4 +-
+ drivers/tty/serial/xilinx_uartps.c | 4 +-
+ drivers/tty/serial/zs.c | 1 +
+ drivers/tty/synclink.c | 1 -
+ drivers/tty/synclinkmp.c | 6 +-
+ drivers/tty/tty_ldisc.c | 1 -
+ drivers/tty/tty_mutex.c | 12 -
+ drivers/tty/tty_port.c | 2 +-
+ drivers/tty/vt/keyboard.c | 3 +-
+ drivers/tty/vt/selection.c | 4 +-
+ drivers/tty/vt/vt.c | 2 +-
+ include/linux/serial.h | 1 +
+ include/linux/serial_8250.h | 2 +
+ include/linux/serial_core.h | 10 +-
+ include/linux/serial_reg.h | 1 +
+ include/linux/tty.h | 20 +-
+ net/irda/ircomm/ircomm_tty.c | 2 +-
+ 103 files changed, 1834 insertions(+), 910 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt
+ delete mode 100644 arch/arm/plat-samsung/irq-uart.c
+ rename drivers/{tty => staging}/serial/68360serial.c (100%)
+ create mode 100644 drivers/staging/serial/Kconfig
+ create mode 100644 drivers/staging/serial/Makefile
+ create mode 100644 drivers/staging/serial/TODO
+ create mode 100644 drivers/tty/ehv_bytechan.c
+ create mode 100644 drivers/tty/serial/8250_dw.c
+ rename drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (97%)
+Merging usb/usb-next
+$ git merge usb/usb-next
+Resolved 'arch/arm/mach-omap2/Makefile' using previous resolution.
+Auto-merging Documentation/usb/power-management.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-mmp/pxa168.c
+Auto-merging arch/arm/mach-omap2/Makefile
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
+Auto-merging drivers/usb/Kconfig
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging drivers/usb/class/cdc-wdm.c
+Auto-merging drivers/usb/core/driver.c
+Auto-merging drivers/usb/core/hcd.c
+Auto-merging drivers/usb/core/hub.c
+Auto-merging drivers/usb/gadget/at91_udc.c
+Auto-merging drivers/usb/gadget/langwell_udc.c
+Auto-merging drivers/usb/gadget/mv_udc_core.c
+Auto-merging drivers/usb/gadget/net2280.c
+Auto-merging drivers/usb/gadget/uvc.h
+Auto-merging drivers/usb/gadget/uvc_v4l2.c
+Auto-merging drivers/usb/host/Makefile
+Auto-merging drivers/usb/host/ehci-au1xxx.c
+Auto-merging drivers/usb/host/ehci-hcd.c
+Auto-merging drivers/usb/host/ohci-au1xxx.c
+Auto-merging drivers/usb/host/ohci-pnx4008.c
+Auto-merging drivers/usb/host/xhci-hub.c
+Auto-merging drivers/usb/host/xhci-ring.c
+Auto-merging drivers/usb/musb/musb_gadget.c
+Auto-merging drivers/usb/storage/realtek_cr.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/usb/ch9.h
+Auto-merging kernel/signal.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 66898fa] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-bus-pci-drivers-ehci_hcd | 46 +
+ Documentation/ABI/testing/sysfs-bus-usb | 15 +
+ Documentation/usb/dwc3.txt | 45 +
+ Documentation/usb/power-management.txt | 26 +
+ MAINTAINERS | 8 +
+ arch/arm/mach-mmp/include/mach/pxa168.h | 7 +
+ arch/arm/mach-mmp/pxa168.c | 46 +
+ arch/arm/mach-omap2/Makefile | 14 +-
+ drivers/usb/Kconfig | 14 +
+ drivers/usb/Makefile | 4 +
+ drivers/usb/class/cdc-acm.c | 9 +-
+ drivers/usb/class/cdc-wdm.c | 2 +-
+ drivers/usb/class/usbtmc.c | 5 +-
+ drivers/usb/core/config.c | 111 +-
+ drivers/usb/core/devices.c | 4 +-
+ drivers/usb/core/devio.c | 57 +-
+ drivers/usb/core/driver.c | 16 +-
+ drivers/usb/core/endpoint.c | 2 +-
+ drivers/usb/core/hcd-pci.c | 2 +-
+ drivers/usb/core/hcd.c | 9 +-
+ drivers/usb/core/hub.c | 311 ++--
+ drivers/usb/core/message.c | 2 +-
+ drivers/usb/core/quirks.c | 24 +
+ drivers/usb/core/sysfs.c | 59 +-
+ drivers/usb/core/urb.c | 2 +-
+ drivers/usb/core/usb.c | 1 +
+ drivers/usb/core/usb.h | 7 +
+ drivers/usb/dwc3/Kconfig | 25 +
+ drivers/usb/dwc3/Makefile | 36 +
+ drivers/usb/dwc3/core.c | 484 +++++
+ drivers/usb/dwc3/core.h | 768 +++++++
+ drivers/usb/dwc3/debug.h | 50 +
+ drivers/usb/dwc3/debugfs.c | 441 ++++
+ drivers/usb/dwc3/dwc3-omap.c | 401 ++++
+ drivers/usb/dwc3/dwc3-pci.c | 219 ++
+ drivers/usb/dwc3/ep0.c | 804 ++++++++
+ drivers/usb/dwc3/gadget.c | 2104 ++++++++++++++++++++
+ drivers/usb/dwc3/gadget.h | 211 ++
+ drivers/usb/dwc3/io.h | 54 +
+ drivers/usb/gadget/Kconfig | 37 +-
+ drivers/usb/gadget/amd5536udc.c | 20 +-
+ drivers/usb/gadget/amd5536udc.h | 9 -
+ drivers/usb/gadget/at91_udc.c | 16 +-
+ drivers/usb/gadget/at91_udc.h | 10 -
+ drivers/usb/gadget/atmel_usba_udc.c | 13 +-
+ drivers/usb/gadget/cdc2.c | 9 -
+ drivers/usb/gadget/ci13xxx_msm.c | 11 -
+ drivers/usb/gadget/ci13xxx_udc.c | 2 +-
+ drivers/usb/gadget/composite.c | 33 +-
+ drivers/usb/gadget/config.c | 9 -
+ drivers/usb/gadget/dbgp.c | 1 -
+ drivers/usb/gadget/dummy_hcd.c | 13 +-
+ drivers/usb/gadget/epautoconf.c | 12 +-
+ drivers/usb/gadget/ether.c | 9 -
+ drivers/usb/gadget/f_audio.c | 15 +-
+ drivers/usb/gadget/f_ecm.c | 9 -
+ drivers/usb/gadget/f_eem.c | 9 -
+ drivers/usb/gadget/f_fs.c | 9 -
+ drivers/usb/gadget/f_hid.c | 9 -
+ drivers/usb/gadget/f_loopback.c | 9 -
+ drivers/usb/gadget/f_mass_storage.c | 156 +-
+ drivers/usb/gadget/f_ncm.c | 9 -
+ drivers/usb/gadget/f_obex.c | 9 -
+ drivers/usb/gadget/f_phonet.c | 10 -
+ drivers/usb/gadget/f_rndis.c | 9 -
+ drivers/usb/gadget/f_sourcesink.c | 9 -
+ drivers/usb/gadget/f_subset.c | 9 -
+ drivers/usb/gadget/f_uvc.c | 1 -
+ drivers/usb/gadget/f_uvc.h | 1 -
+ drivers/usb/gadget/file_storage.c | 159 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 2 +-
+ drivers/usb/gadget/fsl_udc_core.c | 55 +-
+ drivers/usb/gadget/fusb300_udc.c | 16 +-
+ drivers/usb/gadget/fusb300_udc.h | 10 -
+ drivers/usb/gadget/g_ffs.c | 9 -
+ drivers/usb/gadget/gadget_chips.h | 3 +
+ drivers/usb/gadget/gmidi.c | 11 +-
+ drivers/usb/gadget/hid.c | 9 -
+ drivers/usb/gadget/imx_udc.c | 4 +-
+ drivers/usb/gadget/imx_udc.h | 5 -
+ drivers/usb/gadget/inode.c | 9 -
+ drivers/usb/gadget/langwell_udc.c | 62 +-
+ drivers/usb/gadget/langwell_udc.h | 10 -
+ drivers/usb/gadget/m66592-udc.c | 16 +-
+ drivers/usb/gadget/m66592-udc.h | 10 -
+ drivers/usb/gadget/mass_storage.c | 9 -
+ drivers/usb/gadget/multi.c | 9 -
+ drivers/usb/gadget/mv_udc_core.c | 4 +-
+ drivers/usb/gadget/ncm.c | 9 -
+ drivers/usb/gadget/ndis.h | 6 -
+ drivers/usb/gadget/net2272.c | 6 +-
+ drivers/usb/gadget/net2280.c | 17 +-
+ drivers/usb/gadget/net2280.h | 9 -
+ drivers/usb/gadget/omap_udc.c | 18 +-
+ drivers/usb/gadget/pch_udc.c | 15 +-
+ drivers/usb/gadget/printer.c | 25 +-
+ drivers/usb/gadget/pxa25x_udc.c | 30 +-
+ drivers/usb/gadget/pxa25x_udc.h | 9 -
+ drivers/usb/gadget/pxa27x_udc.c | 12 +-
+ drivers/usb/gadget/pxa27x_udc.h | 9 -
+ drivers/usb/gadget/r8a66597-udc.c | 16 +-
+ drivers/usb/gadget/r8a66597-udc.h | 10 -
+ drivers/usb/gadget/s3c-hsotg.c | 10 +-
+ drivers/usb/gadget/s3c-hsudc.c | 69 +-
+ drivers/usb/gadget/s3c2410_udc.c | 16 +-
+ drivers/usb/gadget/s3c2410_udc.h | 10 -
+ drivers/usb/gadget/storage_common.c | 65 +-
+ drivers/usb/gadget/u_ether.c | 9 -
+ drivers/usb/gadget/u_ether.h | 9 -
+ drivers/usb/gadget/u_serial.c | 3 +-
+ drivers/usb/gadget/udc-core.c | 21 +-
+ drivers/usb/gadget/uvc.h | 1 -
+ drivers/usb/gadget/uvc_queue.c | 1 -
+ drivers/usb/gadget/uvc_v4l2.c | 1 -
+ drivers/usb/gadget/uvc_video.c | 1 -
+ drivers/usb/gadget/webcam.c | 2 +-
+ drivers/usb/gadget/zero.c | 9 -
+ drivers/usb/host/Kconfig | 15 +-
+ drivers/usb/host/Makefile | 3 +-
+ drivers/usb/host/ehci-ath79.c | 2 +-
+ drivers/usb/host/ehci-au1xxx.c | 4 +-
+ drivers/usb/host/ehci-dbg.c | 17 +-
+ drivers/usb/host/ehci-fsl.c | 6 +-
+ drivers/usb/host/ehci-hcd.c | 61 +-
+ drivers/usb/host/ehci-hub.c | 10 +-
+ drivers/usb/host/ehci-mxc.c | 2 +-
+ drivers/usb/host/ehci-octeon.c | 2 +-
+ drivers/usb/host/ehci-omap.c | 2 +-
+ drivers/usb/host/ehci-orion.c | 2 +-
+ drivers/usb/host/ehci-pci.c | 2 +-
+ drivers/usb/host/ehci-ps3.c | 2 +-
+ drivers/usb/host/ehci-pxa168.c | 363 ++++
+ drivers/usb/host/ehci-q.c | 31 +-
+ drivers/usb/host/ehci-s5p.c | 4 +-
+ drivers/usb/host/ehci-sched.c | 11 +-
+ drivers/usb/host/ehci-sh.c | 2 +-
+ drivers/usb/host/ehci-spear.c | 2 +-
+ drivers/usb/host/ehci-tegra.c | 2 +-
+ drivers/usb/host/ehci-vt8500.c | 2 +-
+ drivers/usb/host/ehci-xls.c | 161 ++
+ drivers/usb/host/ehci.h | 7 +
+ drivers/usb/host/fhci-hcd.c | 9 +-
+ drivers/usb/host/imx21-hcd.c | 2 +-
+ drivers/usb/host/isp116x-hcd.c | 2 +-
+ drivers/usb/host/isp1362-hcd.c | 8 +-
+ drivers/usb/host/isp1760-hcd.c | 401 +++--
+ drivers/usb/host/isp1760-hcd.h | 3 +-
+ drivers/usb/host/isp1760-if.c | 6 +-
+ drivers/usb/host/ohci-ath79.c | 2 +-
+ drivers/usb/host/ohci-au1xxx.c | 2 +-
+ drivers/usb/host/ohci-da8xx.c | 2 +-
+ drivers/usb/host/ohci-ep93xx.c | 2 +-
+ drivers/usb/host/ohci-hcd.c | 5 +
+ drivers/usb/host/ohci-octeon.c | 2 +-
+ drivers/usb/host/ohci-omap.c | 4 +-
+ drivers/usb/host/ohci-omap3.c | 4 +-
+ drivers/usb/host/ohci-pnx4008.c | 2 +-
+ drivers/usb/host/ohci-pnx8550.c | 2 +-
+ drivers/usb/host/ohci-ppc-of.c | 2 +-
+ drivers/usb/host/ohci-ppc-soc.c | 2 +-
+ drivers/usb/host/ohci-ps3.c | 2 +-
+ drivers/usb/host/ohci-pxa27x.c | 2 +-
+ drivers/usb/host/ohci-q.c | 4 +-
+ drivers/usb/host/ohci-s3c2410.c | 2 +-
+ drivers/usb/host/ohci-sa1111.c | 2 +-
+ drivers/usb/host/ohci-sh.c | 2 +-
+ drivers/usb/host/ohci-sm501.c | 2 +-
+ drivers/usb/host/ohci-spear.c | 2 +-
+ drivers/usb/host/ohci-ssb.c | 2 +-
+ drivers/usb/host/ohci-tmio.c | 2 +-
+ drivers/usb/host/ohci-xls.c | 151 ++
+ drivers/usb/host/r8a66597-hcd.c | 4 +-
+ drivers/usb/host/sl811-hcd.c | 2 +-
+ drivers/usb/host/uhci-hcd.c | 66 +-
+ drivers/usb/host/uhci-q.c | 6 +-
+ drivers/usb/host/xhci-ext-caps.h | 6 +
+ drivers/usb/host/xhci-hub.c | 105 +-
+ drivers/usb/host/xhci-mem.c | 371 +++-
+ drivers/usb/host/xhci-pci.c | 107 +-
+ drivers/usb/host/xhci-ring.c | 80 +-
+ drivers/usb/host/xhci.c | 1151 ++++++++++-
+ drivers/usb/host/xhci.h | 187 ++-
+ drivers/usb/misc/adutux.c | 14 +-
+ drivers/usb/misc/ftdi-elan.c | 2 +-
+ drivers/usb/misc/idmouse.c | 2 +-
+ drivers/usb/misc/iowarrior.c | 2 +-
+ drivers/usb/misc/ldusb.c | 4 +-
+ drivers/usb/misc/legousbtower.c | 4 +-
+ drivers/usb/misc/usblcd.c | 129 +-
+ drivers/usb/misc/usbled.c | 25 +-
+ drivers/usb/misc/usbtest.c | 31 +-
+ drivers/usb/mon/mon_bin.c | 2 +-
+ drivers/usb/musb/musb_gadget.c | 71 +-
+ drivers/usb/musb/musb_gadget_ep0.c | 8 +
+ drivers/usb/musb/musb_host.c | 2 +-
+ drivers/usb/musb/musbhsdma.c | 2 +-
+ drivers/usb/otg/isp1301_omap.c | 2 +-
+ drivers/usb/otg/twl6030-usb.c | 16 -
+ drivers/usb/renesas_usbhs/mod.c | 2 +-
+ drivers/usb/renesas_usbhs/pipe.c | 2 +-
+ drivers/usb/serial/Kconfig | 1 +
+ drivers/usb/serial/ftdi_sio.c | 4 +-
+ drivers/usb/serial/ftdi_sio_ids.h | 6 +-
+ drivers/usb/serial/io_edgeport.c | 4 +-
+ drivers/usb/serial/ipw.c | 33 +-
+ drivers/usb/serial/opticon.c | 2 +-
+ drivers/usb/serial/option.c | 170 +-
+ drivers/usb/serial/pl2303.c | 4 +-
+ drivers/usb/serial/pl2303.h | 5 +
+ drivers/usb/serial/qcserial.c | 2 +
+ drivers/usb/serial/symbolserial.c | 2 +-
+ drivers/usb/serial/usb-serial.c | 8 +-
+ drivers/usb/storage/Kconfig | 2 +-
+ drivers/usb/storage/realtek_cr.c | 116 +-
+ drivers/usb/storage/transport.c | 34 +-
+ drivers/usb/storage/usb.c | 16 +-
+ drivers/usb/usb-common.c | 35 +
+ drivers/usb/usb-skeleton.c | 2 +-
+ drivers/usb/wusbcore/wa-hc.c | 2 +-
+ include/linux/platform_data/dwc3-omap.h | 47 +
+ include/linux/sched.h | 3 +-
+ include/linux/usb.h | 20 +-
+ include/linux/usb/ch9.h | 29 +
+ include/linux/usb/hcd.h | 1 +
+ kernel/signal.c | 24 +-
+ 225 files changed, 10117 insertions(+), 1962 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
+ create mode 100644 Documentation/usb/dwc3.txt
+ create mode 100644 drivers/usb/dwc3/Kconfig
+ create mode 100644 drivers/usb/dwc3/Makefile
+ create mode 100644 drivers/usb/dwc3/core.c
+ create mode 100644 drivers/usb/dwc3/core.h
+ create mode 100644 drivers/usb/dwc3/debug.h
+ create mode 100644 drivers/usb/dwc3/debugfs.c
+ create mode 100644 drivers/usb/dwc3/dwc3-omap.c
+ create mode 100644 drivers/usb/dwc3/dwc3-pci.c
+ create mode 100644 drivers/usb/dwc3/ep0.c
+ create mode 100644 drivers/usb/dwc3/gadget.c
+ create mode 100644 drivers/usb/dwc3/gadget.h
+ create mode 100644 drivers/usb/dwc3/io.h
+ create mode 100644 drivers/usb/host/ehci-pxa168.c
+ create mode 100644 drivers/usb/host/ehci-xls.c
+ create mode 100644 drivers/usb/host/ohci-xls.c
+ create mode 100644 drivers/usb/usb-common.c
+ create mode 100644 include/linux/platform_data/dwc3-omap.h
+Merging staging/staging-next
+$ git merge staging/staging-next
+Auto-merging MAINTAINERS
+Removing drivers/char/scc.h
+Auto-merging drivers/misc/altera-stapl/altera.c
+CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
+Auto-merging drivers/staging/Kconfig
+Auto-merging drivers/staging/Makefile
+Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+Removing drivers/staging/brcm80211/brcmsmac/alloc.c
+Removing drivers/staging/brcm80211/brcmsmac/bmac.c
+Removing drivers/staging/brcm80211/brcmsmac/bmac.h
+Auto-merging drivers/staging/brcm80211/brcmsmac/brcms_trace_events.c
+Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+Auto-merging drivers/staging/comedi/drivers/ni_labpc.c
+CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
+Removing drivers/staging/cx25821/cx25821-gpio.h
+Auto-merging drivers/staging/dt3155v4l/dt3155v4l.c
+Auto-merging drivers/staging/et131x/et1310_tx.c
+CONFLICT (content): Merge conflict in drivers/staging/et131x/et1310_tx.c
+Auto-merging drivers/staging/et131x/et131x_netdev.c
+Auto-merging drivers/staging/hv/Makefile
+Removing drivers/staging/hv/blkvsc_drv.c
+Removing drivers/staging/hv/hyperv_storage.h
+Auto-merging drivers/staging/hv/netvsc_drv.c
+Removing drivers/staging/hv/storvsc.c
+Removing drivers/staging/iio/accel/accel.h
+Removing drivers/staging/iio/accel/inclinometer.h
+Removing drivers/staging/iio/adc/ad7314.c
+Removing drivers/staging/iio/adc/ad7745.c
+Removing drivers/staging/iio/adc/adc.h
+Auto-merging drivers/staging/iio/addac/adt7316-i2c.c
+Auto-merging drivers/staging/iio/dds/ad9832.c
+Removing drivers/staging/iio/gyro/gyro.h
+Removing drivers/staging/iio/industrialio-ring.c
+Removing drivers/staging/iio/magnetometer/magnet.h
+Removing drivers/staging/iio/resolver/ad2s120x.c
+Removing drivers/staging/iio/ring_generic.h
+Removing drivers/staging/rtl8192e/ieee80211/dot11d.c
+Removing drivers/staging/rtl8192e/ieee80211/dot11d.h
+Removing drivers/staging/rtl8192e/ieee80211/ieee80211.h
+Removing drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
+Removing drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
+Removing drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+Removing drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
+Removing drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
+Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
+Removing drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
+Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
+Removing drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
+Removing drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
+Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
+Removing drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
+Removing drivers/staging/rtl8192e/r8180_93cx6.c
+Removing drivers/staging/rtl8192e/r8180_93cx6.h
+Removing drivers/staging/rtl8192e/r8190_rtl8256.c
+Removing drivers/staging/rtl8192e/r8190_rtl8256.h
+Removing drivers/staging/rtl8192e/r8192E.h
+CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
+Removing drivers/staging/rtl8192e/r8192E_dm.c
+Removing drivers/staging/rtl8192e/r8192E_dm.h
+Removing drivers/staging/rtl8192e/r8192E_wx.c
+Removing drivers/staging/rtl8192e/r8192E_wx.h
+Removing drivers/staging/rtl8192e/r8192_pm.c
+Removing drivers/staging/rtl8192e/r8192_pm.h
+Removing drivers/staging/rtl8192e/r819xE_cmdpkt.c
+Removing drivers/staging/rtl8192e/r819xE_cmdpkt.h
+Removing drivers/staging/rtl8192e/r819xE_firmware.c
+Removing drivers/staging/rtl8192e/r819xE_phy.c
+Removing drivers/staging/rtl8192e/r819xE_phy.h
+Auto-merging drivers/staging/rtl8192e/rtl_crypto.h
+Auto-merging drivers/staging/rtl8192e/rtllib_crypt.c
+Auto-merging drivers/staging/rtl8192e/rtllib_crypt.h
+Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
+Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c
+Auto-merging drivers/staging/rtl8192e/rtllib_crypt_wep.c
+Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c
+Auto-merging drivers/staging/vt6655/Resolved 'drivers/misc/altera-stapl/altera.c' using previous resolution.
+Resolved 'drivers/staging/brcm80211/brcmsmac/mac80211_if.c' using previous resolution.
+Resolved 'drivers/staging/comedi/drivers/ni_labpc.c' using previous resolution.
+Resolved 'drivers/staging/et131x/et1310_tx.c' using previous resolution.
+Resolved 'drivers/staging/xgifb/XGI_main_26.c' using previous resolution.
+Resolved 'drivers/staging/zram/zram_drv.c' using previous resolution.
+device_main.c
+Auto-merging drivers/staging/vt6656/main_usb.c
+Auto-merging drivers/staging/wlags49_h2/wl_netdev.c
+Auto-merging drivers/staging/xgifb/XGI_main_26.c
+CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
+Auto-merging drivers/staging/zcache/zcache-main.c
+Auto-merging drivers/staging/zram/zram_drv.c
+CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
+drivers/misc/altera-stapl/altera.c: needs merge
+drivers/staging/brcm80211/brcmsmac/mac80211_if.c: needs merge
+drivers/staging/comedi/drivers/ni_labpc.c: needs merge
+drivers/staging/et131x/et1310_tx.c: needs merge
+drivers/staging/rtl8192e/r8192E_core.c: needs merge
+drivers/staging/xgifb/XGI_main_26.c: needs merge
+drivers/staging/zram/zram_drv.c: needs merge
+rm 'drivers/staging/rtl8192e/r8192E_core.c'
+$ git commit -v -a
+[master 9da4503] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 14 +-
+ arch/x86/include/asm/hyperv.h | 1 +
+ drivers/char/scc.h | 613 -
+ drivers/misc/altera-stapl/altera.c | 3 +-
+ drivers/staging/Kconfig | 2 +
+ drivers/staging/Makefile | 1 +
+ drivers/staging/bcm/Bcmchar.c | 3181 ++--
+ drivers/staging/bcm/InterfaceDld.c | 93 +-
+ drivers/staging/bcm/Macros.h | 337 +-
+ drivers/staging/bcm/Misc.c | 4 +
+ drivers/staging/bcm/headers.h | 2 +
+ drivers/staging/bcm/nvm.c | 13 +-
+ drivers/staging/brcm80211/Kconfig | 11 +-
+ drivers/staging/brcm80211/Makefile | 1 -
+ drivers/staging/brcm80211/TODO | 4 -
+ drivers/staging/brcm80211/brcmfmac/Makefile | 8 +-
+ drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 505 +-
+ drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1227 +-
+ drivers/staging/brcm80211/brcmfmac/dhd.h | 505 +-
+ drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 39 +-
+ drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 220 +-
+ drivers/staging/brcm80211/brcmfmac/dhd_common.c | 834 +-
+ drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 46 +-
+ drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 1118 +-
+ drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 25 +-
+ drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 7187 ++----
+ drivers/staging/brcm80211/brcmfmac/sdio_host.h | 293 +-
+ drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 3476 ++--
+ drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 85 +-
+ drivers/staging/brcm80211/brcmsmac/Makefile | 15 +-
+ drivers/staging/brcm80211/brcmsmac/aiutils.c | 1248 +-
+ drivers/staging/brcm80211/brcmsmac/aiutils.h | 310 +-
+ drivers/staging/brcm80211/brcmsmac/alloc.c | 275 -
+ drivers/staging/brcm80211/brcmsmac/ampdu.c | 594 +-
+ drivers/staging/brcm80211/brcmsmac/antsel.c | 239 +-
+ drivers/staging/brcm80211/brcmsmac/bmac.c | 3593 ---
+ drivers/staging/brcm80211/brcmsmac/bmac.h | 174 -
+ .../brcmsmac/{alloc.h => brcms_trace_events.c} | 12 +-
+ .../brcm80211/brcmsmac/brcms_trace_events.h | 92 +
+ drivers/staging/brcm80211/brcmsmac/channel.c | 1252 +-
+ drivers/staging/brcm80211/brcmsmac/channel.h | 87 +-
+ drivers/staging/brcm80211/brcmsmac/d11.h | 705 +-
+ drivers/staging/brcm80211/brcmsmac/dma.c | 1686 +-
+ drivers/staging/brcm80211/brcmsmac/dma.h | 200 +-
+ drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 1530 +-
+ drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 25 +-
+ drivers/staging/brcm80211/brcmsmac/main.c |10143 ++++++---
+ drivers/staging/brcm80211/brcmsmac/main.h | 898 +-
+ drivers/staging/brcm80211/brcmsmac/nicpci.c | 181 +-
+ drivers/staging/brcm80211/brcmsmac/nicpci.h | 41 +-
+ drivers/staging/brcm80211/brcmsmac/otp.c | 237 +-
+ drivers/staging/brcm80211/brcmsmac/otp.h | 15 +-
+ drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 1161 +-
+ drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 85 +-
+ drivers/staging/brcm80211/brcmsmac/phy/phy_int.h | 212 +-
+ drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c | 5864 +++---
+ drivers/staging/brcm80211/brcmsmac/phy/phy_n.c |24070 ++++++++++----------
+ drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c | 172 +-
+ .../staging/brcm80211/brcmsmac/phy/phytbl_lcn.c | 1236 +-
+ drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c | 131 +-
+ drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h | 24 +-
+ drivers/staging/brcm80211/brcmsmac/phy_shim.c | 40 +-
+ drivers/staging/brcm80211/brcmsmac/phy_shim.h | 73 +-
+ drivers/staging/brcm80211/brcmsmac/pmu.c | 76 +-
+ drivers/staging/brcm80211/brcmsmac/pmu.h | 14 -
+ drivers/staging/brcm80211/brcmsmac/pub.h | 768 +-
+ drivers/staging/brcm80211/brcmsmac/rate.c | 182 +-
+ drivers/staging/brcm80211/brcmsmac/rate.h | 299 +-
+ drivers/staging/brcm80211/brcmsmac/scb.h | 61 +-
+ drivers/staging/brcm80211/brcmsmac/srom.c | 1427 +-
+ drivers/staging/brcm80211/brcmsmac/srom.h | 4 +-
+ drivers/staging/brcm80211/brcmsmac/stf.c | 259 +-
+ drivers/staging/brcm80211/brcmsmac/stf.h | 6 +-
+ drivers/staging/brcm80211/brcmsmac/types.h | 331 +-
+ drivers/staging/brcm80211/brcmsmac/ucode_loader.c | 120 +-
+ drivers/staging/brcm80211/brcmsmac/ucode_loader.h | 50 +-
+ drivers/staging/brcm80211/brcmutil/utils.c | 203 +-
+ drivers/staging/brcm80211/brcmutil/wifi.c | 41 +-
+ drivers/staging/brcm80211/include/brcmu_utils.h | 242 +-
+ drivers/staging/brcm80211/include/brcmu_wifi.h | 162 +-
+ drivers/staging/brcm80211/include/chipcommon.h | 13 +-
+ drivers/staging/brcm80211/include/defs.h | 32 +-
+ drivers/staging/brcm80211/include/soc.h | 9 +-
+ drivers/staging/comedi/Kconfig | 18 +-
+ drivers/staging/comedi/comedi_fops.c | 2 +-
+ drivers/staging/comedi/drivers/Makefile | 1 +
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 5 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 16 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 34 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 2880 +++
+ drivers/staging/crystalhd/bc_dts_defs.h | 4 +-
+ drivers/staging/crystalhd/bc_dts_glob_lnx.h | 6 +-
+ drivers/staging/crystalhd/bc_dts_types.h | 57 -
+ drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_fw_if.h | 532 +-
+ drivers/staging/crystalhd/crystalhd_misc.h | 6 +-
+ drivers/staging/cx25821/cx25821-alsa.c | 2 +-
+ drivers/staging/cx25821/cx25821-audio-upstream.c | 43 +-
+ drivers/staging/cx25821/cx25821-audio-upstream.h | 9 +-
+ drivers/staging/cx25821/cx25821-audio.h | 6 +-
+ drivers/staging/cx25821/cx25821-cards.c | 26 +-
+ drivers/staging/cx25821/cx25821-core.c | 505 +-
+ drivers/staging/cx25821/cx25821-gpio.c | 1 +
+ drivers/staging/cx25821/cx25821-gpio.h | 2 -
+ drivers/staging/cx25821/cx25821-i2c.c | 30 +-
+ .../staging/cx25821/cx25821-video-upstream-ch2.c | 81 +-
+ .../staging/cx25821/cx25821-video-upstream-ch2.h | 83 +-
+ drivers/staging/cx25821/cx25821-video-upstream.c | 18 +-
+ drivers/staging/cx25821/cx25821-video-upstream.h | 78 +-
+ drivers/staging/cx25821/cx25821-video.c | 1244 +-
+ drivers/staging/cx25821/cx25821-video.h | 79 +-
+ drivers/staging/cx25821/cx25821.h | 10 +-
+ drivers/staging/cxd2099/Makefile | 6 +-
+ drivers/staging/cxt1e1/linux.c | 6 -
+ drivers/staging/cxt1e1/sbecom_inline_linux.h | 64 -
+ drivers/staging/dt3155v4l/dt3155v4l.c | 122 +-
+ drivers/staging/dt3155v4l/dt3155v4l.h | 4 +-
+ drivers/staging/easycap/easycap_ioctl.c | 30 +-
+ drivers/staging/easycap/easycap_main.c | 4 +-
+ drivers/staging/et131x/Makefile | 1 +
+ drivers/staging/et131x/README | 8 +-
+ drivers/staging/et131x/et1310_address_map.h | 8 +-
+ drivers/staging/et131x/et1310_eeprom.c | 34 +-
+ drivers/staging/et131x/et1310_mac.c | 391 +-
+ drivers/staging/et131x/et1310_phy.c | 863 +-
+ drivers/staging/et131x/et1310_phy.h | 300 +-
+ drivers/staging/et131x/et1310_pm.c | 75 +-
+ drivers/staging/et131x/et1310_rx.c | 635 +-
+ drivers/staging/et131x/et1310_rx.h | 64 +-
+ drivers/staging/et131x/et1310_tx.c | 469 +-
+ drivers/staging/et131x/et131x.h | 88 +-
+ drivers/staging/et131x/et131x_adapter.h | 105 +-
+ drivers/staging/et131x/et131x_defs.h | 2 +
+ drivers/staging/et131x/et131x_ethtool.c | 201 +
+ drivers/staging/et131x/et131x_initpci.c | 552 +-
+ drivers/staging/et131x/et131x_isr.c | 87 +-
+ drivers/staging/et131x/et131x_netdev.c | 277 +-
+ drivers/staging/et131x/et131x_version.h | 1 +
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 10 +
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 8 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 3 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 24 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 4 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +-
+ drivers/staging/gma500/accel_2d.c | 24 +-
+ drivers/staging/gma500/cdv_device.c | 1 -
+ drivers/staging/gma500/framebuffer.c | 92 +-
+ drivers/staging/gma500/gem.c | 5 +-
+ drivers/staging/gma500/gtt.c | 81 +-
+ drivers/staging/gma500/gtt.h | 3 +
+ drivers/staging/gma500/intel_opregion.c | 1 +
+ drivers/staging/gma500/mdfld_intel_display.c | 12 +-
+ drivers/staging/gma500/mrst_crtc.c | 16 +-
+ drivers/staging/gma500/power.c | 8 +-
+ drivers/staging/gma500/psb_device.c | 32 -
+ drivers/staging/gma500/psb_drv.c | 49 +-
+ drivers/staging/gma500/psb_drv.h | 6 +-
+ drivers/staging/gma500/psb_intel_display.c | 4 -
+ drivers/staging/gma500/psb_intel_lvds.c | 61 +-
+ drivers/staging/gma500/psb_irq.c | 71 +-
+ drivers/staging/gma500/psb_lid.c | 2 -
+ drivers/staging/go7007/Makefile | 8 +-
+ drivers/staging/go7007/wis-tw2804.c | 6 +-
+ drivers/staging/hv/Kconfig | 9 +-
+ drivers/staging/hv/Makefile | 4 +-
+ drivers/staging/hv/TODO | 11 +-
+ drivers/staging/hv/blkvsc_drv.c | 1026 -
+ drivers/staging/hv/channel.c | 120 +-
+ drivers/staging/hv/channel_mgmt.c | 177 +-
+ drivers/staging/hv/connection.c | 54 +-
+ drivers/staging/hv/hv.c | 21 +-
+ drivers/staging/hv/hv_kvp.c | 14 +-
+ drivers/staging/hv/hv_kvp.h | 2 +-
+ drivers/staging/hv/hv_mouse.c | 711 +-
+ drivers/staging/hv/hv_util.c | 202 +-
+ drivers/staging/hv/hyperv.h | 85 +-
+ drivers/staging/hv/hyperv_net.h | 5 +-
+ drivers/staging/hv/hyperv_storage.h | 334 -
+ drivers/staging/hv/hyperv_vmbus.h | 12 +-
+ drivers/staging/hv/netvsc.c | 329 +-
+ drivers/staging/hv/netvsc_drv.c | 148 +-
+ drivers/staging/hv/ring_buffer.c | 9 +-
+ drivers/staging/hv/rndis_filter.c | 146 +-
+ drivers/staging/hv/storvsc.c | 564 -
+ drivers/staging/hv/storvsc_drv.c | 869 +-
+ drivers/staging/hv/tools/hv_kvp_daemon.c | 19 +-
+ drivers/staging/hv/vmbus_drv.c | 444 +-
+ drivers/staging/iio/Documentation/generic_buffer.c | 12 +-
+ drivers/staging/iio/Documentation/iio_utils.h | 2 +-
+ drivers/staging/iio/Documentation/sysfs-bus-iio | 738 +-
+ .../iio/Documentation/sysfs-bus-iio-adc-ad7280a | 21 +
+ .../sysfs-bus-iio-impedance-analyzer-ad5933 | 30 +
+ drivers/staging/iio/Kconfig | 7 +-
+ drivers/staging/iio/Makefile | 3 +-
+ drivers/staging/iio/accel/Kconfig | 32 +-
+ drivers/staging/iio/accel/Makefile | 12 +-
+ drivers/staging/iio/accel/accel.h | 87 -
+ drivers/staging/iio/accel/adis16201.h | 6 +-
+ drivers/staging/iio/accel/adis16201_core.c | 41 +-
+ drivers/staging/iio/accel/adis16201_ring.c | 48 +-
+ drivers/staging/iio/accel/adis16201_trigger.c | 13 +-
+ drivers/staging/iio/accel/adis16203.h | 6 +-
+ drivers/staging/iio/accel/adis16203_core.c | 41 +-
+ drivers/staging/iio/accel/adis16203_ring.c | 39 +-
+ drivers/staging/iio/accel/adis16203_trigger.c | 14 +-
+ drivers/staging/iio/accel/adis16204.h | 6 +-
+ drivers/staging/iio/accel/adis16204_core.c | 92 +-
+ drivers/staging/iio/accel/adis16204_ring.c | 39 +-
+ drivers/staging/iio/accel/adis16204_trigger.c | 14 +-
+ drivers/staging/iio/accel/adis16209.h | 6 +-
+ drivers/staging/iio/accel/adis16209_core.c | 44 +-
+ drivers/staging/iio/accel/adis16209_ring.c | 42 +-
+ drivers/staging/iio/accel/adis16209_trigger.c | 14 +-
+ drivers/staging/iio/accel/adis16220_core.c | 343 +-
+ drivers/staging/iio/accel/adis16240.h | 6 +-
+ drivers/staging/iio/accel/adis16240_core.c | 42 +-
+ drivers/staging/iio/accel/adis16240_ring.c | 40 +-
+ drivers/staging/iio/accel/adis16240_trigger.c | 14 +-
+ drivers/staging/iio/accel/inclinometer.h | 25 -
+ drivers/staging/iio/accel/kxsd9.c | 269 +-
+ drivers/staging/iio/accel/lis3l02dq.h | 26 +-
+ drivers/staging/iio/accel/lis3l02dq_core.c | 109 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 124 +-
+ drivers/staging/iio/accel/sca3000.h | 4 +-
+ drivers/staging/iio/accel/sca3000_core.c | 70 +-
+ drivers/staging/iio/accel/sca3000_ring.c | 152 +-
+ drivers/staging/iio/adc/Kconfig | 57 +-
+ drivers/staging/iio/adc/Makefile | 13 +-
+ drivers/staging/iio/adc/ad7150.c | 975 +-
+ drivers/staging/iio/adc/ad7152.c | 784 +-
+ drivers/staging/iio/adc/ad7192.c | 1185 +
+ drivers/staging/iio/adc/ad7192.h | 47 +
+ drivers/staging/iio/adc/ad7280a.c | 998 +
+ drivers/staging/iio/adc/ad7280a.h | 38 +
+ drivers/staging/iio/adc/ad7291.c | 1080 +-
+ drivers/staging/iio/adc/ad7298.h | 6 +-
+ drivers/staging/iio/adc/ad7298_core.c | 48 +-
+ drivers/staging/iio/adc/ad7298_ring.c | 48 +-
+ drivers/staging/iio/adc/ad7314.c | 281 -
+ drivers/staging/iio/adc/ad7476.h | 6 +-
+ drivers/staging/iio/adc/ad7476_core.c | 70 +-
+ drivers/staging/iio/adc/ad7476_ring.c | 50 +-
+ drivers/staging/iio/adc/ad7606.h | 12 +-
+ drivers/staging/iio/adc/ad7606_core.c | 274 +-
+ drivers/staging/iio/adc/ad7606_par.c | 2 +-
+ drivers/staging/iio/adc/ad7606_ring.c | 86 +-
+ drivers/staging/iio/adc/ad7606_spi.c | 2 +-
+ drivers/staging/iio/adc/ad7745.c | 674 -
+ drivers/staging/iio/adc/ad7746.c | 806 +
+ drivers/staging/iio/adc/ad7746.h | 29 +
+ drivers/staging/iio/adc/ad7780.c | 7 +-
+ drivers/staging/iio/adc/ad7793.c | 272 +-
+ drivers/staging/iio/adc/ad7816.c | 25 +-
+ drivers/staging/iio/adc/ad7887.h | 10 +-
+ drivers/staging/iio/adc/ad7887_core.c | 59 +-
+ drivers/staging/iio/adc/ad7887_ring.c | 59 +-
+ drivers/staging/iio/adc/ad799x.h | 4 +-
+ drivers/staging/iio/adc/ad799x_core.c | 709 +-
+ drivers/staging/iio/adc/ad799x_ring.c | 69 +-
+ drivers/staging/iio/adc/adc.h | 42 -
+ drivers/staging/iio/adc/adt7310.c | 23 +-
+ drivers/staging/iio/adc/adt7410.c | 21 +-
+ drivers/staging/iio/adc/adt75.c | 20 +-
+ drivers/staging/iio/adc/max1363.h | 8 +-
+ drivers/staging/iio/adc/max1363_core.c | 311 +-
+ drivers/staging/iio/adc/max1363_ring.c | 63 +-
+ drivers/staging/iio/addac/Kconfig | 4 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 1 +
+ drivers/staging/iio/addac/adt7316.c | 45 +-
+ drivers/staging/iio/buffer_generic.h | 228 +
+ drivers/staging/iio/chrdev.h | 54 +-
+ drivers/staging/iio/dac/Kconfig | 4 +-
+ drivers/staging/iio/dac/ad5446.c | 27 +-
+ drivers/staging/iio/dac/ad5504.c | 93 +-
+ drivers/staging/iio/dac/ad5624r_spi.c | 83 +-
+ drivers/staging/iio/dac/ad5686.c | 121 +-
+ drivers/staging/iio/dac/ad5791.c | 236 +-
+ drivers/staging/iio/dac/ad5791.h | 4 -
+ drivers/staging/iio/dac/dac.h | 2 +-
+ drivers/staging/iio/dac/max517.c | 26 +-
+ drivers/staging/iio/dds/Kconfig | 4 +-
+ drivers/staging/iio/dds/ad5930.c | 1 +
+ drivers/staging/iio/dds/ad9832.c | 1 +
+ drivers/staging/iio/dds/ad9834.c | 1 +
+ drivers/staging/iio/dds/ad9850.c | 1 +
+ drivers/staging/iio/dds/ad9852.c | 2 +-
+ drivers/staging/iio/dds/ad9910.c | 2 +-
+ drivers/staging/iio/dds/ad9951.c | 2 +-
+ drivers/staging/iio/gyro/Kconfig | 8 +-
+ drivers/staging/iio/gyro/Makefile | 2 +-
+ drivers/staging/iio/gyro/adis16060_core.c | 124 +-
+ drivers/staging/iio/gyro/adis16080_core.c | 102 +-
+ drivers/staging/iio/gyro/adis16130_core.c | 145 +-
+ drivers/staging/iio/gyro/adis16260.h | 6 +-
+ drivers/staging/iio/gyro/adis16260_core.c | 55 +-
+ drivers/staging/iio/gyro/adis16260_ring.c | 39 +-
+ drivers/staging/iio/gyro/adis16260_trigger.c | 14 +-
+ drivers/staging/iio/gyro/adxrs450_core.c | 253 +-
+ drivers/staging/iio/gyro/gyro.h | 85 -
+ drivers/staging/iio/iio.h | 222 +-
+ drivers/staging/iio/iio_core.h | 63 +
+ drivers/staging/iio/iio_core_trigger.h | 46 +
+ drivers/staging/iio/impedance-analyzer/Kconfig | 18 +
+ drivers/staging/iio/impedance-analyzer/Makefile | 5 +
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 813 +
+ drivers/staging/iio/impedance-analyzer/ad5933.h | 28 +
+ drivers/staging/iio/imu/Kconfig | 16 +-
+ drivers/staging/iio/imu/Makefile | 2 +-
+ drivers/staging/iio/imu/adis16400.h | 6 +-
+ drivers/staging/iio/imu/adis16400_core.c | 650 +-
+ drivers/staging/iio/imu/adis16400_ring.c | 49 +-
+ drivers/staging/iio/imu/adis16400_trigger.c | 16 +-
+ drivers/staging/iio/industrialio-buffer.c | 635 +
+ drivers/staging/iio/industrialio-core.c | 908 +-
+ drivers/staging/iio/industrialio-ring.c | 596 -
+ drivers/staging/iio/industrialio-trigger.c | 146 +-
+ drivers/staging/iio/kfifo_buf.c | 78 +-
+ drivers/staging/iio/kfifo_buf.h | 16 +-
+ drivers/staging/iio/light/Kconfig | 4 +-
+ drivers/staging/iio/light/isl29018.c | 73 +-
+ drivers/staging/iio/light/tsl2563.c | 59 +-
+ drivers/staging/iio/light/tsl2583.c | 221 +-
+ drivers/staging/iio/magnetometer/Kconfig | 3 +-
+ drivers/staging/iio/magnetometer/ak8975.c | 235 +-
+ drivers/staging/iio/magnetometer/hmc5843.c | 100 +-
+ drivers/staging/iio/magnetometer/magnet.h | 31 -
+ drivers/staging/iio/meter/Kconfig | 8 +-
+ drivers/staging/iio/meter/Makefile | 2 +-
+ drivers/staging/iio/meter/ade7753.c | 26 +-
+ drivers/staging/iio/meter/ade7754.c | 27 +-
+ drivers/staging/iio/meter/ade7758.h | 13 +-
+ drivers/staging/iio/meter/ade7758_core.c | 51 +-
+ drivers/staging/iio/meter/ade7758_ring.c | 57 +-
+ drivers/staging/iio/meter/ade7758_trigger.c | 16 +-
+ drivers/staging/iio/meter/ade7759.c | 23 +-
+ drivers/staging/iio/meter/ade7854-i2c.c | 1 +
+ drivers/staging/iio/meter/ade7854-spi.c | 1 +
+ drivers/staging/iio/meter/ade7854.c | 3 +-
+ drivers/staging/iio/resolver/Kconfig | 7 +-
+ drivers/staging/iio/resolver/Makefile | 2 +-
+ drivers/staging/iio/resolver/ad2s1200.c | 187 +
+ drivers/staging/iio/resolver/ad2s120x.c | 177 -
+ drivers/staging/iio/resolver/ad2s1210.c | 221 +-
+ drivers/staging/iio/resolver/ad2s90.c | 59 +-
+ drivers/staging/iio/ring_generic.h | 288 -
+ drivers/staging/iio/ring_hw.h | 6 +-
+ drivers/staging/iio/ring_sw.c | 69 +-
+ drivers/staging/iio/ring_sw.h | 8 +-
+ drivers/staging/iio/sysfs.h | 136 +-
+ drivers/staging/iio/trigger.h | 116 +-
+ drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 6 +-
+ drivers/staging/iio/trigger/iio-trig-gpio.c | 6 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 7 +-
+ drivers/staging/iio/trigger/iio-trig-sysfs.c | 13 +-
+ drivers/staging/iio/trigger_consumer.h | 71 +-
+ drivers/staging/intel_sst/intel_sst.c | 10 +-
+ drivers/staging/intel_sst/intel_sst_dsp.c | 2 +-
+ drivers/staging/intel_sst/intelmid.c | 1 +
+ drivers/staging/keucr/scsiglue.c | 5 +-
+ drivers/staging/keucr/smil.h | 6 +-
+ drivers/staging/keucr/smilsub.c | 1574 +-
+ drivers/staging/keucr/smscsi.c | 117 +-
+ drivers/staging/lirc/lirc_imon.c | 6 +-
+ drivers/staging/lirc/lirc_sasem.c | 46 +-
+ drivers/staging/lirc/lirc_serial.c | 2 +-
+ drivers/staging/lirc/lirc_sir.c | 2 +-
+ drivers/staging/mei/Kconfig | 2 +-
+ drivers/staging/mei/init.c | 25 +-
+ drivers/staging/mei/interface.c | 4 +-
+ drivers/staging/mei/interface.h | 8 +-
+ drivers/staging/mei/interrupt.c | 85 +-
+ drivers/staging/mei/main.c | 51 +-
+ drivers/staging/mei/mei_dev.h | 24 +-
+ drivers/staging/mei/wd.c | 242 +-
+ drivers/staging/nvec/Kconfig | 12 +-
+ drivers/staging/nvec/Makefile | 1 +
+ drivers/staging/nvec/TODO | 10 +-
+ drivers/staging/nvec/nvec-keytable.h | 225 +-
+ drivers/staging/nvec/nvec.c | 957 +-
+ drivers/staging/nvec/nvec.h | 217 +-
+ drivers/staging/nvec/nvec_kbd.c | 95 +-
+ drivers/staging/nvec/nvec_leds.c | 114 +
+ drivers/staging/nvec/nvec_power.c | 352 +-
+ drivers/staging/nvec/nvec_ps2.c | 114 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 47 +-
+ drivers/staging/panel/panel.c | 10 +-
+ drivers/staging/pohmelfs/trans.c | 6 +-
+ drivers/staging/quatech_usb2/quatech_usb2.c | 9 +-
+ drivers/staging/rtl8187se/Makefile | 6 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac.c | 14 +-
+ drivers/staging/rtl8187se/r8180_rtl8225z2.c | 4 +-
+ drivers/staging/rtl8192e/Makefile | 67 +-
+ drivers/staging/rtl8192e/TODO | 2 +
+ drivers/staging/rtl8192e/dot11d.c | 216 +
+ drivers/staging/rtl8192e/dot11d.h | 113 +-
+ drivers/staging/rtl8192e/ieee80211/dot11d.c | 218 -
+ drivers/staging/rtl8192e/ieee80211/dot11d.h | 102 -
+ drivers/staging/rtl8192e/ieee80211/ieee80211.h | 2636 ---
+ .../staging/rtl8192e/ieee80211/ieee80211_module.c | 352 -
+ drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2676 ---
+ .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3278 ---
+ drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 955 -
+ drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 872 -
+ drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h | 69 -
+ .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 676 -
+ drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 483 -
+ .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 1732 --
+ drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 582 -
+ drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 56 -
+ .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 627 -
+ drivers/staging/rtl8192e/license | 339 +
+ drivers/staging/rtl8192e/r8180_93cx6.c | 141 -
+ drivers/staging/rtl8192e/r8180_93cx6.h | 41 -
+ drivers/staging/rtl8192e/r8190P_def.h | 410 +
+ drivers/staging/rtl8192e/r8190P_rtl8256.c | 306 +
+ drivers/staging/rtl8192e/r8190P_rtl8256.h | 31 +
+ drivers/staging/rtl8192e/r8190_rtl8256.c | 677 -
+ drivers/staging/rtl8192e/r8190_rtl8256.h | 29 -
+ drivers/staging/rtl8192e/r8192E.h | 1148 -
+ drivers/staging/rtl8192e/r8192E_cmdpkt.c | 418 +
+ drivers/staging/rtl8192e/r8192E_cmdpkt.h | 159 +
+ drivers/staging/rtl8192e/r8192E_core.c | 5039 ----
+ drivers/staging/rtl8192e/r8192E_dev.c | 2395 ++
+ drivers/staging/rtl8192e/r8192E_dev.h | 62 +
+ drivers/staging/rtl8192e/r8192E_dm.c | 2554 ---
+ drivers/staging/rtl8192e/r8192E_dm.h | 228 -
+ drivers/staging/rtl8192e/r8192E_firmware.c | 348 +
+ drivers/staging/rtl8192e/r8192E_firmware.h | 73 +
+ drivers/staging/rtl8192e/r8192E_hw.h | 552 +-
+ drivers/staging/rtl8192e/r8192E_hwimg.c | 3336 +++
+ drivers/staging/rtl8192e/r8192E_hwimg.h | 51 +
+ drivers/staging/rtl8192e/r8192E_phy.c | 1637 ++
+ drivers/staging/rtl8192e/r8192E_phy.h | 120 +
+ drivers/staging/rtl8192e/r8192E_phyreg.h | 852 +
+ drivers/staging/rtl8192e/r8192E_wx.c | 1163 -
+ drivers/staging/rtl8192e/r8192E_wx.h | 18 -
+ drivers/staging/rtl8192e/r8192_pm.c | 123 -
+ drivers/staging/rtl8192e/r8192_pm.h | 24 -
+ drivers/staging/rtl8192e/r819xE_cmdpkt.c | 444 -
+ drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 -
+ drivers/staging/rtl8192e/r819xE_firmware.c | 351 -
+ drivers/staging/rtl8192e/r819xE_phy.c | 2225 --
+ drivers/staging/rtl8192e/r819xE_phy.h | 131 -
+ drivers/staging/rtl8192e/rtl819x_BA.h | 77 +
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 566 +
+ drivers/staging/rtl8192e/rtl819x_HT.h | 475 +
+ drivers/staging/rtl8192e/rtl819x_HTProc.c | 1075 +
+ drivers/staging/rtl8192e/rtl819x_Qos.h | 444 +
+ drivers/staging/rtl8192e/rtl819x_TS.h | 73 +
+ drivers/staging/rtl8192e/rtl819x_TSProc.c | 548 +
+ drivers/staging/rtl8192e/rtl_cam.c | 304 +
+ drivers/staging/rtl8192e/rtl_cam.h | 46 +
+ drivers/staging/rtl8192e/rtl_core.c | 3198 +++
+ drivers/staging/rtl8192e/rtl_core.h | 1124 +
+ .../staging/rtl8192e/{ieee80211 => }/rtl_crypto.h | 105 +-
+ drivers/staging/rtl8192e/rtl_debug.c | 1108 +
+ drivers/staging/rtl8192e/rtl_debug.h | 299 +
+ drivers/staging/rtl8192e/rtl_dm.c | 2995 +++
+ drivers/staging/rtl8192e/rtl_dm.h | 324 +
+ drivers/staging/rtl8192e/rtl_eeprom.c | 139 +
+ drivers/staging/rtl8192e/rtl_eeprom.h | 29 +
+ drivers/staging/rtl8192e/rtl_ethtool.c | 53 +
+ drivers/staging/rtl8192e/rtl_pci.c | 97 +
+ drivers/staging/rtl8192e/rtl_pci.h | 104 +
+ drivers/staging/rtl8192e/rtl_pm.c | 136 +
+ drivers/staging/rtl8192e/rtl_pm.h | 35 +
+ drivers/staging/rtl8192e/rtl_ps.c | 310 +
+ drivers/staging/rtl8192e/rtl_ps.h | 47 +
+ drivers/staging/rtl8192e/rtl_wx.c | 1333 ++
+ drivers/staging/rtl8192e/rtl_wx.h | 31 +
+ drivers/staging/rtl8192e/rtllib.h | 3144 +++
+ .../ieee80211_crypt.c => rtllib_crypt.c} | 91 +-
+ .../ieee80211_crypt.h => rtllib_crypt.h} | 32 +-
+ .../ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} | 170 +-
+ .../ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} | 310 +-
+ .../ieee80211_crypt_wep.c => rtllib_crypt_wep.c} | 116 +-
+ drivers/staging/rtl8192e/rtllib_endianfree.h | 160 +
+ drivers/staging/rtl8192e/rtllib_module.c | 289 +
+ drivers/staging/rtl8192e/rtllib_rx.c | 2720 +++
+ drivers/staging/rtl8192e/rtllib_softmac.c | 3741 +++
+ .../ieee80211_softmac_wx.c => rtllib_softmac_wx.c} | 381 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 967 +
+ drivers/staging/rtl8192e/rtllib_wx.c | 876 +
+ drivers/staging/rtl8192u/ieee80211/compress.c | 4 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 14 +-
+ drivers/staging/rtl8712/Kconfig | 7 +
+ drivers/staging/rtl8712/basic_types.h | 25 +
+ drivers/staging/rtl8712/big_endian.h | 25 +
+ drivers/staging/rtl8712/drv_types.h | 33 +
+ drivers/staging/rtl8712/ethernet.h | 25 +
+ drivers/staging/rtl8712/generic.h | 25 +
+ drivers/staging/rtl8712/hal_init.c | 6 +
+ drivers/staging/rtl8712/ieee80211.c | 35 +-
+ drivers/staging/rtl8712/ieee80211.h | 31 +-
+ drivers/staging/rtl8712/if_ether.h | 25 +
+ drivers/staging/rtl8712/little_endian.h | 25 +
+ drivers/staging/rtl8712/mlme_osdep.h | 25 +
+ drivers/staging/rtl8712/mp_custom_oid.h | 25 +
+ drivers/staging/rtl8712/os_intfs.c | 33 +-
+ drivers/staging/rtl8712/osdep_intf.h | 25 +
+ drivers/staging/rtl8712/osdep_service.h | 69 +-
+ drivers/staging/rtl8712/recv_linux.c | 6 +-
+ drivers/staging/rtl8712/recv_osdep.h | 25 +
+ drivers/staging/rtl8712/rtl8712_bitdef.h | 21 +
+ drivers/staging/rtl8712/rtl8712_cmd.c | 18 +
+ drivers/staging/rtl8712/rtl8712_cmd.h | 87 +
+ drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 19 +
+ .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 25 +
+ .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_efuse.c | 75 +-
+ drivers/staging/rtl8712/rtl8712_event.h | 25 +
+ drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_gp_regdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_hal.h | 25 +
+ drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_led.c | 2 +-
+ .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 19 +
+ .../staging/rtl8712/rtl8712_macsetting_regdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_recv.c | 24 +-
+ drivers/staging/rtl8712/rtl8712_recv.h | 31 +-
+ drivers/staging/rtl8712/rtl8712_regdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_security_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_spec.h | 25 +
+ drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 19 +
+ drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 25 +
+ drivers/staging/rtl8712/rtl8712_xmit.c | 303 +-
+ drivers/staging/rtl8712/rtl8712_xmit.h | 37 +
+ drivers/staging/rtl8712/rtl871x_byteorder.h | 19 +
+ drivers/staging/rtl8712/rtl871x_cmd.c | 172 +-
+ drivers/staging/rtl8712/rtl871x_cmd.h | 77 +-
+ drivers/staging/rtl8712/rtl871x_debug.h | 25 +
+ drivers/staging/rtl8712/rtl871x_eeprom.h | 19 +
+ drivers/staging/rtl8712/rtl871x_event.h | 25 +
+ drivers/staging/rtl8712/rtl871x_ht.h | 25 +
+ drivers/staging/rtl8712/rtl871x_io.h | 25 +
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 306 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 25 +
+ drivers/staging/rtl8712/rtl871x_ioctl_set.c | 3 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_set.h | 27 +-
+ drivers/staging/rtl8712/rtl871x_led.h | 25 +
+ drivers/staging/rtl8712/rtl871x_mlme.c | 58 +-
+ drivers/staging/rtl8712/rtl871x_mlme.h | 28 +-
+ drivers/staging/rtl8712/rtl871x_mp.c | 26 +-
+ drivers/staging/rtl8712/rtl871x_mp.h | 26 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 29 +-
+ drivers/staging/rtl8712/rtl871x_pwrctrl.h | 25 +
+ drivers/staging/rtl8712/rtl871x_recv.c | 4 +
+ drivers/staging/rtl8712/rtl871x_rf.h | 25 +
+ drivers/staging/rtl8712/rtl871x_security.c | 15 +
+ drivers/staging/rtl8712/rtl871x_security.h | 25 +
+ drivers/staging/rtl8712/rtl871x_wlan_sme.h | 25 +
+ drivers/staging/rtl8712/rtl871x_xmit.c | 31 +-
+ drivers/staging/rtl8712/rtl871x_xmit.h | 52 +-
+ drivers/staging/rtl8712/sta_info.h | 29 +-
+ drivers/staging/rtl8712/swab.h | 25 +
+ drivers/staging/rtl8712/usb_intf.c | 19 +-
+ drivers/staging/rtl8712/usb_ops.h | 25 +
+ drivers/staging/rtl8712/usb_ops_linux.c | 29 +-
+ drivers/staging/rtl8712/usb_osintf.h | 26 +
+ drivers/staging/rtl8712/usb_vendor_req.h | 25 +
+ drivers/staging/rtl8712/wifi.h | 25 +
+ drivers/staging/rtl8712/wlan_bssdef.h | 25 +
+ drivers/staging/rtl8712/xmit_linux.c | 27 +-
+ drivers/staging/rtl8712/xmit_osdep.h | 26 +
+ drivers/staging/rts5139/Kconfig | 16 +
+ drivers/staging/rts5139/Makefile | 37 +
+ drivers/staging/rts5139/TODO | 5 +
+ drivers/staging/rts5139/debug.h | 46 +
+ drivers/staging/rts5139/ms.c | 4191 ++++
+ drivers/staging/rts5139/ms.h | 263 +
+ drivers/staging/rts5139/ms_mg.c | 642 +
+ drivers/staging/rts5139/ms_mg.h | 41 +
+ drivers/staging/rts5139/rts51x.c | 967 +
+ drivers/staging/rts5139/rts51x.h | 205 +
+ drivers/staging/rts5139/rts51x_card.c | 986 +
+ drivers/staging/rts5139/rts51x_card.h | 881 +
+ drivers/staging/rts5139/rts51x_chip.c | 1167 +
+ drivers/staging/rts5139/rts51x_chip.h | 904 +
+ drivers/staging/rts5139/rts51x_fop.c | 298 +
+ drivers/staging/rts5139/rts51x_fop.h | 62 +
+ drivers/staging/rts5139/rts51x_scsi.c | 2234 ++
+ drivers/staging/rts5139/rts51x_scsi.h | 162 +
+ drivers/staging/rts5139/rts51x_sys.h | 54 +
+ drivers/staging/rts5139/rts51x_transport.c | 1000 +
+ drivers/staging/rts5139/rts51x_transport.h | 80 +
+ drivers/staging/rts5139/sd.c | 3400 +++
+ drivers/staging/rts5139/sd.h | 304 +
+ drivers/staging/rts5139/sd_cprm.c | 1215 +
+ drivers/staging/rts5139/sd_cprm.h | 54 +
+ drivers/staging/rts5139/trace.h | 137 +
+ drivers/staging/rts5139/xd.c | 2255 ++
+ drivers/staging/rts5139/xd.h | 193 +
+ drivers/staging/rts_pstor/Makefile | 2 +-
+ drivers/staging/rts_pstor/rtsx_scsi.c | 2 +-
+ drivers/staging/rts_pstor/sd.c | 4 +-
+ drivers/staging/rts_pstor/spi.c | 2 +-
+ drivers/staging/sep/sep_driver.c | 6 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 37 +-
+ drivers/staging/sm7xx/smtcfb.c | 2 +
+ drivers/staging/spectra/ffsport.c | 15 +-
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 +
+ drivers/staging/tidspbridge/gen/gh.c | 2 +-
+ drivers/staging/usbip/stub.h | 5 +
+ drivers/staging/usbip/stub_dev.c | 7 +-
+ drivers/staging/usbip/stub_main.c | 1 +
+ drivers/staging/usbip/stub_rx.c | 5 +-
+ drivers/staging/usbip/usbip_common.h | 8 +-
+ drivers/staging/usbip/usbip_protocol.txt | 358 +
+ .../staging/usbip/userspace/libsrc/vhci_driver.c | 2 +-
+ drivers/staging/usbip/userspace/src/usbip_attach.c | 4 +-
+ drivers/staging/usbip/userspace/src/utils.h | 1 +
+ drivers/staging/usbip/vhci.h | 5 +
+ drivers/staging/vme/bridges/vme_ca91cx42.c | 24 +
+ drivers/staging/vme/bridges/vme_tsi148.c | 24 +
+ drivers/staging/vme/devices/vme_user.c | 4 +-
+ drivers/staging/vme/vme.c | 95 +-
+ drivers/staging/vme/vme_bridge.h | 13 +-
+ drivers/staging/vt6655/IEEE11h.c | 406 +-
+ drivers/staging/vt6655/device_main.c | 10 +-
+ drivers/staging/vt6655/dpc.c | 30 +-
+ drivers/staging/vt6655/ioctl.c | 1 +
+ drivers/staging/vt6655/wmgr.c | 49 +-
+ drivers/staging/vt6656/dpc.c | 30 +-
+ drivers/staging/vt6656/ioctl.c | 1 +
+ drivers/staging/vt6656/main_usb.c | 11 +-
+ drivers/staging/vt6656/wmgr.c | 49 +-
+ drivers/staging/vt6656/wpactl.c | 18 +-
+ drivers/staging/winbond/phy_calibration.c | 12 +-
+ drivers/staging/wlags49_h2/debug.h | 61 +-
+ drivers/staging/wlags49_h2/hcf.c | 6434 +++---
+ drivers/staging/wlags49_h2/hcf.h | 10 -
+ drivers/staging/wlags49_h2/hcfcfg.h | 1567 --
+ drivers/staging/wlags49_h2/hcfdef.h | 857 +-
+ drivers/staging/wlags49_h2/mdd.h | 34 +-
+ drivers/staging/wlags49_h2/wl_cs.c | 114 -
+ drivers/staging/wlags49_h2/wl_internal.h | 7 -
+ drivers/staging/wlags49_h2/wl_netdev.c | 2 +-
+ drivers/staging/wlags49_h2/wl_version.h | 6 +-
+ drivers/staging/wlags49_h2/wl_wext.c | 269 +-
+ drivers/staging/wlags49_h2/wl_wext.h | 8 -
+ drivers/staging/xgifb/TODO | 1 -
+ drivers/staging/xgifb/XGI_main.h | 141 +-
+ drivers/staging/xgifb/XGI_main_26.c | 838 +-
+ drivers/staging/xgifb/XGIfb.h | 16 +-
+ drivers/staging/xgifb/vb_def.h | 605 +-
+ drivers/staging/xgifb/vb_ext.h | 20 -
+ drivers/staging/xgifb/vb_init.c | 22 +-
+ drivers/staging/xgifb/vb_setmode.c | 1530 +-
+ drivers/staging/xgifb/vb_struct.h | 93 +-
+ drivers/staging/xgifb/vb_table.h | 1200 +-
+ drivers/staging/xgifb/vb_util.c | 5 +-
+ drivers/staging/xgifb/vgatypes.h | 7 +-
+ drivers/staging/zcache/zcache-main.c | 6 +-
+ drivers/staging/zram/zram_drv.c | 97 +-
+ drivers/staging/zram/zram_drv.h | 12 +-
+ drivers/staging/zram/zram_sysfs.c | 22 +-
+ include/linux/mod_devicetable.h | 9 +
+ scripts/mod/file2alias.c | 25 +
+ 675 files changed, 126056 insertions(+), 105072 deletions(-)
+ delete mode 100644 drivers/char/scc.h
+ delete mode 100644 drivers/staging/brcm80211/brcmsmac/alloc.c
+ delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.c
+ delete mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h
+ rename drivers/staging/brcm80211/brcmsmac/{alloc.h => brcms_trace_events.c} (76%)
+ create mode 100644 drivers/staging/brcm80211/brcmsmac/brcms_trace_events.h
+ create mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-gpio.h
+ create mode 100644 drivers/staging/et131x/et131x_ethtool.c
+ delete mode 100644 drivers/staging/hv/blkvsc_drv.c
+ delete mode 100644 drivers/staging/hv/hyperv_storage.h
+ delete mode 100644 drivers/staging/hv/storvsc.c
+ create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a
+ create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-impedance-analyzer-ad5933
+ delete mode 100644 drivers/staging/iio/accel/accel.h
+ delete mode 100644 drivers/staging/iio/accel/inclinometer.h
+ create mode 100644 drivers/staging/iio/adc/ad7192.c
+ create mode 100644 drivers/staging/iio/adc/ad7192.h
+ create mode 100644 drivers/staging/iio/adc/ad7280a.c
+ create mode 100644 drivers/staging/iio/adc/ad7280a.h
+ delete mode 100644 drivers/staging/iio/adc/ad7314.c
+ delete mode 100644 drivers/staging/iio/adc/ad7745.c
+ create mode 100644 drivers/staging/iio/adc/ad7746.c
+ create mode 100644 drivers/staging/iio/adc/ad7746.h
+ delete mode 100644 drivers/staging/iio/adc/adc.h
+ create mode 100644 drivers/staging/iio/buffer_generic.h
+ delete mode 100644 drivers/staging/iio/gyro/gyro.h
+ create mode 100644 drivers/staging/iio/iio_core.h
+ create mode 100644 drivers/staging/iio/iio_core_trigger.h
+ create mode 100644 drivers/staging/iio/impedance-analyzer/Kconfig
+ create mode 100644 drivers/staging/iio/impedance-analyzer/Makefile
+ create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.c
+ create mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h
+ create mode 100644 drivers/staging/iio/industrialio-buffer.c
+ delete mode 100644 drivers/staging/iio/industrialio-ring.c
+ delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
+ create mode 100644 drivers/staging/iio/resolver/ad2s1200.c
+ delete mode 100644 drivers/staging/iio/resolver/ad2s120x.c
+ delete mode 100644 drivers/staging/iio/ring_generic.h
+ create mode 100644 drivers/staging/nvec/nvec_leds.c
+ create mode 100644 drivers/staging/rtl8192e/TODO
+ create mode 100644 drivers/staging/rtl8192e/dot11d.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.h
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211.h
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
+ delete mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
+ create mode 100644 drivers/staging/rtl8192e/license
+ delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c
+ delete mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h
+ create mode 100644 drivers/staging/rtl8192e/r8190P_def.h
+ create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.c
+ create mode 100644 drivers/staging/rtl8192e/r8190P_rtl8256.h
+ delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c
+ delete mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.h
+ delete mode 100644 drivers/staging/rtl8192e/r8192E.h
+ create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_cmdpkt.h
+ delete mode 100644 drivers/staging/rtl8192e/r8192E_core.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_dev.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_dev.h
+ delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.c
+ delete mode 100644 drivers/staging/rtl8192e/r8192E_dm.h
+ create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_firmware.h
+ create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_hwimg.h
+ create mode 100644 drivers/staging/rtl8192e/r8192E_phy.c
+ create mode 100644 drivers/staging/rtl8192e/r8192E_phy.h
+ create mode 100644 drivers/staging/rtl8192e/r8192E_phyreg.h
+ delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.c
+ delete mode 100644 drivers/staging/rtl8192e/r8192E_wx.h
+ delete mode 100644 drivers/staging/rtl8192e/r8192_pm.c
+ delete mode 100644 drivers/staging/rtl8192e/r8192_pm.h
+ delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c
+ delete mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h
+ delete mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c
+ delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.c
+ delete mode 100644 drivers/staging/rtl8192e/r819xE_phy.h
+ create mode 100644 drivers/staging/rtl8192e/rtl819x_BA.h
+ create mode 100644 drivers/staging/rtl8192e/rtl819x_BAProc.c
+ create mode 100644 drivers/staging/rtl8192e/rtl819x_HT.h
+ create mode 100644 drivers/staging/rtl8192e/rtl819x_HTProc.c
+ create mode 100644 drivers/staging/rtl8192e/rtl819x_Qos.h
+ create mode 100644 drivers/staging/rtl8192e/rtl819x_TS.h
+ create mode 100644 drivers/staging/rtl8192e/rtl819x_TSProc.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_cam.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_cam.h
+ create mode 100644 drivers/staging/rtl8192e/rtl_core.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_core.h
+ rename drivers/staging/rtl8192e/{ieee80211 => }/rtl_crypto.h (74%)
+ create mode 100644 drivers/staging/rtl8192e/rtl_debug.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_debug.h
+ create mode 100644 drivers/staging/rtl8192e/rtl_dm.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_dm.h
+ create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_eeprom.h
+ create mode 100644 drivers/staging/rtl8192e/rtl_ethtool.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_pci.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_pci.h
+ create mode 100644 drivers/staging/rtl8192e/rtl_pm.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_pm.h
+ create mode 100644 drivers/staging/rtl8192e/rtl_ps.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_ps.h
+ create mode 100644 drivers/staging/rtl8192e/rtl_wx.c
+ create mode 100644 drivers/staging/rtl8192e/rtl_wx.h
+ create mode 100644 drivers/staging/rtl8192e/rtllib.h
+ rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.c => rtllib_crypt.c} (63%)
+ rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt.h => rtllib_crypt.h} (74%)
+ rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_ccmp.c => rtllib_crypt_ccmp.c} (67%)
+ rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_tkip.c => rtllib_crypt_tkip.c} (71%)
+ rename drivers/staging/rtl8192e/{ieee80211/ieee80211_crypt_wep.c => rtllib_crypt_wep.c} (71%)
+ create mode 100644 drivers/staging/rtl8192e/rtllib_endianfree.h
+ create mode 100644 drivers/staging/rtl8192e/rtllib_module.c
+ create mode 100644 drivers/staging/rtl8192e/rtllib_rx.c
+ create mode 100644 drivers/staging/rtl8192e/rtllib_softmac.c
+ rename drivers/staging/rtl8192e/{ieee80211/ieee80211_softmac_wx.c => rtllib_softmac_wx.c} (50%)
+ create mode 100644 drivers/staging/rtl8192e/rtllib_tx.c
+ create mode 100644 drivers/staging/rtl8192e/rtllib_wx.c
+ create mode 100644 drivers/staging/rts5139/Kconfig
+ create mode 100644 drivers/staging/rts5139/Makefile
+ create mode 100644 drivers/staging/rts5139/TODO
+ create mode 100644 drivers/staging/rts5139/debug.h
+ create mode 100644 drivers/staging/rts5139/ms.c
+ create mode 100644 drivers/staging/rts5139/ms.h
+ create mode 100644 drivers/staging/rts5139/ms_mg.c
+ create mode 100644 drivers/staging/rts5139/ms_mg.h
+ create mode 100644 drivers/staging/rts5139/rts51x.c
+ create mode 100644 drivers/staging/rts5139/rts51x.h
+ create mode 100644 drivers/staging/rts5139/rts51x_card.c
+ create mode 100644 drivers/staging/rts5139/rts51x_card.h
+ create mode 100644 drivers/staging/rts5139/rts51x_chip.c
+ create mode 100644 drivers/staging/rts5139/rts51x_chip.h
+ create mode 100644 drivers/staging/rts5139/rts51x_fop.c
+ create mode 100644 drivers/staging/rts5139/rts51x_fop.h
+ create mode 100644 drivers/staging/rts5139/rts51x_scsi.c
+ create mode 100644 drivers/staging/rts5139/rts51x_scsi.h
+ create mode 100644 drivers/staging/rts5139/rts51x_sys.h
+ create mode 100644 drivers/staging/rts5139/rts51x_transport.c
+ create mode 100644 drivers/staging/rts5139/rts51x_transport.h
+ create mode 100644 drivers/staging/rts5139/sd.c
+ create mode 100644 drivers/staging/rts5139/sd.h
+ create mode 100644 drivers/staging/rts5139/sd_cprm.c
+ create mode 100644 drivers/staging/rts5139/sd_cprm.h
+ create mode 100644 drivers/staging/rts5139/trace.h
+ create mode 100644 drivers/staging/rts5139/xd.c
+ create mode 100644 drivers/staging/rts5139/xd.h
+ create mode 100644 drivers/staging/usbip/usbip_protocol.txt
+Merging bkl-config/config
+$ git merge bkl-config/config
+Already up-to-date.
+Merging tmem/tmem
+$ git merge tmem/tmem
+Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache
+Auto-merging drivers/staging/zcache/zcache-main.c
+Auto-merging include/linux/swap.h
+Auto-merging mm/filemap.c
+Merge made by recursive.
+ .../ABI/testing/sysfs-kernel-mm-cleancache | 11 -
+ Documentation/vm/cleancache.txt | 41 ++--
+ Documentation/vm/frontswap.txt | 210 +++++++++++++++
+ drivers/staging/zcache/zcache-main.c | 10 +-
+ drivers/xen/tmem.c | 10 +-
+ fs/buffer.c | 2 +-
+ fs/super.c | 2 +-
+ include/linux/cleancache.h | 24 +-
+ include/linux/frontswap.h | 126 +++++++++
+ include/linux/swap.h | 4 +
+ include/linux/swapfile.h | 13 +
+ mm/Kconfig | 17 ++
+ mm/Makefile | 1 +
+ mm/cleancache.c | 98 +++-----
+ mm/filemap.c | 2 +-
+ mm/frontswap.c | 273 ++++++++++++++++++++
+ mm/page_io.c | 12 +
+ mm/swapfile.c | 64 ++++-
+ mm/truncate.c | 10 +-
+ 19 files changed, 796 insertions(+), 134 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
+ create mode 100644 Documentation/vm/frontswap.txt
+ create mode 100644 include/linux/frontswap.h
+ create mode 100644 include/linux/swapfile.h
+ create mode 100644 mm/frontswap.c
+Merging writeback/writeback-for-next
+$ git merge writeback/writeback-for-next
+Auto-merging include/linux/sched.h
+Auto-merging kernel/fork.c
+Merge made by recursive.
+ fs/fs-writeback.c | 19 +-
+ include/linux/backing-dev.h | 11 +
+ include/linux/sched.h | 7 +
+ include/linux/writeback.h | 1 +
+ include/trace/events/writeback.h | 24 --
+ kernel/fork.c | 3 +
+ mm/backing-dev.c | 4 +
+ mm/page-writeback.c | 678 +++++++++++++++++++++++++++++---------
+ 8 files changed, 566 insertions(+), 181 deletions(-)
+Merging arm-dt/devicetree/arm-next
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next
+$ git merge hwspinlock/linux-next
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ Documentation/hwspinlock.txt | 74 +++++++-----
+ MAINTAINERS | 14 ++
+ arch/arm/mach-omap2/hwspinlock.c | 8 +-
+ drivers/hwspinlock/Kconfig | 27 +++--
+ drivers/hwspinlock/Makefile | 1 +
+ drivers/hwspinlock/hwspinlock_core.c | 204 +++++++++++++++++++-----------
+ drivers/hwspinlock/hwspinlock_internal.h | 40 ++++--
+ drivers/hwspinlock/omap_hwspinlock.c | 127 +++++++------------
+ drivers/hwspinlock/u8500_hsem.c | 198 +++++++++++++++++++++++++++++
+ include/linux/hwspinlock.h | 46 +++++--
+ 10 files changed, 514 insertions(+), 225 deletions(-)
+ create mode 100644 drivers/hwspinlock/u8500_hsem.c
+Merging pinctrl/for-next
+$ git merge pinctrl/for-next
+Resolved 'arch/arm/mach-u300/Kconfig' using previous resolution.
+Resolved 'arch/arm/mach-u300/core.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-u300/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
+Auto-merging arch/arm/mach-u300/core.c
+CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
+Auto-merging arch/arm/mach-u300/mmc.c
+Removing arch/arm/mach-u300/padmux.c
+Removing arch/arm/mach-u300/padmux.h
+Auto-merging drivers/Kconfig
+Auto-merging drivers/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 974c721] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/pinctrl.txt | 951 ++++++++++++++++++++++++
+ MAINTAINERS | 5 +
+ arch/arm/mach-u300/Kconfig | 2 +
+ arch/arm/mach-u300/Makefile | 2 +-
+ arch/arm/mach-u300/core.c | 81 ++
+ arch/arm/mach-u300/include/mach/syscon.h | 136 ----
+ arch/arm/mach-u300/mmc.c | 16 -
+ arch/arm/mach-u300/padmux.c | 367 ----------
+ arch/arm/mach-u300/padmux.h | 39 -
+ arch/arm/mach-u300/spi.c | 20 -
+ drivers/Kconfig | 4 +
+ drivers/Makefile | 2 +
+ drivers/pinctrl/Kconfig | 36 +
+ drivers/pinctrl/Makefile | 7 +
+ drivers/pinctrl/core.c | 601 +++++++++++++++
+ drivers/pinctrl/core.h | 73 ++
+ drivers/pinctrl/pinmux-u300.c | 1148 +++++++++++++++++++++++++++++
+ drivers/pinctrl/pinmux.c | 1180 ++++++++++++++++++++++++++++++
+ drivers/pinctrl/pinmux.h | 47 ++
+ include/linux/pinctrl/machine.h | 107 +++
+ include/linux/pinctrl/pinctrl.h | 133 ++++
+ include/linux/pinctrl/pinmux.h | 117 +++
+ 22 files changed, 4495 insertions(+), 579 deletions(-)
+ create mode 100644 Documentation/pinctrl.txt
+ delete mode 100644 arch/arm/mach-u300/padmux.c
+ delete mode 100644 arch/arm/mach-u300/padmux.h
+ create mode 100644 drivers/pinctrl/Kconfig
+ create mode 100644 drivers/pinctrl/Makefile
+ create mode 100644 drivers/pinctrl/core.c
+ create mode 100644 drivers/pinctrl/core.h
+ create mode 100644 drivers/pinctrl/pinmux-u300.c
+ create mode 100644 drivers/pinctrl/pinmux.c
+ create mode 100644 drivers/pinctrl/pinmux.h
+ create mode 100644 include/linux/pinctrl/machine.h
+ create mode 100644 include/linux/pinctrl/pinctrl.h
+ create mode 100644 include/linux/pinctrl/pinmux.h
+Merging moduleh/for-sfr
+$ git merge moduleh/for-sfr
+Auto-merging arch/arm/common/scoop.c
+Auto-merging arch/arm/kernel/armksyms.c
+Auto-merging arch/arm/kernel/perf_event.c
+Auto-merging arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/mach-bcmring/mm.c
+CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
+Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
+Auto-merging arch/arm/mach-imx/mach-mx31lite.c
+Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
+Auto-merging arch/arm/mach-ixp2000/core.c
+Auto-merging arch/arm/mach-ixp4xx/common-pci.c
+Auto-merging arch/arm/mach-omap1/board-ams-delta.c
+Auto-merging arch/arm/mach-omap1/board-sx1.c
+Auto-merging arch/arm/mach-omap1/board-voiceblue.c
+Auto-merging arch/arm/mach-omap2/board-omap3evm.c
+Auto-merging arch/arm/mach-omap2/clockdomain.c
+Auto-merging arch/arm/mach-omap2/display.c
+Auto-merging arch/arm/mach-omap2/pm.c
+Auto-merging arch/arm/mach-omap2/voltage.c
+Auto-merging arch/arm/mach-pxa/colibri-pxa270.c
+Auto-merging arch/arm/mach-pxa/corgi.c
+Auto-merging arch/arm/mach-pxa/poodle.c
+Auto-merging arch/arm/mach-pxa/spitz.c
+Auto-merging arch/arm/mach-pxa/trizeps4.c
+Auto-merging arch/arm/mach-s3c2410/mach-h1940.c
+Auto-merging arch/arm/mach-sa1100/jornada720.c
+Auto-merging arch/arm/mm/init.c
+Auto-merging arch/arm/plat-samsung/dev-ts.c
+Auto-merging arch/arm/plat-samsung/platformdata.c
+Auto-merging arch/arm/vfp/vfpmodule.c
+Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c
+Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c
+Auto-merging arch/blackfin/mach-bf527/boards/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-bf527/boards/tll6527m.c
+Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537e.c
+Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537u.c
+Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c
+Auto-merging arch/blackfin/mach-bf537/boards/pnav10.c
+Auto-merging arch/blackfin/mach-bf537/boards/stamp.c
+Auto-merging arch/blackfin/mach-bf537/boards/tcm_bf537.c
+Auto-merging arch/mips/bcm47xx/gpio.c
+Auto-merging arch/mips/bcm47xx/setup.c
+Auto-merging arch/mips/kernel/cpu-probe.c
+Auto-merging arch/mips/kernel/traps.c
+Auto-merging arch/mips/kernel/vpe.c
+Auto-merging arch/parisc/kernel/pci-dma.c
+Auto-merging arch/powerpc/include/asm/machdep.h
+Auto-merging arch/powerpc/kernel/dma-iommu.c
+Auto-merging arch/powerpc/kernel/dma.c
+Auto-merging arch/powerpc/kernel/ibmebus.c
+Auto-merging arch/powerpc/kernel/pci-common.c
+Auto-merging arch/powerpc/kernel/prom.c
+Auto-merging arch/powerpc/kernel/ptrace.c
+Auto-merging arch/powerpc/kernel/setup_64.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/kernel/vio.c
+Auto-merging arch/powerpc/kvm/44x.c
+Auto-merging arch/powerpc/kvm/book3s_exports.c
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kvm/book3s_pr.c
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/powerpc/mm/hash_utils_64.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/mm/mmu_context_hash64.c
+Auto-merging arch/powerpc/mm/numa.c
+Auto-merging arch/powerpc/mm/tlb_nohash.c
+Auto-merging arch/powerpc/platforms/ps3/system-bus.c
+Auto-merging arch/powerpc/platforms/pseries/eeh.c
+Auto-merging arch/powerpc/platforms/pseries/iommu.c
+Auto-merging arch/powerpc/xmon/xmon.c
+Auto-merging arch/sparc/kernel/cpu.c
+Auto-merging arch/sparc/kernel/cpumap.c
+Auto-merging arch/sparc/kernel/process_64.c
+Auto-merging arch/sparc/kernel/setup_32.c
+Auto-merging arch/sparc/kernel/setup_64.c
+Auto-merging arch/x86/crypto/aes_glue.c
+Auto-merging arch/x86/kernel/cpu/amd.c
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+Auto-merging arch/x86/kernel/pci-dma.c
+Auto-merging arch/x86/kernel/rtc.c
+Auto-merging arch/x86/lguest/boot.c
+Auto-merging arch/x86/platform/mrst/vrtc.c
+Auto-merging block/ioctl.c
+Auto-merging drivers/ata/libata-eh.c
+Auto-merging drivers/ata/libata-scsi.c
+Auto-merging drivers/base/power/main.c
+Auto-merging drivers/base/power/runtime.c
+Auto-merging drivers/base/power/wakeup.c
+Auto-merging drivers/bcma/core.c
+Auto-merging drivers/bcma/driver_chipcommon.c
+Auto-merging drivers/bcma/driver_pci.c
+Auto-merging drivers/bcma/main.c
+Auto-merging drivers/block/aoe/aoeblk.c
+Auto-merging drivers/block/ps3vram.c
+Auto-merging drivers/bluetooth/btmrvl_sdio.c
+Auto-merging drivers/bluetooth/btwilink.c
+Auto-merging drivers/char/virtio_console.c
+Auto-merging drivers/cpuidle/cpuidle.c
+Auto-merging drivers/cpuidle/governors/ladder.c
+Auto-merging drivers/cpuidle/governors/menu.c
+Auto-merging drivers/dca/dca-core.c
+Auto-merging drivers/dma/imx-dma.c
+Auto-merging drivers/dma/imx-sdma.c
+Auto-merging drivers/dma/intel_mid_dma.c
+Auto-merging drivers/gpio/gpio-ep93xx.c
+Auto-merging drivers/gpio/gpio-mxc.c
+Auto-merging drivers/gpio/gpio-mxs.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
+Auto-merging drivers/gpu/drm/radeon/ni.c
+Auto-merging drivers/gpu/drm/radeon/r100.c
+Auto-merging drivers/gpu/drm/radeon/r600.c
+Auto-merging drivers/hid/hid-axff.c
+Auto-merging drivers/hid/hid-debug.c
+Auto-merging drivers/hid/hid-picolcd.c
+Auto-merging drivers/hid/hid-sjoy.c
+Auto-merging drivers/hid/usbhid/hid-quirks.c
+Auto-merging drivers/infiniband/core/cma.c
+Auto-merging drivers/infiniband/core/mad.c
+Auto-merging drivers/infiniband/core/ucma.c
+Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c
+Auto-merging drivers/infiniband/hw/qib/qib_init.c
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_cm.c
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ib.c
+Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c
+Auto-merging drivers/input/input-mt.c
+Auto-merging drivers/input/input-polldev.c
+Auto-merging drivers/isdn/i4l/isdn_tty.c
+Auto-merging drivers/leds/leds-asic3.c
+Auto-merging drivers/md/dm-raid.c
+Auto-merging drivers/md/faulty.c
+Auto-merging drivers/md/linear.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/multipath.c
+Auto-merging drivers/md/raid0.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/media/common/saa7146_core.c
+Auto-merging drivers/media/common/saa7146_fops.c
+Auto-merging drivers/media/common/saa7146_hlp.c
+Auto-merging drivers/media/common/saa7146_video.c
+Auto-merging drivers/media/dvb/frontends/dibx000_common.c
+CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
+Auto-merging drivers/media/radio/radio-wl1273.c
+Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
+Auto-merging drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
+Auto-merging drivers/media/rc/rc-main.c
+Auto-merging drivers/media/video/adp1653.c
+Auto-merging drivers/media/video/cx25840/cx25840-ir.c
+Auto-merging drivers/media/video/hexium_gemini.c
+Auto-merging drivers/media/video/hexium_orion.c
+Auto-merging drivers/media/video/m5mols/m5mols_core.c
+Auto-merging drivers/media/video/mt9m111.c
+Auto-merging drivers/media/video/mxb.c
+Auto-merging drivers/media/video/noon010pc30.c
+Auto-merging drivers/media/video/sr030pc30.c
+Auto-merging drivers/media/video/tvp7002.c
+Auto-merging drivers/media/video/v4l2-ctrls.c
+Auto-merging drivers/media/video/v4l2-device.c
+Auto-merging drivers/media/video/v4l2-subdev.c
+Auto-merging drivers/mfd/ab3100-core.c
+Auto-merging drivers/mfd/asic3.c
+Auto-merging drivers/mfd/max8997.c
+Auto-merging drivers/mfd/twl-core.c
+Auto-merging drivers/mfd/twl6030-irq.c
+Auto-merging drivers/mfd/wm8400-core.c
+Auto-merging drivers/mmc/card/mmc_test.c
+Auto-merging drivers/mmc/core/debugfs.c
+Auto-merging drivers/mmc/core/host.c
+Auto-merging drivers/mmc/core/mmc.c
+Auto-merging drivers/mmc/core/mmc_ops.c
+Auto-merging drivers/mmc/core/quirks.c
+Auto-merging drivers/mmc/core/sd.c
+Auto-merging drivers/mmc/core/sd_ops.c
+Auto-merging drivers/mmc/host/sdhci-of-esdhc.c
+Auto-merging drivers/mmc/host/sdhci-pci.c
+Auto-merging drivers/mmc/host/sdhci-pxav2.c
+Auto-merging drivers/mmc/host/sdhci-spear.c
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Auto-merging drivers/mmc/host/sdhci.c
+Auto-merging drivers/mmc/host/sh_mmcif.c
+Auto-merging drivers/mmc/host/sh_mobile_sdhi.c
+Auto-merging drivers/mtd/ar7part.c
+Auto-merging drivers/mtd/cmdlinepart.c
+Auto-merging drivers/mtd/mtdsuper.c
+Auto-merging drivers/mtd/nand/cafe_nand.c
+Auto-merging drivers/mtd/nand/cmx270_nand.c
+Auto-merging drivers/mtd/nand/diskonchip.c
+Auto-merging drivers/mtd/nand/nand_bbt.c
+Auto-merging drivers/mtd/nand/omap2.c
+Auto-merging drivers/mtd/nand/sm_common.c
+Auto-merging drivers/mtd/onenand/onenand_bbt.c
+Auto-merging drivers/mtd/redboot.c
+Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb3/l2t.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/l2t.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Auto-merging drivers/net/ethernet/ethoc.c
+Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
+Auto-merging drivers/net/ethernet/intel/e1000e/param.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/cq.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_tx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/intf.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/mcg.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c
+Auto-merging drivers/net/ethernet/neterion/vxge/vxge-main.c
+Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
+Auto-merging drivers/net/ethernet/sfc/rx.c
+Auto-merging drivers/net/ethernet/smsc/smsc9420.c
+Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c
+Auto-merging drivers/net/usb/lg-vl600.c
+Auto-merging drivers/net/vmxnet3/vmxnet3_drv.c
+Auto-merging drivers/net/wimax/i2400m/usb.c
+Auto-merging drivers/net/wireless/adm8211.c
+Auto-merging drivers/net/wireless/ath/ath5k/debug.c
+Auto-merging drivers/net/wireless/ath/ath5k/pci.c
+Auto-merging drivers/net/wireless/ath/ath9k/ahb.c
+Auto-merging drivers/net/wireless/ath/ath9k/ani.c
+Auto-merging drivers/net/wireless/ath/ath9k/ar9002_hw.c
+Auto-merging drivers/net/wireless/ath/ath9k/ar9002_mac.c
+Auto-merging drivers/net/wireless/ath/ath9k/ar9003_mac.c
+Auto-merging drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c
+Auto-merging drivers/net/wireless/ath/ath9k/calib.c
+Auto-merging drivers/net/wireless/ath/ath9k/debug.c
+Auto-merging drivers/net/wireless/ath/ath9k/hw.c
+Auto-merging drivers/net/wireless/ath/ath9k/init.c
+Auto-merging drivers/net/wireless/ath/ath9k/mac.c
+Auto-merging drivers/net/wireless/ath/ath9k/pci.c
+Auto-merging drivers/net/wireless/ath/ath9k/rc.c
+Auto-merging drivers/net/wireless/ath/carl9170/fw.c
+Auto-merging drivers/net/wireless/b43/main.c
+Auto-merging drivers/net/wireless/b43legacy/main.c
+Auto-merging drivers/net/wireless/iwlegacy/iwl-tx.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c
+Auto-merging drivers/net/wireless/libertas/cmd.c
+Auto-merging drivers/net/wireless/libertas/if_sdio.c
+Auto-merging drivers/net/wireless/libertas/if_spi.c
+Auto-merging drivers/net/wireless/libertas/if_usb.c
+Auto-merging drivers/net/wireless/libertas/main.c
+Auto-merging drivers/net/wireless/libertas/rx.c
+Auto-merging drivers/net/wireless/libertas/tx.c
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Auto-merging drivers/net/wireless/p54/eeprom.c
+Auto-merging drivers/net/wireless/p54/fwio.c
+Auto-merging drivers/net/wireless/p54/main.c
+Auto-merging drivers/net/wireless/p54/txrx.c
+Auto-merging drivers/net/wireless/rtl818x/rtl8180/dev.c
+Auto-merging drivers/net/wireless/rtl818x/rtl8187/dev.c
+Auto-merging drivers/net/wireless/rtlwifi/base.c
+Auto-merging drivers/net/wireless/rtlwifi/pci.c
+Auto-merging drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+Auto-merging drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+Auto-merging drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+Auto-merging drivers/net/wireless/rtlwifi/usb.c
+Auto-merging drivers/net/wireless/wl12xx/boot.c
+Auto-merging drivers/parisc/sba_iommu.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/power/max17042_battery.c
+Auto-merging drivers/power/max8903_charger.c
+Auto-merging drivers/power/max8997_charger.c
+Auto-merging drivers/power/max8998_charger.c
+Auto-merging drivers/power/power_supply_sysfs.c
+Auto-merging drivers/regulator/88pm8607.c
+Auto-merging drivers/regulator/core.c
+Auto-merging drivers/regulator/mc13783-regulator.c
+Auto-merging drivers/regulator/tps6586x-regulator.c
+Auto-merging drivers/s390/char/vmur.c
+Auto-merging drivers/s390/cio/qdio_debug.c
+Auto-merging drivers/s390/cio/qdio_setup.c
+Auto-merging drivers/s390/scsi/zfcp_dbf.c
+Auto-merging drivers/s390/scsi/zfcp_qdio.c
+Auto-merging drivers/s390/scsi/zfcp_scsi.c
+Auto-merging drivers/scsi/be2iscsi/be_main.c
+Auto-merging drivers/scsi/cxgbi/libcxgbi.c
+Auto-merging drivers/scsi/device_handler/scsi_dh.c
+Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c
+Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c
+Auto-merging drivers/scsi/iscsi_tcp.c
+Auto-merging drivers/scsi/libfc/fc_exch.c
+Auto-merging drivers/scsi/libfc/fc_lport.c
+CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
+Auto-merging drivers/scsi/libiscsi.c
+Auto-merging drivers/scsi/libsas/sas_scsi_host.c
+Auto-merging drivers/scsi/lpfc/lpfc_attr.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
+Auto-merging drivers/scsi/megaraid/megaraid_mbox.c
+Auto-merging drivers/spi/spi-dw.c
+Auto-merging drivers/ssb/main.c
+Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+Auto-merging drivers/staging/brcm80211/brcmutil/utils.c
+Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c
+Auto-merging drivers/staging/cxt1e1/linux.c
+Auto-merging drivers/staging/gma500/psb_drv.c
+Auto-merging drivers/staging/iio/accel/adis16201_ring.c
+Auto-merging drivers/staging/iio/accel/adis16201_trigger.c
+Auto-merging drivers/staging/iio/accel/adis16203_ring.c
+Auto-merging drivers/staging/iio/accel/adis16203_trigger.c
+Auto-merging drivers/staging/iio/accel/adis16204_ring.c
+Auto-merging drivers/staging/iio/accel/adis16204_trigger.c
+Auto-merging drivers/staging/iio/accel/adis16209_ring.c
+Auto-merging drivers/staging/iio/accel/adis16209_trigger.c
+Auto-merging drivers/staging/iio/accel/adis16240_ring.c
+Auto-merging drivers/staging/iio/accel/adis16240_trigger.c
+Auto-merging drivers/staging/iio/accel/lis3l02dq_ring.c
+Auto-merging drivers/staging/iio/adc/ad7793.c
+Auto-merging drivers/staging/iio/dac/ad5686.c
+Auto-merging drivers/staging/iio/gyro/adis16060_core.c
+Auto-merging drivers/staging/iio/gyro/adis16260_ring.c
+Auto-merging drivers/staging/iio/gyro/adis16260_trigger.c
+Auto-merging drivers/staging/iio/imu/adis16400_ring.c
+Auto-merging drivers/staging/iio/imu/adis16400_trigger.c
+CONFLICT (delete/modify): drivers/staging/iio/industrialio-ring.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/industrialio-ring.c left in tree.
+Auto-merging drivers/staging/iio/meter/ade7758_ring.c
+Auto-merging drivers/staging/iio/meter/ade7758_trigger.c
+Auto-merging drivers/staging/intel_sst/intel_sst.c
+Auto-merging drivers/staging/winbond/wbusb.c
+Auto-merging drivers/staging/wlags49_h2/wl_cs.c
+Auto-merging drivers/target/target_core_alua.c
+Auto-merging drivers/target/target_core_fabric_lib.c
+Auto-merging drivers/target/target_core_file.c
+Auto-merging drivers/target/target_core_iblock.c
+Auto-merging drivers/target/target_core_pscsi.c
+Auto-merging drivers/target/target_core_tmr.c
+Auto-merging drivers/target/target_core_tpg.c
+Auto-merging drivers/target/target_core_transport.c
+Auto-merging drivers/tty/serial/jsm/jsm_driver.c
+Auto-merging drivers/tty/serial/max3100.c
+Auto-merging drivers/tty/serial/max3107.c
+Auto-merging drivers/tty/serial/nwpserial.c
+Auto-merging drivers/tty/serial/timbuart.c
+Auto-merging drivers/tty/serial/xilinx_uartps.c
+Auto-merging drivers/uio/uio_pdrv_genirq.c
+Auto-merging drivers/usb/core/driver.c
+Auto-merging drivers/usb/gadget/cdc2.c
+Auto-merging drivers/usb/gadget/composite.c
+Auto-merging drivers/usb/gadget/dbgp.c
+Auto-merging drivers/usb/gadget/f_fs.c
+Auto-merging drivers/usb/gadget/f_obex.c
+Auto-merging drivers/usb/gadget/f_sourcesink.c
+Auto-merging drivers/usb/gadget/file_storage.c
+Auto-merging drivers/usb/gadget/fusb300_udc.c
+Auto-merging drivers/usb/gadget/gmidi.c
+Auto-merging drivers/usb/gadget/u_serial.c
+Auto-merging drivers/usb/host/isp1760-if.c
+Auto-merging drivers/usb/host/xhci-hub.c
+Auto-merging drivers/usb/host/xhci-pci.c
+Auto-merging drivers/usb/mon/mon_bin.c
+Auto-merging drivers/usb/serial/qcserial.c
+Auto-merging drivers/usb/storage/transport.c
+Auto-merging drivers/usb/wusbcore/wa-hc.c
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/video/carminefb.c
+Auto-merging drivers/video/mb862xx/mb862xx-i2c.c
+Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
+Auto-merging drivers/video/msm/mdp.c
+Auto-merging drivers/video/omap2/dss/dispc.c
+Auto-merging drivers/video/omap2/dss/dpi.c
+Auto-merging drivers/video/omap2/dss/dsi.c
+Auto-merging drivers/video/omap2/dss/dss.c
+Auto-merging drivers/video/omap2/dss/rfbi.c
+Auto-merging drivers/video/omap2/dss/sdi.c
+Auto-merging drivers/video/sh_mobile_lcdcfb.c
+Auto-merging drivers/xen/balloon.c
+Auto-merging drivers/xen/swiotlb-xen.c
+Auto-merging drivers/xen/xen-pciback/conf_space.c
+Auto-merging drivers/xen/xenbus/xenbus_probe.c
+Auto-merging drivers/xen/xenbus/xenbus_probe_backend.c
+Auto-merging drivers/xen/xenbus/xenbus_probe_frontend.c
+Auto-merging fs/cifs/connect.c
+Auto-merging fs/exofs/ore.c
+Auto-merging fs/exofs/super.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/logfs/super.c
+Auto-merging fs/nfs/nfs4filelayout.c
+Auto-merging fs/nfs/write.c
+Auto-merging fs/nfsd/nfsctl.c
+Auto-merging fs/ocfs2/cluster/tcp.c
+Auto-merging include/linux/bcma/bcma.h
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/dmaengine.h
+CONFLICT (content): Merge conflict in include/linux/dmaengine.h
+Auto-merging include/linux/hid.h
+Auto-merging include/linux/irq.h
+Auto-merging include/linux/irqdesc.h
+Auto-merging include/linux/mtd/mtd.h
+Auto-merging include/linux/pm_runtime.h
+Auto-merging include/linux/regmap.h
+Auto-merging include/linux/regulator/driver.h
+Auto-merging include/linux/serio.h
+Auto-merging include/linux/ssb/ssb.h
+Auto-merging include/linux/usb.h
+Auto-merging include/media/saa7146.h
+Auto-merging include/net/bluetooth/hci_core.h
+Auto-merging include/net/lib80211.h
+Auto-merging include/net/sock.h
+Auto-merging kernel/async.c
+Auto-merging kernel/crash_dump.c
+Auto-merging kernel/cred.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/futex.c
+Auto-merging kernel/irq/irqdesc.c
+Auto-merging kernel/irq_work.c
+Auto-merging kernel/kprobes.c
+Auto-merging kernel/latencytop.c
+Auto-merging kernel/lockdep.c
+Auto-merging kernel/pid.c
+Auto-merging kernel/power/hibernate.c
+Auto-merging kernel/power/main.c
+Auto-merging kernel/power/qos.c
+Auto-merging kernel/power/suspend.c
+Auto-merging kernel/ptrace.c
+Auto-merging kernel/rcupdate.c
+Auto-merging kernel/rcutiny.c
+Auto-merging kernel/rcutorture.c
+Auto-merging kernel/rcutree.c
+Auto-merging kernel/rcutree_trace.c
+Auto-merging kernel/resource.c
+Auto-merging kernel/rtmutex-debug.c
+Auto-merging kernel/rtmutex.c
+Auto-merging kernel/sched.c
+Auto-merging kernel/semaphore.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/time.c
+Auto-merging kernel/watchdog.c
+Auto-merging kernel/workqueue.c
+Auto-merging lib/dma-debug.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/swapfile.c
+Auto-merging net/802/garp.c
+Auto-merging net/802/stp.c
+Auto-merging net/bluetooth/hci_sysfs.c
+Auto-merging net/bluetooth/mgmt.c
+Auto-merging net/bridge/br_input.c
+Auto-merging net/caif/caif_dev.c
+Auto-merging net/ceph/messenger.c
+Auto-merging net/core/dev_addr_lists.c
+Auto-merging net/core/fib_rules.c
+Auto-merging net/core/net-sysfs.c
+Auto-merging net/core/netpoll.c
+Auto-merging net/core/user_dma.c
+Auto-merging net/ipv4/fib_trie.c
+Auto-merging net/ipv4/ipmr.c
+Auto-merging net/ipv4/proc.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/ipv6/exthdrs.c
+Auto-merging net/ipv6/ip6_flowlabel.c
+Auto-merging net/ipv6/ip6mr.c
+Auto-merging net/ipv6/raw.c
+Auto-merging net/ipv6/route.c
+Auto-merging net/irda/qos.c
+Auto-merging net/mac80211/agg-rx.c
+Auto-merging net/mac80211/agg-tx.c
+Auto-merging net/mac80211/ht.c
+Auto-merging net/mac80211/key.c
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/rate.c
+Auto-merging net/mac80211/rx.c
+Auto-merging net/mac80211/scan.c
+Auto-merging net/mac80211/status.c
+Auto-merging net/mac80211/tx.c
+Auto-merging net/mac80211/util.c
+Auto-merging net/netfilter/nf_conntrack_ecache.c
+Auto-merging net/netfilter/x_tables.c
+Auto-merging net/nfc/rawsock.c
+Auto-merging net/phonet/socket.c
+Auto-merging net/sunrpc/svc_xprt.c
+Auto-merging net/sunrpc/svcsock.c
+Auto-merging net/tipc/socket.c
+Auto-merging net/wireless/mesh.c
+Auto-merging net/wireless/reg.c
+Auto-merging net/wireless/sme.c
+Auto-merging net/wireless/util.c
+Auto-merging net/wireless/wext-compat.c
+Auto-merging net/wireless/wext-sme.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/selinux/netlink.c
+Auto-merging sound/arm/pxa2xx-ac97-lib.c
+Auto-merging sound/core/control.c
+Auto-merging sound/core/jack.c
+Auto-merging sound/core/oss/mixer_oss.c
+Auto-merging sound/core/pcm_lib.c
+Auto-merging sound/core/pcm_native.c
+Auto-merging sound/drivers/aloop.c
+Auto-merging sound/drivers/ml403-ac97cr.c
+Auto-merging sound/drivers/mpu401/mpu401.c
+Auto-merging sound/drivers/mpu401/mpu401_uart.c
+Auto-merging sound/drivers/mtpav.c
+Auto-merging sound/drivers/serial-u16550.c
+Auto-merging sound/isa/ad1816a/ad1816a.c
+Auto-merging sound/isa/als100.c
+Auto-merging sound/isa/azt2320.c
+Auto-merging sound/isa/cmi8330.c
+Auto-merging sound/isa/cs423x/cs4231.c
+Auto-merging sound/isa/cs423x/cs4236.c
+Auto-merging sound/isa/es1688/es1688.c
+Auto-merging sound/isa/es1688/es1688_lib.c
+Auto-merging sound/isa/es18xx.c
+Auto-merging sound/isa/gus/gus_main.c
+Auto-merging sound/isa/gus/gusextreme.c
+Auto-merging sound/isa/gus/gusmax.c
+Auto-merging sound/isa/gus/interwave.c
+Auto-merging sound/isa/opl3sa2.c
+Auto-merging sound/isa/opti9xx/miro.c
+Auto-merging sound/isa/opti9xx/opti92x-ad1848.c
+Auto-merging sound/isa/sb/sb16.c
+Auto-merging sound/isa/sb/sb_common.c
+Auto-merging sound/isa/sscape.c
+Auto-merging sound/isa/wavefront/wavefront.c
+Auto-merging sound/isa/wss/wss_lib.c
+Auto-merging sound/mips/au1x00.c
+Auto-merging sound/pci/als4000.c
+Auto-merging sound/pci/azt3328.c
+Auto-merging sound/pci/cmipci.c
+Auto-merging sound/pci/es1938.c
+Auto-merging sound/pci/es1968.c
+Auto-merging sound/pci/fm801.c
+Auto-merging sound/pci/hda/hda_codec.c
+Auto-merging sound/pci/hda/hda_hwdep.c
+Auto-merging sound/pci/hda/patch_analog.c
+Auto-merging sound/pci/hda/patch_cirrus.c
+Auto-merging sound/pci/hda/patch_conexant.c
+Auto-merging sound/pci/hda/patch_hdmi.c
+Auto-merging sound/pci/hda/patch_realtek.c
+Auto-merging sound/pci/hda/patch_sigmatel.c
+Auto-merging sound/pci/hda/patch_via.c
+Auto-merging sound/pci/ice1712/ice1712.c
+Auto-merging sound/pci/maestro3.c
+Auto-merging sound/pci/oxygen/oxygen_lib.c
+Auto-merging sound/pci/riptide/riptide.c
+Auto-merging sound/pci/rme9652/hdspm.c
+Auto-merging sound/pci/sis7019.c
+Auto-merging sound/pci/sonicvibes.c
+Auto-merging sound/pci/trident/trident.c
+Auto-merging sound/pci/via82xx.c
+Auto-merging sound/pci/ymfpci/ymfpci.c
+Auto-merging sound/pci/ymfpci/ymfpci_main.c
+Auto-merging sound/ppc/snd_ps3.c
+Auto-merging sound/soc/codecs/sn95031.c
+Auto-merging sound/soc/codecs/wl1273.c
+Auto-merging sound/soc/ep93xx/edb93xx.c
+Auto-merging sound/soc/ep93xx/snappercl15.c
+Auto-merging sound/soc/mResolved 'arch/arm/mach-bcmring/mm.c' using previous resolution.
+Resolved 'drivers/media/dvb/frontends/dibx000_common.c' using previous resolution.
+Resolved 'drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c' using previous resolution.
+Resolved 'drivers/scsi/libfc/fc_lport.c' using previous resolution.
+Resolved 'include/linux/dmaengine.h' using previous resolution.
+Resolved 'sound/soc/soc-io.c' using previous resolution.
+id-x86/mfld_machine.c
+Auto-merging sound/soc/mid-x86/sst_platform.c
+Auto-merging sound/soc/omap/am3517evm.c
+Auto-merging sound/soc/omap/igep0020.c
+Auto-merging sound/soc/omap/n810.c
+Auto-merging sound/soc/omap/omap-pcm.c
+Auto-merging sound/soc/omap/omap3evm.c
+Auto-merging sound/soc/omap/omap3pandora.c
+Auto-merging sound/soc/omap/osk5912.c
+Auto-merging sound/soc/omap/overo.c
+Auto-merging sound/soc/omap/rx51.c
+Auto-merging sound/soc/omap/sdp3430.c
+Auto-merging sound/soc/omap/sdp4430.c
+Auto-merging sound/soc/omap/zoom2.c
+Auto-merging sound/soc/samsung/ac97.c
+Auto-merging sound/soc/samsung/dma.c
+Auto-merging sound/soc/samsung/i2s.c
+Auto-merging sound/soc/samsung/jive_wm8750.c
+Auto-merging sound/soc/samsung/pcm.c
+Auto-merging sound/soc/samsung/s3c2412-i2s.c
+Auto-merging sound/soc/samsung/s3c24xx-i2s.c
+Auto-merging sound/soc/samsung/s3c24xx_simtec.c
+Auto-merging sound/soc/samsung/s3c24xx_uda134x.c
+Auto-merging sound/soc/samsung/smartq_wm8987.c
+Auto-merging sound/soc/samsung/smdk_wm8580.c
+Auto-merging sound/soc/samsung/smdk_wm8580pcm.c
+Auto-merging sound/soc/samsung/spdif.c
+Auto-merging sound/soc/samsung/speyside.c
+Auto-merging sound/soc/samsung/speyside_wm8962.c
+Auto-merging sound/soc/sh/fsi.c
+Auto-merging sound/soc/soc-cache.c
+Auto-merging sound/soc/soc-io.c
+CONFLICT (content): Merge conflict in sound/soc/soc-io.c
+Auto-merging sound/soc/soc-jack.c
+Auto-merging sound/usb/6fire/firmware.c
+Auto-merging sound/usb/card.c
+Auto-merging sound/usb/midi.c
+Auto-merging virt/kvm/iommu.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/iio/industrialio-ring.c
+arch/arm/mach-bcmring/mm.c: needs merge
+drivers/media/dvb/frontends/dibx000_common.c: needs merge
+drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c: needs merge
+drivers/scsi/libfc/fc_lport.c: needs merge
+drivers/staging/iio/industrialio-ring.c: needs merge
+include/linux/dmaengine.h: needs merge
+sound/soc/soc-io.c: needs merge
+rm 'drivers/staging/iio/industrialio-ring.c'
+$ git commit -v -a
+[master bbed5c4] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/kernel/core_irongate.c | 1 +
+ arch/alpha/kernel/pci-sysfs.c | 1 +
+ arch/alpha/kernel/pci_iommu.c | 1 +
+ arch/alpha/kernel/setup.c | 1 +
+ arch/arm/common/it8152.c | 1 +
+ arch/arm/common/scoop.c | 1 +
+ arch/arm/kernel/armksyms.c | 2 +-
+ arch/arm/kernel/bios32.c | 2 +-
+ arch/arm/kernel/devtree.c | 2 +-
+ arch/arm/kernel/elf.c | 2 +-
+ arch/arm/kernel/etm.c | 1 +
+ arch/arm/kernel/io.c | 2 +-
+ arch/arm/kernel/irq.c | 1 -
+ arch/arm/kernel/leds.c | 3 +-
+ arch/arm/kernel/perf_event.c | 2 +-
+ arch/arm/kernel/pj4-cp0.c | 1 -
+ arch/arm/kernel/process.c | 2 +-
+ arch/arm/kernel/ptrace.c | 1 +
+ arch/arm/kernel/return_address.c | 2 +-
+ arch/arm/kernel/setup.c | 2 +-
+ arch/arm/kernel/stacktrace.c | 2 +-
+ arch/arm/kernel/sys_arm.c | 2 +-
+ arch/arm/kernel/time.c | 2 +-
+ arch/arm/kernel/unwind.c | 2 +-
+ arch/arm/kernel/xscale-cp0.c | 1 -
+ arch/arm/mach-at91/cpuidle.c | 1 +
+ arch/arm/mach-bcmring/dma.c | 1 +
+ arch/arm/mach-bcmring/mm.c | 1 +
+ arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
+ arch/arm/mach-davinci/board-dm646x-evm.c | 1 +
+ arch/arm/mach-davinci/cdce949.c | 1 +
+ arch/arm/mach-davinci/cpufreq.c | 1 +
+ arch/arm/mach-davinci/cpuidle.c | 1 +
+ arch/arm/mach-ep93xx/core.c | 1 +
+ arch/arm/mach-exynos4/dev-sysmmu.c | 1 +
+ arch/arm/mach-imx/mach-mx31lilly.c | 1 +
+ arch/arm/mach-imx/mach-mx31lite.c | 1 +
+ arch/arm/mach-imx/mach-mx31moboard.c | 1 +
+ arch/arm/mach-iop13xx/pci.c | 1 +
+ arch/arm/mach-ixp2000/core.c | 1 +
+ arch/arm/mach-ixp4xx/common-pci.c | 1 +
+ arch/arm/mach-ixp4xx/common.c | 1 +
+ arch/arm/mach-kirkwood/cpuidle.c | 1 +
+ arch/arm/mach-msm/io.c | 1 +
+ arch/arm/mach-netx/xc.c | 1 +
+ arch/arm/mach-omap1/board-ams-delta.c | 1 +
+ arch/arm/mach-omap1/board-sx1.c | 1 +
+ arch/arm/mach-omap1/board-voiceblue.c | 1 +
+ arch/arm/mach-omap1/mailbox.c | 1 +
+ arch/arm/mach-omap2/board-omap3evm.c | 1 +
+ arch/arm/mach-omap2/clockdomain.c | 1 +
+ arch/arm/mach-omap2/display.c | 1 +
+ arch/arm/mach-omap2/gpmc-onenand.c | 1 +
+ arch/arm/mach-omap2/pm.c | 1 +
+ arch/arm/mach-omap2/prcm.c | 1 +
+ arch/arm/mach-omap2/usb-tusb6010.c | 2 +
+ arch/arm/mach-omap2/voltage.c | 1 +
+ arch/arm/mach-pxa/colibri-pxa270.c | 1 +
+ arch/arm/mach-pxa/corgi.c | 1 +
+ arch/arm/mach-pxa/poodle.c | 1 +
+ arch/arm/mach-pxa/spitz.c | 1 +
+ arch/arm/mach-pxa/trizeps4.c | 1 +
+ arch/arm/mach-s3c2410/mach-h1940.c | 1 +
+ arch/arm/mach-s3c64xx/dev-audio.c | 1 +
+ arch/arm/mach-sa1100/collie.c | 1 +
+ arch/arm/mach-sa1100/jornada720.c | 1 +
+ arch/arm/mach-shmobile/clock.c | 1 +
+ arch/arm/mach-tegra/pcie.c | 1 +
+ arch/arm/mm/fault-armv.c | 1 -
+ arch/arm/mm/init.c | 1 +
+ arch/arm/plat-iop/gpio.c | 1 +
+ arch/arm/plat-iop/time.c | 1 +
+ arch/arm/plat-omap/clock.c | 1 +
+ arch/arm/plat-omap/mailbox.c | 1 +
+ arch/arm/plat-s3c24xx/devs.c | 1 +
+ arch/arm/plat-s5p/dev-ehci.c | 1 +
+ arch/arm/plat-s5p/dev-onenand.c | 2 +
+ arch/arm/plat-samsung/dev-adc.c | 2 +
+ arch/arm/plat-samsung/dev-asocdma.c | 1 +
+ arch/arm/plat-samsung/dev-backlight.c | 1 +
+ arch/arm/plat-samsung/dev-ide.c | 2 +
+ arch/arm/plat-samsung/dev-nand.c | 1 +
+ arch/arm/plat-samsung/dev-pwm.c | 1 +
+ arch/arm/plat-samsung/dev-rtc.c | 1 +
+ arch/arm/plat-samsung/dev-ts.c | 2 +
+ arch/arm/plat-samsung/dev-usb.c | 1 +
+ arch/arm/plat-samsung/dev-wdt.c | 3 +
+ arch/arm/plat-samsung/platformdata.c | 1 +
+ arch/arm/vfp/vfpmodule.c | 1 -
+ arch/avr32/mach-at32ap/clock.c | 1 +
+ arch/avr32/mach-at32ap/cpufreq.c | 1 +
+ arch/avr32/mach-at32ap/intc.c | 1 +
+ arch/avr32/mach-at32ap/pio.c | 1 +
+ arch/avr32/mm/dma-coherent.c | 1 +
+ arch/blackfin/kernel/dma-mapping.c | 1 +
+ arch/blackfin/kernel/perf_event.c | 1 +
+ arch/blackfin/kernel/sys_bfin.c | 1 +
+ arch/blackfin/mach-bf518/boards/ezbrd.c | 1 +
+ arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 +
+ arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 +
+ arch/blackfin/mach-bf527/boards/ezbrd.c | 1 +
+ arch/blackfin/mach-bf527/boards/ezkit.c | 1 +
+ arch/blackfin/mach-bf527/boards/tll6527m.c | 1 +
+ arch/blackfin/mach-bf537/boards/cm_bf537e.c | 1 +
+ arch/blackfin/mach-bf537/boards/cm_bf537u.c | 1 +
+ arch/blackfin/mach-bf537/boards/dnp5370.c | 1 +
+ arch/blackfin/mach-bf537/boards/pnav10.c | 1 +
+ arch/blackfin/mach-bf537/boards/stamp.c | 1 +
+ arch/blackfin/mach-bf537/boards/tcm_bf537.c | 1 +
+ arch/blackfin/mach-common/cpufreq.c | 1 +
+ arch/blackfin/mm/init.c | 1 +
+ arch/ia64/hp/common/hwsw_iommu.c | 1 +
+ arch/ia64/kernel/dma-mapping.c | 1 +
+ arch/ia64/kernel/topology.c | 1 +
+ arch/ia64/pci/pci.c | 1 +
+ arch/ia64/sn/kernel/io_acpi_init.c | 1 +
+ arch/ia64/sn/kernel/io_init.c | 1 +
+ arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 +
+ arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 +
+ arch/ia64/sn/pci/tioca_provider.c | 1 +
+ arch/ia64/xen/hypervisor.c | 1 +
+ arch/m68k/atari/time.c | 1 +
+ arch/m68k/kernel/dma_mm.c | 1 +
+ arch/m68k/kernel/dma_no.c | 1 +
+ arch/microblaze/kernel/dma.c | 1 +
+ arch/microblaze/kernel/irq.c | 1 +
+ arch/microblaze/mm/init.c | 1 +
+ arch/microblaze/pci/iomap.c | 1 +
+ arch/microblaze/pci/pci-common.c | 1 +
+ arch/mips/bcm47xx/gpio.c | 1 +
+ arch/mips/bcm47xx/setup.c | 1 +
+ arch/mips/cavium-octeon/csrc-octeon.c | 1 +
+ arch/mips/cavium-octeon/dma-octeon.c | 1 +
+ arch/mips/cavium-octeon/flash_setup.c | 1 +
+ arch/mips/kernel/8250-platform.c | 1 -
+ arch/mips/kernel/cpu-probe.c | 3 +-
+ arch/mips/kernel/i8253.c | 2 +-
+ arch/mips/kernel/init_task.c | 2 +-
+ arch/mips/kernel/irq-msc01.c | 1 -
+ arch/mips/kernel/irq.c | 1 -
+ arch/mips/kernel/mips-mt.c | 2 +-
+ arch/mips/kernel/mips_ksyms.c | 2 +-
+ arch/mips/kernel/module.c | 1 -
+ arch/mips/kernel/process.c | 2 +-
+ arch/mips/kernel/prom.c | 2 +-
+ arch/mips/kernel/reset.c | 2 +-
+ arch/mips/kernel/rtlx.c | 1 -
+ arch/mips/kernel/setup.c | 2 +-
+ arch/mips/kernel/spinlock_test.c | 2 +-
+ arch/mips/kernel/stacktrace.c | 2 +-
+ arch/mips/kernel/time.c | 2 +-
+ arch/mips/kernel/traps.c | 1 -
+ arch/mips/kernel/unaligned.c | 1 -
+ arch/mips/kernel/vpe.c | 1 -
+ arch/mips/loongson/common/platform.c | 1 +
+ arch/mips/pci/pci-ip27.c | 1 +
+ arch/mips/pci/pci.c | 1 +
+ arch/mips/powertv/pci/fixup-powertv.c | 1 +
+ arch/mips/powertv/powertv-usb.c | 1 +
+ arch/mips/rb532/gpio.c | 1 +
+ arch/mips/rb532/setup.c | 1 +
+ arch/mips/txx9/generic/spi_eeprom.c | 1 +
+ arch/mips/txx9/rbtx4939/setup.c | 1 +
+ arch/mips/vr41xx/common/giu.c | 1 +
+ arch/mips/vr41xx/common/rtc.c | 1 +
+ arch/parisc/kernel/drivers.c | 1 +
+ arch/parisc/kernel/pci-dma.c | 1 +
+ arch/parisc/kernel/setup.c | 1 +
+ arch/parisc/lib/iomap.c | 1 +
+ arch/powerpc/include/asm/lv1call.h | 1 +
+ arch/powerpc/include/asm/machdep.h | 1 +
+ arch/powerpc/include/asm/spu.h | 1 +
+ arch/powerpc/kernel/btext.c | 2 +-
+ arch/powerpc/kernel/clock.c | 2 +-
+ arch/powerpc/kernel/cputable.c | 2 +-
+ arch/powerpc/kernel/crash.c | 1 +
+ arch/powerpc/kernel/dma-iommu.c | 1 +
+ arch/powerpc/kernel/dma.c | 1 +
+ arch/powerpc/kernel/firmware.c | 3 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 1 -
+ arch/powerpc/kernel/ibmebus.c | 2 +
+ arch/powerpc/kernel/init_task.c | 2 +-
+ arch/powerpc/kernel/io-workarounds.c | 1 +
+ arch/powerpc/kernel/io.c | 2 +-
+ arch/powerpc/kernel/iomap.c | 1 +
+ arch/powerpc/kernel/irq.c | 2 +-
+ arch/powerpc/kernel/isa-bridge.c | 1 +
+ arch/powerpc/kernel/kvm.c | 1 +
+ arch/powerpc/kernel/module.c | 1 -
+ arch/powerpc/kernel/of_platform.c | 2 +-
+ arch/powerpc/kernel/paca.c | 2 +-
+ arch/powerpc/kernel/pci-common.c | 1 +
+ arch/powerpc/kernel/pci_32.c | 1 +
+ arch/powerpc/kernel/pci_64.c | 1 +
+ arch/powerpc/kernel/pci_dn.c | 1 +
+ arch/powerpc/kernel/pci_of_scan.c | 1 +
+ arch/powerpc/kernel/pmc.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 2 +-
+ arch/powerpc/kernel/process.c | 2 +-
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kernel/prom_parse.c | 1 -
+ arch/powerpc/kernel/ptrace.c | 1 -
+ arch/powerpc/kernel/rtas.c | 2 +-
+ arch/powerpc/kernel/setup-common.c | 2 +-
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/powerpc/kernel/signal_64.c | 1 -
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kernel/stacktrace.c | 2 +-
+ arch/powerpc/kernel/swsusp_64.c | 1 +
+ arch/powerpc/kernel/sysfs.c | 2 +-
+ arch/powerpc/kernel/time.c | 2 +-
+ arch/powerpc/kernel/vdso.c | 1 -
+ arch/powerpc/kernel/vio.c | 3 +-
+ arch/powerpc/kvm/44x.c | 1 +
+ arch/powerpc/kvm/book3s.c | 1 +
+ arch/powerpc/kvm/book3s_exports.c | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 1 +
+ arch/powerpc/kvm/book3s_hv_builtin.c | 1 +
+ arch/powerpc/kvm/book3s_pr.c | 1 +
+ arch/powerpc/kvm/powerpc.c | 1 -
+ arch/powerpc/lib/checksum_wrappers_64.c | 2 +-
+ arch/powerpc/lib/devres.c | 2 +-
+ arch/powerpc/lib/locks.c | 2 +-
+ arch/powerpc/lib/rheap.c | 2 +-
+ arch/powerpc/mm/dma-noncoherent.c | 1 +
+ arch/powerpc/mm/hash_utils_64.c | 1 +
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/powerpc/mm/mmu_context_hash32.c | 1 +
+ arch/powerpc/mm/mmu_context_hash64.c | 2 +-
+ arch/powerpc/mm/numa.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 1 +
+ arch/powerpc/mm/slice.c | 2 +-
+ arch/powerpc/mm/tlb_hash32.c | 1 +
+ arch/powerpc/mm/tlb_nohash.c | 1 +
+ arch/powerpc/platforms/44x/warp.c | 1 +
+ arch/powerpc/platforms/512x/clock.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_common.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 +
+ arch/powerpc/platforms/83xx/suspend.c | 1 +
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
+ arch/powerpc/platforms/85xx/sbc8548.c | 1 -
+ arch/powerpc/platforms/86xx/gef_gpio.c | 1 +
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 -
+ arch/powerpc/platforms/cell/axon_msi.c | 1 +
+ arch/powerpc/platforms/cell/beat.c | 2 +-
+ arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 -
+ arch/powerpc/platforms/cell/beat_wrapper.h | 1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 +
+ arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 +
+ arch/powerpc/platforms/cell/cbe_regs.c | 2 +-
+ arch/powerpc/platforms/cell/celleb_setup.c | 1 +
+ arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 +
+ arch/powerpc/platforms/cell/interrupt.c | 2 +-
+ arch/powerpc/platforms/cell/pmu.c | 1 +
+ arch/powerpc/platforms/cell/qpace_setup.c | 1 +
+ arch/powerpc/platforms/cell/setup.c | 1 +
+ arch/powerpc/platforms/cell/smp.c | 1 -
+ arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
+ arch/powerpc/platforms/cell/spu_fault.c | 2 +-
+ arch/powerpc/platforms/cell/spu_manage.c | 2 +-
+ arch/powerpc/platforms/cell/spu_notify.c | 3 +-
+ arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 -
+ arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 -
+ arch/powerpc/platforms/cell/spufs/context.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/coredump.c | 1 -
+ arch/powerpc/platforms/cell/spufs/fault.c | 1 -
+ arch/powerpc/platforms/cell/spufs/file.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 -
+ arch/powerpc/platforms/cell/spufs/sched.c | 1 -
+ arch/powerpc/platforms/cell/spufs/switch.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
+ arch/powerpc/platforms/embedded6xx/holly.c | 1 +
+ arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 +
+ arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +-
+ arch/powerpc/platforms/iseries/iommu.c | 2 +-
+ arch/powerpc/platforms/iseries/ksyms.c | 2 +-
+ arch/powerpc/platforms/iseries/lpardata.c | 1 -
+ arch/powerpc/platforms/iseries/lpevents.c | 2 +-
+ arch/powerpc/platforms/iseries/mf.c | 1 +
+ arch/powerpc/platforms/iseries/pci.c | 1 -
+ arch/powerpc/platforms/iseries/setup.c | 1 +
+ arch/powerpc/platforms/iseries/smp.c | 1 -
+ arch/powerpc/platforms/iseries/vio.c | 2 +-
+ arch/powerpc/platforms/iseries/viopath.c | 2 +-
+ arch/powerpc/platforms/maple/setup.c | 1 +
+ arch/powerpc/platforms/pasemi/cpufreq.c | 1 +
+ arch/powerpc/platforms/pasemi/dma_lib.c | 3 +-
+ arch/powerpc/platforms/pasemi/setup.c | 1 +
+ arch/powerpc/platforms/powermac/backlight.c | 1 +
+ arch/powerpc/platforms/powermac/feature.c | 1 +
+ arch/powerpc/platforms/powermac/low_i2c.c | 2 +-
+ arch/powerpc/platforms/powermac/nvram.c | 2 +-
+ arch/powerpc/platforms/powermac/pic.c | 1 -
+ arch/powerpc/platforms/powermac/setup.c | 1 +
+ arch/powerpc/platforms/ps3/exports.c | 2 -
+ arch/powerpc/platforms/ps3/interrupt.c | 2 +-
+ arch/powerpc/platforms/ps3/mm.c | 2 +-
+ arch/powerpc/platforms/ps3/os-area.c | 1 +
+ arch/powerpc/platforms/ps3/setup.c | 1 +
+ arch/powerpc/platforms/ps3/spu.c | 1 +
+ arch/powerpc/platforms/ps3/system-bus.c | 2 +-
+ arch/powerpc/platforms/pseries/eeh.c | 2 +
+ arch/powerpc/platforms/pseries/eeh_event.c | 1 +
+ arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 +
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 +
+ arch/powerpc/platforms/pseries/hvconsole.c | 3 +-
+ arch/powerpc/platforms/pseries/io_event_irq.c | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 1 +
+ arch/powerpc/platforms/pseries/lpar.c | 1 +
+ arch/powerpc/platforms/pseries/mobility.c | 1 +
+ arch/powerpc/platforms/pseries/pci_dlpar.c | 1 +
+ arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 +
+ arch/powerpc/platforms/pseries/setup.c | 2 +-
+ arch/powerpc/platforms/pseries/smp.c | 1 -
+ arch/powerpc/platforms/pseries/suspend.c | 1 +
+ arch/powerpc/sysdev/bestcomm/sram.c | 2 +-
+ arch/powerpc/sysdev/cpm_common.c | 1 +
+ arch/powerpc/sysdev/dcr.c | 1 +
+ arch/powerpc/sysdev/fsl_gtm.c | 1 +
+ arch/powerpc/sysdev/fsl_lbc.c | 3 +-
+ arch/powerpc/sysdev/fsl_pmc.c | 1 +
+ arch/powerpc/sysdev/fsl_rio.c | 2 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +-
+ arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 +
+ arch/powerpc/sysdev/mpc8xx_pic.c | 1 -
+ arch/powerpc/sysdev/mv64x60_pci.c | 1 +
+ arch/powerpc/sysdev/pmi.c | 1 +
+ arch/powerpc/sysdev/ppc4xx_msi.c | 1 +
+ arch/powerpc/sysdev/qe_lib/gpio.c | 1 +
+ arch/powerpc/sysdev/qe_lib/ucc.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/usb.c | 1 +
+ arch/powerpc/sysdev/rtc_cmos_setup.c | 1 +
+ arch/powerpc/sysdev/scom.c | 1 +
+ arch/powerpc/sysdev/simple_gpio.c | 1 -
+ arch/powerpc/sysdev/tsi108_dev.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 2 +-
+ arch/s390/crypto/sha_common.c | 1 +
+ arch/s390/mm/init.c | 1 +
+ arch/sh/drivers/dma/dma-sysfs.c | 1 +
+ arch/sh/drivers/pci/pci.c | 1 +
+ arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 +
+ arch/sh/kernel/perf_event.c | 1 +
+ arch/sh/kernel/topology.c | 1 +
+ arch/sh/mm/init.c | 1 +
+ arch/sparc/include/asm/termios.h | 1 -
+ arch/sparc/kernel/apc.c | 1 +
+ arch/sparc/kernel/auxio_32.c | 1 +
+ arch/sparc/kernel/btext.c | 1 -
+ arch/sparc/kernel/central.c | 1 +
+ arch/sparc/kernel/cpu.c | 2 +-
+ arch/sparc/kernel/cpumap.c | 2 +-
+ arch/sparc/kernel/dma.c | 1 -
+ arch/sparc/kernel/ebus.c | 2 +-
+ arch/sparc/kernel/hvapi.c | 2 +-
+ arch/sparc/kernel/idprom.c | 2 +-
+ arch/sparc/kernel/iommu.c | 2 +-
+ arch/sparc/kernel/irq_32.c | 1 +
+ arch/sparc/kernel/irq_64.c | 1 -
+ arch/sparc/kernel/ldc.c | 2 +-
+ arch/sparc/kernel/leon_kernel.c | 1 -
+ arch/sparc/kernel/leon_pci.c | 1 +
+ arch/sparc/kernel/leon_pci_grpci2.c | 2 +-
+ arch/sparc/kernel/mdesc.c | 2 +
+ arch/sparc/kernel/nmi.c | 2 +-
+ arch/sparc/kernel/of_device_32.c | 1 -
+ arch/sparc/kernel/of_device_64.c | 3 +-
+ arch/sparc/kernel/of_device_common.c | 2 +-
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/kernel/pci_fire.c | 1 +
+ arch/sparc/kernel/pci_psycho.c | 1 +
+ arch/sparc/kernel/pci_sabre.c | 1 +
+ arch/sparc/kernel/pci_schizo.c | 1 +
+ arch/sparc/kernel/pci_sun4v.c | 1 +
+ arch/sparc/kernel/pcic.c | 1 +
+ arch/sparc/kernel/pcr.c | 3 +-
+ arch/sparc/kernel/pmc.c | 1 +
+ arch/sparc/kernel/power.c | 2 +-
+ arch/sparc/kernel/process_64.c | 2 +-
+ arch/sparc/kernel/prom_32.c | 1 -
+ arch/sparc/kernel/prom_64.c | 1 -
+ arch/sparc/kernel/prom_common.c | 2 +-
+ arch/sparc/kernel/reboot.c | 2 +-
+ arch/sparc/kernel/sbus.c | 1 +
+ arch/sparc/kernel/setup_32.c | 1 +
+ arch/sparc/kernel/setup_64.c | 1 +
+ arch/sparc/kernel/smp_64.c | 2 +-
+ arch/sparc/kernel/sparc_ksyms_64.c | 2 +-
+ arch/sparc/kernel/stacktrace.c | 2 +-
+ arch/sparc/kernel/sys_sparc32.c | 1 -
+ arch/sparc/kernel/sys_sparc_64.c | 2 +-
+ arch/sparc/kernel/time_64.c | 2 +-
+ arch/sparc/kernel/traps_32.c | 1 +
+ arch/sparc/kernel/unaligned_32.c | 1 -
+ arch/sparc/kernel/vio.c | 1 +
+ arch/sparc/kernel/viohs.c | 2 +-
+ arch/sparc/mm/fault_32.c | 1 -
+ arch/sparc/mm/generic_32.c | 1 +
+ arch/sparc/mm/generic_64.c | 1 +
+ arch/sparc/mm/highmem.c | 1 +
+ arch/sparc/mm/hugetlbpage.c | 1 -
+ arch/x86/crypto/aes_glue.c | 1 +
+ arch/x86/crypto/aesni-intel_glue.c | 1 +
+ arch/x86/kernel/cpu/amd.c | 1 +
+ arch/x86/kernel/cpu/mcheck/mce.c | 1 +
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 +
+ arch/x86/kernel/devicetree.c | 1 +
+ arch/x86/kernel/e820.c | 1 +
+ arch/x86/kernel/hpet.c | 1 +
+ arch/x86/kernel/irq.c | 1 +
+ arch/x86/kernel/pci-dma.c | 1 +
+ arch/x86/kernel/probe_roms.c | 4 +-
+ arch/x86/kernel/rtc.c | 1 +
+ arch/x86/kernel/smp.c | 1 +
+ arch/x86/kernel/time.c | 1 +
+ arch/x86/kernel/topology.c | 1 +
+ arch/x86/kernel/vsyscall_64.c | 1 +
+ arch/x86/lguest/boot.c | 1 +
+ arch/x86/pci/i386.c | 1 +
+ arch/x86/pci/legacy.c | 1 +
+ arch/x86/platform/efi/efi.c | 1 +
+ arch/x86/platform/efi/efi_32.c | 1 +
+ arch/x86/platform/mrst/vrtc.c | 1 +
+ arch/x86/platform/olpc/olpc-xo1-pm.c | 1 +
+ arch/x86/platform/uv/bios_uv.c | 1 +
+ arch/x86/power/cpu.c | 1 +
+ arch/x86/video/fbdev.c | 1 +
+ block/blk-integrity.c | 1 +
+ block/ioctl.c | 1 +
+ crypto/async_tx/async_memcpy.c | 1 +
+ crypto/async_tx/async_pq.c | 1 +
+ crypto/async_tx/async_raid6_recov.c | 1 +
+ crypto/async_tx/async_tx.c | 1 +
+ crypto/async_tx/async_xor.c | 1 +
+ crypto/async_tx/raid6test.c | 1 +
+ crypto/crypto_wq.c | 1 +
+ crypto/md4.c | 1 +
+ crypto/proc.c | 1 +
+ crypto/vmac.c | 1 +
+ crypto/xcbc.c | 1 +
+ drivers/acpi/acpica/hwsleep.c | 1 +
+ drivers/acpi/ec_sys.c | 1 +
+ drivers/acpi/sbshc.c | 1 +
+ drivers/acpi/sysfs.c | 2 +-
+ drivers/ata/libata-eh.c | 1 +
+ drivers/ata/libata-pmp.c | 1 +
+ drivers/ata/libata-scsi.c | 1 +
+ drivers/ata/libata-sff.c | 1 +
+ drivers/base/base.h | 1 +
+ drivers/base/dma-coherent.c | 1 +
+ drivers/base/dma-mapping.c | 1 +
+ drivers/base/hypervisor.c | 1 +
+ drivers/base/power/generic_ops.c | 1 +
+ drivers/base/power/main.c | 1 +
+ drivers/base/power/runtime.c | 1 +
+ drivers/base/power/sysfs.c | 1 +
+ drivers/base/power/trace.c | 1 +
+ drivers/base/power/wakeup.c | 1 +
+ drivers/base/transport_class.c | 1 +
+ drivers/bcma/core.c | 1 +
+ drivers/bcma/driver_chipcommon.c | 1 +
+ drivers/bcma/driver_pci.c | 1 +
+ drivers/bcma/host_pci.c | 1 +
+ drivers/bcma/main.c | 1 +
+ drivers/block/aoe/aoeblk.c | 1 +
+ drivers/block/aoe/aoechr.c | 1 +
+ drivers/block/aoe/aoecmd.c | 2 +-
+ drivers/block/aoe/aoenet.c | 2 +-
+ drivers/block/ps3disk.c | 1 +
+ drivers/block/ps3vram.c | 1 +
+ drivers/block/virtio_blk.c | 1 +
+ drivers/bluetooth/btmrvl_main.c | 2 +
+ drivers/bluetooth/btmrvl_sdio.c | 1 +
+ drivers/bluetooth/btwilink.c | 1 +
+ drivers/char/hw_random/virtio-rng.c | 1 +
+ drivers/char/mem.c | 1 +
+ drivers/char/ps3flash.c | 1 +
+ drivers/char/ramoops.c | 1 +
+ drivers/char/ttyprintk.c | 1 +
+ drivers/char/virtio_console.c | 1 +
+ drivers/clocksource/sh_cmt.c | 1 +
+ drivers/clocksource/sh_mtu2.c | 1 +
+ drivers/clocksource/sh_tmu.c | 1 +
+ drivers/cpufreq/cpufreq_stats.c | 1 +
+ drivers/cpufreq/s3c64xx-cpufreq.c | 1 +
+ drivers/cpuidle/cpuidle.c | 1 +
+ drivers/cpuidle/governors/ladder.c | 1 +
+ drivers/cpuidle/governors/menu.c | 1 +
+ drivers/crypto/mv_cesa.c | 1 +
+ drivers/dca/dca-core.c | 1 +
+ drivers/dca/dca-sysfs.c | 1 +
+ drivers/dma/imx-dma.c | 1 +
+ drivers/dma/imx-sdma.c | 1 +
+ drivers/dma/intel_mid_dma.c | 1 +
+ drivers/dma/ipu/ipu_idmac.c | 1 +
+ drivers/dma/ste_dma40.c | 1 +
+ drivers/edac/mce_amd_inj.c | 1 +
+ drivers/firewire/core-iso.c | 1 +
+ drivers/firmware/google/gsmi.c | 1 +
+ drivers/firmware/sigma.c | 1 +
+ drivers/gpio/gpio-74x164.c | 1 +
+ drivers/gpio/gpio-ep93xx.c | 1 +
+ drivers/gpio/gpio-mc33880.c | 1 +
+ drivers/gpio/gpio-mcp23s08.c | 1 +
+ drivers/gpio/gpio-ml-ioh.c | 1 +
+ drivers/gpio/gpio-mpc5200.c | 1 +
+ drivers/gpio/gpio-mxc.c | 1 +
+ drivers/gpio/gpio-mxs.c | 1 +
+ drivers/gpio/gpio-pcf857x.c | 1 +
+ drivers/gpio/gpio-pch.c | 1 +
+ drivers/gpio/gpio-xilinx.c | 1 +
+ drivers/gpu/drm/ati_pcigart.c | 1 +
+ drivers/gpu/drm/drm_buffer.c | 1 +
+ drivers/gpu/drm/drm_bufs.c | 1 +
+ drivers/gpu/drm/drm_cache.c | 1 +
+ drivers/gpu/drm/drm_crtc.c | 1 +
+ drivers/gpu/drm/drm_crtc_helper.c | 3 +
+ drivers/gpu/drm/drm_debugfs.c | 1 +
+ drivers/gpu/drm/drm_dma.c | 1 +
+ drivers/gpu/drm/drm_drv.c | 1 +
+ drivers/gpu/drm/drm_edid.c | 1 +
+ drivers/gpu/drm/drm_encoder_slave.c | 2 +
+ drivers/gpu/drm/drm_fb_helper.c | 2 +
+ drivers/gpu/drm/drm_fops.c | 1 +
+ drivers/gpu/drm/drm_hashtab.c | 1 +
+ drivers/gpu/drm/drm_ioc32.c | 1 +
+ drivers/gpu/drm/drm_irq.c | 1 +
+ drivers/gpu/drm/drm_memory.c | 1 +
+ drivers/gpu/drm/drm_mm.c | 1 +
+ drivers/gpu/drm/drm_modes.c | 1 +
+ drivers/gpu/drm/drm_pci.c | 1 +
+ drivers/gpu/drm/drm_platform.c | 1 +
+ drivers/gpu/drm/drm_proc.c | 1 +
+ drivers/gpu/drm/drm_sman.c | 1 +
+ drivers/gpu/drm/drm_sysfs.c | 1 +
+ drivers/gpu/drm/drm_usb.c | 1 +
+ drivers/gpu/drm/drm_vm.c | 1 +
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +
+ drivers/gpu/drm/i2c/sil164_drv.c | 2 +
+ drivers/gpu/drm/i810/i810_drv.c | 2 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 1 +
+ drivers/gpu/drm/i915/i915_dma.c | 1 +
+ drivers/gpu/drm/i915/i915_drv.c | 1 +
+ drivers/gpu/drm/i915/intel_dp.c | 1 +
+ drivers/gpu/drm/i915/intel_i2c.c | 1 +
+ drivers/gpu/drm/i915/intel_sdvo.c | 1 +
+ drivers/gpu/drm/mga/mga_drv.c | 2 +
+ drivers/gpu/drm/mga/mga_warp.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_drv.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +
+ drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +
+ drivers/gpu/drm/nouveau/nvc0_graph.c | 1 +
+ drivers/gpu/drm/r128/r128_cce.c | 1 +
+ drivers/gpu/drm/r128/r128_drv.c | 2 +
+ drivers/gpu/drm/radeon/ni.c | 1 +
+ drivers/gpu/drm/radeon/r100.c | 1 +
+ drivers/gpu/drm/radeon/r600.c | 1 +
+ drivers/gpu/drm/radeon/r600_cp.c | 2 +
+ drivers/gpu/drm/radeon/radeon_cp.c | 2 +
+ drivers/gpu/drm/radeon/radeon_drv.c | 1 +
+ drivers/gpu/drm/radeon/radeon_i2c.c | 2 +
+ drivers/gpu/drm/savage/savage_drv.c | 2 +
+ drivers/gpu/drm/sis/sis_drv.c | 2 +
+ drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +
+ drivers/gpu/drm/ttm/ttm_tt.c | 1 +
+ drivers/gpu/drm/via/via_drv.c | 2 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +
+ drivers/hid/hid-axff.c | 1 +
+ drivers/hid/hid-debug.c | 1 +
+ drivers/hid/hid-dr.c | 1 +
+ drivers/hid/hid-emsff.c | 1 +
+ drivers/hid/hid-gaff.c | 1 +
+ drivers/hid/hid-holtekff.c | 1 +
+ drivers/hid/hid-picolcd.c | 1 +
+ drivers/hid/hid-pl.c | 1 +
+ drivers/hid/hid-roccat-common.c | 1 +
+ drivers/hid/hid-roccat.c | 1 +
+ drivers/hid/hid-sjoy.c | 1 +
+ drivers/hid/hid-tmff.c | 1 +
+ drivers/hid/hid-zpff.c | 1 +
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ drivers/hwmon/ultra45_env.c | 1 +
+ drivers/i2c/busses/i2c-pxa-pci.c | 1 +
+ drivers/i2c/busses/i2c-sh7760.c | 1 +
+ drivers/i2c/busses/i2c-tegra.c | 1 +
+ drivers/i2c/i2c-boardinfo.c | 1 +
+ drivers/ide/buddha.c | 1 +
+ drivers/ide/cmd640.c | 1 +
+ drivers/ide/ide-acpi.c | 1 +
+ drivers/ide/ide-atapi.c | 1 +
+ drivers/ide/ide-disk_proc.c | 1 +
+ drivers/ide/ide-dma-sff.c | 1 +
+ drivers/ide/ide-dma.c | 1 +
+ drivers/ide/ide-eh.c | 1 +
+ drivers/ide/ide-floppy_proc.c | 1 +
+ drivers/ide/ide-io-std.c | 1 +
+ drivers/ide/ide-ioctls.c | 1 +
+ drivers/ide/ide-legacy.c | 1 +
+ drivers/ide/ide-lib.c | 1 +
+ drivers/ide/ide-pnp.c | 1 +
+ drivers/ide/ide-taskfile.c | 1 +
+ drivers/ide/ide-xfer-mode.c | 1 +
+ drivers/ide/macide.c | 1 +
+ drivers/ide/pmac.c | 1 +
+ drivers/ide/q40ide.c | 1 +
+ drivers/ide/setup-pci.c | 1 +
+ drivers/ide/tc86c001.c | 1 +
+ drivers/idle/intel_idle.c | 1 +
+ drivers/infiniband/core/addr.c | 1 +
+ drivers/infiniband/core/cm.c | 1 +
+ drivers/infiniband/core/cma.c | 1 +
+ drivers/infiniband/core/fmr_pool.c | 1 +
+ drivers/infiniband/core/iwcm.c | 1 +
+ drivers/infiniband/core/mad.c | 1 +
+ drivers/infiniband/core/multicast.c | 1 +
+ drivers/infiniband/core/netlink.c | 1 +
+ drivers/infiniband/core/packer.c | 1 +
+ drivers/infiniband/core/sysfs.c | 1 +
+ drivers/infiniband/core/ucma.c | 1 +
+ drivers/infiniband/core/ud_header.c | 1 +
+ drivers/infiniband/core/umem.c | 1 +
+ drivers/infiniband/core/uverbs_marshall.c | 1 +
+ drivers/infiniband/core/verbs.c | 1 +
+ drivers/infiniband/hw/cxgb4/qp.c | 3 +
+ drivers/infiniband/hw/ipath/ipath_diag.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_driver.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_init_chip.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_verbs.c | 1 +
+ drivers/infiniband/hw/mthca/mthca_catas.c | 1 +
+ drivers/infiniband/hw/mthca/mthca_cmd.c | 1 +
+ drivers/infiniband/hw/mthca/mthca_provider.c | 2 +
+ drivers/infiniband/hw/qib/qib_diag.c | 1 +
+ drivers/infiniband/hw/qib/qib_driver.c | 1 +
+ drivers/infiniband/hw/qib/qib_file_ops.c | 1 +
+ drivers/infiniband/hw/qib/qib_iba7220.c | 1 +
+ drivers/infiniband/hw/qib/qib_iba7322.c | 1 +
+ drivers/infiniband/hw/qib/qib_init.c | 1 +
+ drivers/infiniband/hw/qib/qib_pcie.c | 1 +
+ drivers/infiniband/hw/qib/qib_sd7220.c | 1 +
+ drivers/infiniband/hw/qib/qib_sdma.c | 1 +
+ drivers/infiniband/hw/qib/qib_tx.c | 1 +
+ drivers/infiniband/hw/qib/qib_verbs.c | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_fs.c | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 +
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 1 +
+ drivers/input/input-compat.c | 1 +
+ drivers/input/input-mt.c | 1 +
+ drivers/input/input-polldev.c | 1 +
+ drivers/input/joystick/as5011.c | 1 +
+ drivers/input/keyboard/nomadik-ske-keypad.c | 1 +
+ drivers/input/keyboard/tnetv107x-keypad.c | 1 +
+ drivers/input/misc/ad714x.c | 1 +
+ drivers/input/misc/adxl34x.c | 1 +
+ drivers/input/misc/ati_remote2.c | 1 +
+ drivers/input/misc/cma3000_d0x.c | 1 +
+ drivers/input/misc/dm355evm_keys.c | 1 +
+ drivers/input/sparse-keymap.c | 1 +
+ drivers/input/touchscreen/ad7877.c | 1 +
+ drivers/input/touchscreen/ad7879-spi.c | 1 +
+ drivers/input/touchscreen/ad7879.c | 1 +
+ drivers/input/touchscreen/ads7846.c | 1 +
+ drivers/input/touchscreen/bu21013_ts.c | 1 +
+ drivers/isdn/capi/kcapi_proc.c | 1 +
+ drivers/isdn/gigaset/asyncdata.c | 1 +
+ drivers/isdn/gigaset/capi.c | 1 +
+ drivers/isdn/gigaset/dummyll.c | 1 +
+ drivers/isdn/gigaset/ev-layer.c | 1 +
+ drivers/isdn/gigaset/i4l.c | 1 +
+ drivers/isdn/gigaset/interface.c | 1 +
+ drivers/isdn/hardware/mISDN/mISDNisar.c | 1 +
+ drivers/isdn/i4l/isdn_tty.c | 1 +
+ drivers/isdn/mISDN/clock.c | 1 +
+ drivers/isdn/mISDN/dsp_audio.c | 1 +
+ drivers/isdn/mISDN/dsp_pipeline.c | 1 +
+ drivers/isdn/mISDN/socket.c | 1 +
+ drivers/leds/dell-led.c | 1 +
+ drivers/leds/leds-88pm860x.c | 1 +
+ drivers/leds/leds-asic3.c | 1 +
+ drivers/leds/leds-atmel-pwm.c | 1 +
+ drivers/leds/leds-cobalt-raq.c | 1 +
+ drivers/leds/leds-fsg.c | 1 +
+ drivers/leds/leds-gpio.c | 1 +
+ drivers/leds/leds-lm3530.c | 1 +
+ drivers/leds/leds-locomo.c | 1 +
+ drivers/leds/leds-lt3593.c | 1 +
+ drivers/leds/leds-net48xx.c | 1 +
+ drivers/leds/leds-net5501.c | 1 +
+ drivers/leds/leds-ns2.c | 1 +
+ drivers/leds/leds-s3c24xx.c | 1 +
+ drivers/leds/leds-wm831x-status.c | 1 +
+ drivers/leds/leds-wm8350.c | 1 +
+ drivers/leds/leds-wrap.c | 1 +
+ drivers/lguest/lguest_device.c | 1 +
+ drivers/lguest/lguest_user.c | 1 +
+ drivers/md/dm-exception-store.c | 1 +
+ drivers/md/dm-log-userspace-base.c | 1 +
+ drivers/md/dm-path-selector.c | 1 +
+ drivers/md/dm-raid.c | 1 +
+ drivers/md/dm-round-robin.c | 1 +
+ drivers/md/dm-service-time.c | 1 +
+ drivers/md/dm-snap-persistent.c | 1 +
+ drivers/md/dm-snap-transient.c | 1 +
+ drivers/md/dm-uevent.c | 1 +
+ drivers/md/faulty.c | 1 +
+ drivers/md/linear.c | 1 +
+ drivers/md/md.c | 1 +
+ drivers/md/multipath.c | 1 +
+ drivers/md/raid0.c | 1 +
+ drivers/md/raid1.c | 1 +
+ drivers/md/raid10.c | 1 +
+ drivers/md/raid5.c | 1 +
+ drivers/media/common/saa7146_core.c | 1 +
+ drivers/media/common/saa7146_fops.c | 1 +
+ drivers/media/common/saa7146_hlp.c | 1 +
+ drivers/media/common/saa7146_video.c | 1 +
+ drivers/media/common/tuners/tuner-types.c | 1 +
+ drivers/media/dvb/frontends/dibx000_common.c | 1 +
+ drivers/media/dvb/siano/sms-cards.c | 1 +
+ drivers/media/dvb/siano/smsendian.c | 1 +
+ drivers/media/dvb/siano/smssdio.c | 1 +
+ drivers/media/dvb/siano/smsusb.c | 1 +
+ drivers/media/media-device.c | 1 +
+ drivers/media/radio/radio-timb.c | 1 +
+ drivers/media/radio/radio-wl1273.c | 1 +
+ drivers/media/radio/si4713-i2c.c | 1 +
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +
+ drivers/media/rc/ir-jvc-decoder.c | 1 +
+ drivers/media/rc/ir-lirc-codec.c | 1 +
+ drivers/media/rc/ir-nec-decoder.c | 1 +
+ drivers/media/rc/ir-raw.c | 2 +
+ drivers/media/rc/ir-rc5-decoder.c | 1 +
+ drivers/media/rc/ir-rc5-sz-decoder.c | 1 +
+ drivers/media/rc/ir-rc6-decoder.c | 1 +
+ drivers/media/rc/ir-sony-decoder.c | 1 +
+ drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 +
+ drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 +
+ drivers/media/rc/keymaps/rc-anysee.c | 1 +
+ drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 +
+ drivers/media/rc/keymaps/rc-asus-pc39.c | 1 +
+ drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 +
+ .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia.c | 1 +
+ drivers/media/rc/keymaps/rc-avertv-303.c | 1 +
+ drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 +
+ drivers/media/rc/keymaps/rc-behold-columbus.c | 1 +
+ drivers/media/rc/keymaps/rc-behold.c | 1 +
+ drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 +
+ drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 +
+ drivers/media/rc/keymaps/rc-cinergy.c | 1 +
+ drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 +
+ drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 +
+ drivers/media/rc/keymaps/rc-digittrade.c | 1 +
+ drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 +
+ drivers/media/rc/keymaps/rc-em-terratec.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 +
+ drivers/media/rc/keymaps/rc-evga-indtube.c | 1 +
+ drivers/media/rc/keymaps/rc-eztv.c | 1 +
+ drivers/media/rc/keymaps/rc-flydvb.c | 1 +
+ drivers/media/rc/keymaps/rc-flyvideo.c | 1 +
+ drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 +
+ drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 +
+ drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 +
+ drivers/media/rc/keymaps/rc-gotview7135.c | 1 +
+ drivers/media/rc/keymaps/rc-hauppauge.c | 1 +
+ drivers/media/rc/keymaps/rc-imon-mce.c | 1 +
+ drivers/media/rc/keymaps/rc-imon-pad.c | 1 +
+ drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 +
+ drivers/media/rc/keymaps/rc-kaiomy.c | 1 +
+ drivers/media/rc/keymaps/rc-kworld-315u.c | 1 +
+ .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 +
+ drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 +
+ drivers/media/rc/keymaps/rc-lirc.c | 1 +
+ drivers/media/rc/keymaps/rc-lme2510.c | 1 +
+ drivers/media/rc/keymaps/rc-manli.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 +
+ drivers/media/rc/keymaps/rc-nebula.c | 1 +
+ .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 +
+ drivers/media/rc/keymaps/rc-norwood.c | 1 +
+ drivers/media/rc/keymaps/rc-npgtech.c | 1 +
+ drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-new.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview.c | 1 +
+ .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 +
+ drivers/media/rc/keymaps/rc-proteus-2309.c | 1 +
+ drivers/media/rc/keymaps/rc-purpletv.c | 1 +
+ drivers/media/rc/keymaps/rc-pv951.c | 1 +
+ drivers/media/rc/keymaps/rc-rc6-mce.c | 1 +
+ .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 +
+ drivers/media/rc/keymaps/rc-streamzap.c | 1 +
+ drivers/media/rc/keymaps/rc-tbs-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-slim.c | 1 +
+ drivers/media/rc/keymaps/rc-tevii-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-tivo.c | 1 +
+ drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 +
+ drivers/media/rc/keymaps/rc-trekstor.c | 1 +
+ drivers/media/rc/keymaps/rc-tt-1500.c | 1 +
+ drivers/media/rc/keymaps/rc-twinhan1027.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-s350.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 +
+ drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 +
+ drivers/media/rc/keymaps/rc-winfast.c | 1 +
+ drivers/media/rc/rc-main.c | 1 +
+ drivers/media/video/adp1653.c | 1 +
+ drivers/media/video/ak881x.c | 1 +
+ drivers/media/video/cpia2/cpia2_usb.c | 1 +
+ drivers/media/video/cx25840/cx25840-ir.c | 1 +
+ drivers/media/video/davinci/dm355_ccdc.c | 1 +
+ drivers/media/video/davinci/dm644x_ccdc.c | 1 +
+ drivers/media/video/hdpvr/hdpvr-i2c.c | 1 +
+ drivers/media/video/hexium_gemini.c | 1 +
+ drivers/media/video/hexium_orion.c | 1 +
+ drivers/media/video/imx074.c | 1 +
+ drivers/media/video/m5mols/m5mols_core.c | 1 +
+ drivers/media/video/mt9m001.c | 1 +
+ drivers/media/video/mt9m111.c | 1 +
+ drivers/media/video/mt9t031.c | 1 +
+ drivers/media/video/mt9v011.c | 1 +
+ drivers/media/video/mt9v022.c | 1 +
+ drivers/media/video/mt9v032.c | 1 +
+ drivers/media/video/mxb.c | 1 +
+ drivers/media/video/noon010pc30.c | 1 +
+ drivers/media/video/omap24xxcam.c | 1 +
+ drivers/media/video/ov6650.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-devattr.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 +
+ drivers/media/video/rj54n1cb0c.c | 1 +
+ drivers/media/video/sh_mobile_csi2.c | 1 +
+ drivers/media/video/sh_vou.c | 1 +
+ drivers/media/video/sr030pc30.c | 1 +
+ drivers/media/video/tcm825x.c | 1 +
+ drivers/media/video/timblogiw.c | 1 +
+ drivers/media/video/tvp514x.c | 1 +
+ drivers/media/video/tvp5150.c | 1 +
+ drivers/media/video/tvp7002.c | 1 +
+ drivers/media/video/usbvision/usbvision-cards.c | 1 +
+ drivers/media/video/v4l2-ctrls.c | 1 +
+ drivers/media/video/v4l2-device.c | 1 +
+ drivers/media/video/v4l2-event.c | 1 +
+ drivers/media/video/v4l2-fh.c | 1 +
+ drivers/media/video/v4l2-int-device.c | 1 +
+ drivers/media/video/v4l2-subdev.c | 1 +
+ drivers/memstick/core/memstick.c | 1 +
+ drivers/memstick/core/mspro_block.c | 1 +
+ drivers/memstick/host/jmb38x_ms.c | 1 +
+ drivers/memstick/host/tifm_ms.c | 1 +
+ drivers/message/i2o/pci.c | 1 +
+ drivers/mfd/ab3100-core.c | 1 +
+ drivers/mfd/ab8500-debugfs.c | 1 +
+ drivers/mfd/ab8500-sysctrl.c | 1 +
+ drivers/mfd/abx500-core.c | 1 +
+ drivers/mfd/asic3.c | 1 +
+ drivers/mfd/dm355evm_msp.c | 1 +
+ drivers/mfd/max8997.c | 1 +
+ drivers/mfd/mfd-core.c | 1 +
+ drivers/mfd/pcf50633-irq.c | 1 +
+ drivers/mfd/tmio_core.c | 1 +
+ drivers/mfd/twl-core.c | 1 +
+ drivers/mfd/twl6030-irq.c | 1 +
+ drivers/mfd/wl1273-core.c | 1 +
+ drivers/mfd/wm8400-core.c | 1 +
+ drivers/misc/ab8500-pwm.c | 1 +
+ drivers/misc/atmel-ssc.c | 1 +
+ drivers/misc/atmel_tclib.c | 1 +
+ drivers/misc/bh1780gli.c | 1 +
+ drivers/misc/kgdbts.c | 1 +
+ drivers/misc/sgi-gru/grukservices.c | 1 +
+ drivers/misc/ti-st/st_kim.c | 1 +
+ drivers/misc/tifm_7xx1.c | 1 +
+ drivers/misc/tifm_core.c | 1 +
+ drivers/mmc/card/mmc_test.c | 1 +
+ drivers/mmc/core/bus.c | 2 +
+ drivers/mmc/core/debugfs.c | 1 +
+ drivers/mmc/core/host.c | 1 +
+ drivers/mmc/core/mmc.c | 1 +
+ drivers/mmc/core/mmc_ops.c | 1 +
+ drivers/mmc/core/quirks.c | 1 +
+ drivers/mmc/core/sd.c | 1 +
+ drivers/mmc/core/sd_ops.c | 1 +
+ drivers/mmc/core/sdio_bus.c | 1 +
+ drivers/mmc/core/sdio_io.c | 1 +
+ drivers/mmc/core/sdio_irq.c | 1 +
+ drivers/mmc/host/mmc_spi.c | 1 +
+ drivers/mmc/host/mxs-mmc.c | 1 +
+ drivers/mmc/host/sdhci-of-esdhc.c | 1 +
+ drivers/mmc/host/sdhci-of-hlwd.c | 1 +
+ drivers/mmc/host/sdhci-pci.c | 1 +
+ drivers/mmc/host/sdhci-pltfm.c | 1 +
+ drivers/mmc/host/sdhci-pxav2.c | 1 +
+ drivers/mmc/host/sdhci-pxav3.c | 1 +
+ drivers/mmc/host/sdhci-spear.c | 1 +
+ drivers/mmc/host/sdhci-tegra.c | 1 +
+ drivers/mmc/host/sdhci.c | 1 +
+ drivers/mmc/host/sdricoh_cs.c | 1 +
+ drivers/mmc/host/sh_mmcif.c | 1 +
+ drivers/mmc/host/sh_mobile_sdhi.c | 1 +
+ drivers/mmc/host/tifm_sd.c | 1 +
+ drivers/mmc/host/via-sdmmc.c | 1 +
+ drivers/mtd/ar7part.c | 1 +
+ drivers/mtd/cmdlinepart.c | 1 +
+ drivers/mtd/lpddr/lpddr_cmds.c | 1 +
+ drivers/mtd/mtdblock_ro.c | 1 +
+ drivers/mtd/mtdsuper.c | 1 +
+ drivers/mtd/nand/cafe_nand.c | 1 +
+ drivers/mtd/nand/cmx270_nand.c | 1 +
+ drivers/mtd/nand/diskonchip.c | 1 +
+ drivers/mtd/nand/nand_bbt.c | 1 +
+ drivers/mtd/nand/omap2.c | 1 +
+ drivers/mtd/nand/sm_common.c | 1 +
+ drivers/mtd/onenand/onenand_bbt.c | 1 +
+ drivers/mtd/redboot.c | 1 +
+ drivers/mtd/rfd_ftl.c | 1 +
+ drivers/mtd/ubi/vmt.c | 1 +
+ drivers/net/bonding/bond_procfs.c | 1 +
+ drivers/net/ethernet/brocade/bna/bnad.c | 1 +
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 1 +
+ drivers/net/ethernet/chelsio/cxgb3/l2t.c | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 7 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 1 +
+ drivers/net/ethernet/emulex/benet/be_main.c | 1 +
+ drivers/net/ethernet/ethoc.c | 1 +
+ drivers/net/ethernet/freescale/ucc_geth.c | 1 +
+ drivers/net/ethernet/intel/e1000e/param.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/alloc.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/catas.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/intf.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/mr.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/pd.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/port.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/srq.c | 1 +
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 +
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 1 +
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 1 +
+ drivers/net/ethernet/sfc/rx.c | 1 +
+ drivers/net/ethernet/smsc/smsc9420.c | 1 +
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 1 +
+ drivers/net/phy/realtek.c | 1 +
+ drivers/net/usb/lg-vl600.c | 1 +
+ drivers/net/veth.c | 1 +
+ drivers/net/vmxnet3/vmxnet3_drv.c | 1 +
+ drivers/net/wimax/i2400m/control.c | 2 +
+ drivers/net/wimax/i2400m/debugfs.c | 1 +
+ drivers/net/wimax/i2400m/fw.c | 1 +
+ drivers/net/wimax/i2400m/netdev.c | 1 +
+ drivers/net/wimax/i2400m/rx.c | 2 +
+ drivers/net/wimax/i2400m/sdio.c | 1 +
+ drivers/net/wimax/i2400m/tx.c | 1 +
+ drivers/net/wimax/i2400m/usb.c | 1 +
+ drivers/net/wireless/adm8211.c | 1 +
+ drivers/net/wireless/ath/ath5k/debug.c | 2 +
+ drivers/net/wireless/ath/ath5k/pci.c | 1 +
+ drivers/net/wireless/ath/ath9k/ahb.c | 1 +
+ drivers/net/wireless/ath/ath9k/ani.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 1 +
+ drivers/net/wireless/ath/ath9k/btcoex.c | 1 +
+ drivers/net/wireless/ath/ath9k/calib.c | 1 +
+ drivers/net/wireless/ath/ath9k/debug.c | 1 +
+ drivers/net/wireless/ath/ath9k/hw.c | 1 +
+ drivers/net/wireless/ath/ath9k/init.c | 1 +
+ drivers/net/wireless/ath/ath9k/mac.c | 1 +
+ drivers/net/wireless/ath/ath9k/pci.c | 1 +
+ drivers/net/wireless/ath/ath9k/rc.c | 1 +
+ drivers/net/wireless/ath/carl9170/fw.c | 1 +
+ drivers/net/wireless/ath/debug.c | 1 +
+ drivers/net/wireless/ath/hw.c | 1 +
+ drivers/net/wireless/ath/key.c | 1 +
+ drivers/net/wireless/ath/regd.c | 1 +
+ drivers/net/wireless/b43/main.c | 2 +-
+ drivers/net/wireless/b43/pcmcia.c | 1 +
+ drivers/net/wireless/b43legacy/main.c | 2 +-
+ drivers/net/wireless/hostap/hostap_80211_rx.c | 1 +
+ drivers/net/wireless/hostap/hostap_80211_tx.c | 1 +
+ drivers/net/wireless/hostap/hostap_ap.c | 2 +
+ drivers/net/wireless/hostap/hostap_info.c | 1 +
+ drivers/net/wireless/hostap/hostap_ioctl.c | 1 +
+ drivers/net/wireless/hostap/hostap_proc.c | 1 +
+ drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1 +
+ drivers/net/wireless/iwlegacy/iwl-rx.c | 1 +
+ drivers/net/wireless/iwlegacy/iwl-scan.c | 1 +
+ drivers/net/wireless/iwlegacy/iwl-sta.c | 1 +
+ drivers/net/wireless/iwlegacy/iwl-tx.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-pci.c | 1 +
+ drivers/net/wireless/iwmc3200wifi/commands.c | 1 +
+ drivers/net/wireless/iwmc3200wifi/debugfs.c | 1 +
+ drivers/net/wireless/iwmc3200wifi/main.c | 1 +
+ drivers/net/wireless/iwmc3200wifi/sdio.c | 1 +
+ drivers/net/wireless/libertas/cmd.c | 1 +
+ drivers/net/wireless/libertas/debugfs.c | 1 +
+ drivers/net/wireless/libertas/if_sdio.c | 2 +-
+ drivers/net/wireless/libertas/if_spi.c | 2 +-
+ drivers/net/wireless/libertas/if_usb.c | 2 +-
+ drivers/net/wireless/libertas/main.c | 2 +-
+ drivers/net/wireless/libertas/rx.c | 1 +
+ drivers/net/wireless/libertas/tx.c | 1 +
+ drivers/net/wireless/libertas_tf/cmd.c | 1 +
+ drivers/net/wireless/libertas_tf/if_usb.c | 2 +-
+ drivers/net/wireless/libertas_tf/main.c | 1 +
+ drivers/net/wireless/mac80211_hwsim.c | 1 +
+ drivers/net/wireless/orinoco/fw.c | 1 +
+ drivers/net/wireless/p54/eeprom.c | 1 +
+ drivers/net/wireless/p54/fwio.c | 1 +
+ drivers/net/wireless/p54/main.c | 1 +
+ drivers/net/wireless/p54/p54pci.c | 1 +
+ drivers/net/wireless/p54/p54usb.c | 1 +
+ drivers/net/wireless/p54/txrx.c | 1 +
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 +
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 1 +
+ drivers/net/wireless/rtlwifi/base.c | 1 +
+ drivers/net/wireless/rtlwifi/cam.c | 1 +
+ drivers/net/wireless/rtlwifi/efuse.c | 1 +
+ drivers/net/wireless/rtlwifi/pci.c | 1 +
+ drivers/net/wireless/rtlwifi/ps.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192c/main.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 1 +
+ drivers/net/wireless/rtlwifi/usb.c | 1 +
+ drivers/net/wireless/wl12xx/boot.c | 1 +
+ drivers/net/wireless/zd1211rw/zd_usb.c | 1 +
+ drivers/of/of_net.c | 1 +
+ drivers/of/of_pci.c | 1 +
+ drivers/of/of_pci_irq.c | 1 +
+ drivers/of/of_spi.c | 1 +
+ drivers/parisc/ccio-dma.c | 1 +
+ drivers/parisc/sba_iommu.c | 1 +
+ drivers/pci/hotplug-pci.c | 1 +
+ drivers/pci/hotplug/pciehp_acpi.c | 1 +
+ drivers/pci/hotplug/pcihp_slot.c | 1 +
+ drivers/pci/hotplug/rpadlpar_core.c | 1 +
+ drivers/pci/htirq.c | 1 +
+ drivers/pci/iov.c | 1 +
+ drivers/pci/irq.c | 1 +
+ drivers/pci/msi.c | 1 +
+ drivers/pci/pci-sysfs.c | 1 +
+ drivers/pci/quirks.c | 1 +
+ drivers/pci/rom.c | 1 +
+ drivers/pci/setup-res.c | 1 +
+ drivers/pci/slot.c | 1 +
+ drivers/pci/vpd.c | 1 +
+ drivers/pcmcia/db1xxx_ss.c | 1 +
+ drivers/pcmcia/pxa2xx_cm_x255.c | 1 +
+ drivers/pcmcia/pxa2xx_cm_x270.c | 1 +
+ drivers/platform/x86/intel_scu_ipc.c | 1 +
+ drivers/platform/x86/msi-wmi.c | 1 +
+ drivers/platform/x86/wmi.c | 1 +
+ drivers/power/max17042_battery.c | 1 +
+ drivers/power/max8903_charger.c | 1 +
+ drivers/power/max8997_charger.c | 1 +
+ drivers/power/max8998_charger.c | 1 +
+ drivers/power/power_supply_sysfs.c | 1 +
+ drivers/ps3/ps3stor_lib.c | 1 +
+ drivers/ps3/sys-manager-core.c | 1 +
+ drivers/rapidio/switches/idt_gen2.c | 1 +
+ drivers/regulator/88pm8607.c | 1 +
+ drivers/regulator/ab8500.c | 1 +
+ drivers/regulator/bq24022.c | 1 +
+ drivers/regulator/core.c | 1 +
+ drivers/regulator/da903x.c | 1 +
+ drivers/regulator/db8500-prcmu.c | 1 +
+ drivers/regulator/dummy.c | 1 +
+ drivers/regulator/fixed.c | 1 +
+ drivers/regulator/lp3971.c | 1 +
+ drivers/regulator/lp3972.c | 1 +
+ drivers/regulator/max8925-regulator.c | 1 +
+ drivers/regulator/max8997.c | 1 +
+ drivers/regulator/mc13783-regulator.c | 1 +
+ drivers/regulator/mc13892-regulator.c | 1 +
+ drivers/regulator/mc13xxx-regulator-core.c | 1 +
+ drivers/regulator/tps6586x-regulator.c | 1 +
+ drivers/regulator/userspace-consumer.c | 1 +
+ drivers/regulator/virtual.c | 1 +
+ drivers/regulator/wm8400-regulator.c | 1 +
+ drivers/rtc/interface.c | 1 +
+ drivers/rtc/rtc-dm355evm.c | 1 +
+ drivers/rtc/rtc-ds1305.c | 1 +
+ drivers/rtc/rtc-ds1511.c | 1 +
+ drivers/rtc/rtc-ds1553.c | 1 +
+ drivers/rtc/rtc-ds1672.c | 1 +
+ drivers/rtc/rtc-ds1742.c | 1 +
+ drivers/rtc/rtc-em3027.c | 1 +
+ drivers/rtc/rtc-isl12022.c | 1 +
+ drivers/rtc/rtc-mv.c | 1 +
+ drivers/rtc/rtc-pcf2123.c | 1 +
+ drivers/rtc/rtc-pcf8563.c | 1 +
+ drivers/rtc/rtc-rs5c348.c | 1 +
+ drivers/rtc/rtc-rs5c372.c | 1 +
+ drivers/rtc/rtc-stk17ta8.c | 1 +
+ drivers/rtc/rtc-tx4939.c | 1 +
+ drivers/rtc/rtc-x1205.c | 1 +
+ drivers/s390/char/fs3270.c | 1 +
+ drivers/s390/char/sclp_cpi_sys.c | 1 +
+ drivers/s390/char/vmcp.c | 1 +
+ drivers/s390/char/vmur.c | 1 +
+ drivers/s390/cio/chp.c | 2 +
+ drivers/s390/cio/qdio_debug.c | 2 +
+ drivers/s390/cio/qdio_setup.c | 1 +
+ drivers/s390/kvm/kvm_virtio.c | 1 +
+ drivers/s390/scsi/zfcp_aux.c | 1 +
+ drivers/s390/scsi/zfcp_ccw.c | 1 +
+ drivers/s390/scsi/zfcp_dbf.c | 1 +
+ drivers/s390/scsi/zfcp_qdio.c | 1 +
+ drivers/s390/scsi/zfcp_scsi.c | 1 +
+ drivers/scsi/a2091.c | 1 +
+ drivers/scsi/a3000.c | 1 +
+ drivers/scsi/aacraid/aachba.c | 1 +
+ drivers/scsi/be2iscsi/be_main.c | 1 +
+ drivers/scsi/bfa/bfad_debugfs.c | 1 +
+ drivers/scsi/bfa/bfad_im.c | 2 +
+ drivers/scsi/cxgbi/libcxgbi.c | 1 +
+ drivers/scsi/device_handler/scsi_dh.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_alua.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_emc.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 1 +
+ drivers/scsi/gvp11.c | 1 +
+ drivers/scsi/iscsi_tcp.c | 1 +
+ drivers/scsi/libfc/fc_disc.c | 1 +
+ drivers/scsi/libfc/fc_elsct.c | 1 +
+ drivers/scsi/libfc/fc_exch.c | 1 +
+ drivers/scsi/libfc/fc_libfc.c | 1 +
+ drivers/scsi/libfc/fc_lport.c | 1 +
+ drivers/scsi/libfc/fc_npiv.c | 1 +
+ drivers/scsi/libfc/fc_rport.c | 1 +
+ drivers/scsi/libiscsi.c | 1 +
+ drivers/scsi/libiscsi_tcp.c | 1 +
+ drivers/scsi/libsas/sas_scsi_host.c | 1 +
+ drivers/scsi/libsas/sas_task.c | 1 +
+ drivers/scsi/libsrp.c | 1 +
+ drivers/scsi/lpfc/lpfc_attr.c | 1 +
+ drivers/scsi/lpfc/lpfc_debugfs.c | 1 +
+ drivers/scsi/lpfc/lpfc_init.c | 1 +
+ drivers/scsi/lpfc/lpfc_scsi.c | 1 +
+ drivers/scsi/mac53c94.c | 1 +
+ drivers/scsi/megaraid/megaraid_mbox.c | 1 +
+ drivers/scsi/osd/osd_initiator.c | 1 +
+ drivers/scsi/ps3rom.c | 1 +
+ drivers/scsi/scsi_lib.c | 1 +
+ drivers/scsi/scsi_lib_dma.c | 1 +
+ drivers/scsi/scsi_netlink.c | 1 +
+ drivers/scsi/scsi_pm.c | 1 +
+ drivers/scsi/scsi_tgt_if.c | 1 +
+ drivers/scsi/sr_ioctl.c | 1 +
+ drivers/sfi/sfi_core.h | 3 +
+ drivers/sh/intc/core.c | 2 +
+ drivers/sh/intc/dynamic.c | 1 +
+ drivers/sh/intc/virq.c | 1 +
+ drivers/sh/maple/maple.c | 1 +
+ drivers/spi/spi-altera.c | 1 +
+ drivers/spi/spi-au1550.c | 1 +
+ drivers/spi/spi-bitbang.c | 1 +
+ drivers/spi/spi-butterfly.c | 1 +
+ drivers/spi/spi-dw-mmio.c | 1 +
+ drivers/spi/spi-dw-pci.c | 1 +
+ drivers/spi/spi-dw.c | 1 +
+ drivers/spi/spi-gpio.c | 1 +
+ drivers/spi/spi-oc-tiny.c | 1 +
+ drivers/spi/spi-omap-uwire.c | 1 +
+ drivers/spi/spi-orion.c | 1 +
+ drivers/spi/spi-pxa2xx-pci.c | 1 +
+ drivers/spi/spi-s3c24xx.c | 1 +
+ drivers/spi/spi-sh-msiof.c | 1 +
+ drivers/spi/spi-sh-sci.c | 1 +
+ drivers/spi/spi-ti-ssp.c | 1 +
+ drivers/spi/spi-tle62x0.c | 1 +
+ drivers/spi/spi-txx9.c | 1 +
+ drivers/spi/spi.c | 1 +
+ drivers/ssb/b43_pci_bridge.c | 1 +
+ drivers/ssb/driver_chipcommon.c | 1 +
+ drivers/ssb/driver_chipcommon_pmu.c | 1 +
+ drivers/ssb/driver_gige.c | 1 +
+ drivers/ssb/driver_pcicore.c | 1 +
+ drivers/ssb/embedded.c | 1 +
+ drivers/ssb/main.c | 1 +
+ drivers/ssb/pcihost_wrapper.c | 1 +
+ drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 2 +
+ drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1 +
+ drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 1 +
+ drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 +
+ drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 1 +
+ drivers/staging/brcm80211/brcmutil/utils.c | 1 +
+ drivers/staging/brcm80211/brcmutil/wifi.c | 1 +
+ drivers/staging/cxt1e1/linux.c | 1 +
+ drivers/staging/gma500/intel_i2c.c | 1 +
+ drivers/staging/gma500/mdfld_dsi_output.c | 1 +
+ drivers/staging/gma500/mdfld_output.c | 3 +-
+ drivers/staging/gma500/mid_bios.c | 1 +
+ drivers/staging/gma500/mrst_hdmi_i2c.c | 1 +
+ drivers/staging/gma500/psb_drv.c | 1 +
+ drivers/staging/iio/accel/adis16201_ring.c | 1 +
+ drivers/staging/iio/accel/adis16201_trigger.c | 1 +
+ drivers/staging/iio/accel/adis16203_ring.c | 1 +
+ drivers/staging/iio/accel/adis16203_trigger.c | 1 +
+ drivers/staging/iio/accel/adis16204_ring.c | 1 +
+ drivers/staging/iio/accel/adis16204_trigger.c | 1 +
+ drivers/staging/iio/accel/adis16209_ring.c | 1 +
+ drivers/staging/iio/accel/adis16209_trigger.c | 1 +
+ drivers/staging/iio/accel/adis16240_ring.c | 1 +
+ drivers/staging/iio/accel/adis16240_trigger.c | 1 +
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 1 +
+ drivers/staging/iio/adc/ad7793.c | 1 +
+ drivers/staging/iio/dac/ad5686.c | 1 +
+ drivers/staging/iio/gyro/adis16060_core.c | 1 +
+ drivers/staging/iio/gyro/adis16260_ring.c | 1 +
+ drivers/staging/iio/gyro/adis16260_trigger.c | 1 +
+ drivers/staging/iio/imu/adis16400_ring.c | 1 +
+ drivers/staging/iio/imu/adis16400_trigger.c | 1 +
+ drivers/staging/iio/meter/ade7758_ring.c | 1 +
+ drivers/staging/iio/meter/ade7758_trigger.c | 1 +
+ drivers/staging/intel_sst/intel_sst.c | 1 +
+ .../staging/intel_sst/intel_sst_drv_interface.c | 1 +
+ drivers/staging/line6/audio.c | 1 +
+ drivers/staging/solo6x10/g723.c | 1 +
+ drivers/staging/usbip/usbip_common.c | 1 +
+ drivers/staging/usbip/usbip_event.c | 1 +
+ drivers/staging/winbond/wbusb.c | 1 +
+ drivers/staging/wlags49_h2/wl_cs.c | 1 +
+ drivers/target/iscsi/iscsi_target.c | 1 +
+ drivers/target/iscsi/iscsi_target_configfs.c | 1 +
+ drivers/target/iscsi/iscsi_target_stat.c | 1 +
+ drivers/target/target_core_alua.c | 1 +
+ drivers/target/target_core_device.c | 1 +
+ drivers/target/target_core_fabric_lib.c | 1 +
+ drivers/target/target_core_file.c | 1 +
+ drivers/target/target_core_hba.c | 1 +
+ drivers/target/target_core_iblock.c | 1 +
+ drivers/target/target_core_pscsi.c | 1 +
+ drivers/target/target_core_tmr.c | 1 +
+ drivers/target/target_core_tpg.c | 1 +
+ drivers/target/target_core_transport.c | 1 +
+ drivers/tty/hvc/hvc_iseries.c | 1 +
+ drivers/tty/hvc/hvc_vio.c | 1 +
+ drivers/tty/serial/jsm/jsm_driver.c | 2 +-
+ drivers/tty/serial/kgdboc.c | 1 +
+ drivers/tty/serial/max3100.c | 1 +
+ drivers/tty/serial/max3107-aava.c | 1 +
+ drivers/tty/serial/max3107.c | 1 +
+ drivers/tty/serial/nwpserial.c | 1 +
+ drivers/tty/serial/timbuart.c | 1 +
+ drivers/tty/serial/xilinx_uartps.c | 1 +
+ drivers/tty/vt/vc_screen.c | 1 +
+ drivers/uio/uio_pdrv.c | 1 +
+ drivers/uio/uio_pdrv_genirq.c | 1 +
+ drivers/usb/c67x00/c67x00-drv.c | 1 +
+ drivers/usb/core/driver.c | 1 +
+ drivers/usb/core/notify.c | 1 +
+ drivers/usb/gadget/cdc2.c | 1 +
+ drivers/usb/gadget/composite.c | 1 +
+ drivers/usb/gadget/dbgp.c | 1 +
+ drivers/usb/gadget/f_fs.c | 1 +
+ drivers/usb/gadget/f_obex.c | 1 +
+ drivers/usb/gadget/f_sourcesink.c | 1 +
+ drivers/usb/gadget/file_storage.c | 1 +
+ drivers/usb/gadget/fusb300_udc.c | 1 +
+ drivers/usb/gadget/gmidi.c | 1 +
+ drivers/usb/gadget/u_serial.c | 1 +
+ drivers/usb/host/fsl-mph-dr-of.c | 1 +
+ drivers/usb/host/isp1760-if.c | 1 +
+ drivers/usb/host/pci-quirks.c | 1 +
+ drivers/usb/host/whci/debug.c | 1 +
+ drivers/usb/host/whci/hcd.c | 1 +
+ drivers/usb/host/xhci-hub.c | 1 +
+ drivers/usb/host/xhci-pci.c | 1 +
+ drivers/usb/mon/mon_bin.c | 1 +
+ drivers/usb/mon/mon_stat.c | 1 +
+ drivers/usb/mon/mon_text.c | 1 +
+ drivers/usb/otg/gpio_vbus.c | 1 +
+ drivers/usb/otg/otg.c | 1 +
+ drivers/usb/otg/ulpi.c | 1 +
+ drivers/usb/serial/aircable.c | 1 +
+ drivers/usb/serial/qcserial.c | 1 +
+ drivers/usb/storage/option_ms.c | 1 +
+ drivers/usb/storage/protocol.c | 1 +
+ drivers/usb/storage/sierra_ms.c | 1 +
+ drivers/usb/storage/transport.c | 1 +
+ drivers/usb/storage/uas.c | 1 +
+ drivers/usb/wusbcore/devconnect.c | 1 +
+ drivers/usb/wusbcore/mmc.c | 1 +
+ drivers/usb/wusbcore/rh.c | 1 +
+ drivers/usb/wusbcore/security.c | 1 +
+ drivers/usb/wusbcore/wa-hc.c | 1 +
+ drivers/usb/wusbcore/wa-rpipe.c | 1 +
+ drivers/usb/wusbcore/wa-xfer.c | 1 +
+ drivers/uwb/est.c | 1 +
+ drivers/uwb/i1480/dfu/dfu.c | 1 +
+ drivers/uwb/ie.c | 1 +
+ drivers/uwb/lc-dev.c | 2 +
+ drivers/uwb/lc-rc.c | 1 +
+ drivers/uwb/neh.c | 1 +
+ drivers/uwb/pal.c | 1 +
+ drivers/uwb/radio.c | 1 +
+ drivers/uwb/reset.c | 1 +
+ drivers/uwb/rsv.c | 1 +
+ drivers/uwb/scan.c | 1 +
+ drivers/uwb/umc-bus.c | 1 +
+ drivers/uwb/umc-dev.c | 1 +
+ drivers/uwb/umc-drv.c | 1 +
+ drivers/uwb/whci.c | 1 +
+ drivers/video/atmel_lcdfb.c | 1 +
+ drivers/video/backlight/88pm860x_bl.c | 1 +
+ drivers/video/backlight/adp5520_bl.c | 1 +
+ drivers/video/backlight/ams369fg06.c | 1 +
+ drivers/video/backlight/da903x_bl.c | 1 +
+ drivers/video/backlight/ep93xx_bl.c | 1 +
+ drivers/video/backlight/l4f00242t03.c | 1 +
+ drivers/video/backlight/ld9040.c | 1 +
+ drivers/video/backlight/lms283gf05.c | 1 +
+ drivers/video/backlight/max8925_bl.c | 1 +
+ drivers/video/backlight/s6e63m0.c | 1 +
+ drivers/video/backlight/wm831x_bl.c | 1 +
+ drivers/video/carminefb.c | 1 +
+ drivers/video/cobalt_lcdfb.c | 1 +
+ drivers/video/ep93xx-fb.c | 1 +
+ drivers/video/fb_ddc.c | 3 +-
+ drivers/video/fb_notify.c | 1 +
+ drivers/video/mb862xx/mb862xx-i2c.c | 1 +
+ drivers/video/mb862xx/mb862xxfbdrv.c | 1 +
+ drivers/video/msm/mdp.c | 1 +
+ drivers/video/omap/lcd_mipid.c | 1 +
+ drivers/video/omap/omapfb_main.c | 1 +
+ drivers/video/omap2/dss/dispc.c | 1 +
+ drivers/video/omap2/dss/dpi.c | 1 +
+ drivers/video/omap2/dss/dsi.c | 1 +
+ drivers/video/omap2/dss/dss.c | 1 +
+ drivers/video/omap2/dss/rfbi.c | 1 +
+ drivers/video/omap2/dss/sdi.c | 1 +
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 +
+ drivers/video/savage/savagefb_accel.c | 1 +
+ drivers/video/sh_mipi_dsi.c | 1 +
+ drivers/video/sh_mobile_lcdcfb.c | 1 +
+ drivers/video/via/via-gpio.c | 1 +
+ drivers/video/w100fb.c | 1 +
+ drivers/virtio/virtio.c | 1 +
+ drivers/virtio/virtio_balloon.c | 1 +
+ drivers/virtio/virtio_ring.c | 1 +
+ drivers/w1/w1_family.c | 1 +
+ drivers/w1/w1_int.c | 2 +
+ drivers/watchdog/stmp3xxx_wdt.c | 1 +
+ drivers/xen/balloon.c | 1 +
+ drivers/xen/manage.c | 1 +
+ drivers/xen/swiotlb-xen.c | 1 +
+ drivers/xen/xen-pciback/conf_space.c | 1 +
+ drivers/xen/xen-selfballoon.c | 2 +
+ drivers/xen/xenbus/xenbus_client.c | 1 +
+ drivers/xen/xenbus/xenbus_probe.c | 1 +
+ drivers/xen/xenbus/xenbus_probe_backend.c | 1 +
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
+ drivers/zorro/proc.c | 1 +
+ fs/bio-integrity.c | 1 +
+ fs/cifs/connect.c | 1 +
+ fs/exofs/ore.c | 1 +
+ fs/exofs/super.c | 1 +
+ fs/fuse/cuse.c | 1 +
+ fs/gfs2/ops_fstype.c | 1 +
+ fs/ioprio.c | 1 +
+ fs/jfs/jfs_logmgr.c | 1 +
+ fs/logfs/super.c | 1 +
+ fs/nfs/nfs4filelayout.c | 1 +
+ fs/nfs/pagelist.c | 1 +
+ fs/nfs/pnfs.c | 1 +
+ fs/nfs/pnfs_dev.c | 1 +
+ fs/nfs/write.c | 1 +
+ fs/nfsd/nfs4acl.c | 1 +
+ fs/nfsd/nfsctl.c | 1 +
+ fs/nfsd/nfssvc.c | 1 +
+ fs/ocfs2/cluster/tcp.c | 1 +
+ fs/ocfs2/dlm/dlmdebug.c | 1 +
+ fs/proc/vmcore.c | 1 +
+ include/acpi/platform/aclinux.h | 2 +-
+ include/drm/drmP.h | 3 +-
+ include/linux/bcma/bcma.h | 7 +-
+ include/linux/blkdev.h | 2 +-
+ include/linux/cpuidle.h | 3 +-
+ include/linux/crypto.h | 6 --
+ include/linux/device.h | 15 ++-
+ include/linux/device_cgroup.h | 1 -
+ include/linux/dmaengine.h | 2 +
+ include/linux/export.h | 89 ++++++++++++++++++++
+ include/linux/firmware.h | 2 +-
+ include/linux/ftrace.h | 2 +-
+ include/linux/gameport.h | 17 ++--
+ include/linux/hid.h | 9 +-
+ include/linux/i2c.h | 10 +-
+ include/linux/ipmi.h | 3 +-
+ include/linux/ipmi_smi.h | 1 -
+ include/linux/irq.h | 32 +++-----
+ include/linux/irqdesc.h | 1 +
+ include/linux/mdio-bitbang.h | 3 +-
+ include/linux/miscdevice.h | 3 +-
+ include/linux/module.h | 73 +----------------
+ include/linux/moduleparam.h | 5 +
+ include/linux/mtd/mtd.h | 3 +-
+ include/linux/of_platform.h | 1 -
+ include/linux/pci_hotplug.h | 10 +--
+ include/linux/pm_runtime.h | 1 +
+ include/linux/regmap.h | 2 +-
+ include/linux/regulator/driver.h | 1 +
+ include/linux/serio.h | 20 +++--
+ include/linux/ssb/ssb.h | 7 +-
+ include/linux/stop_machine.h | 1 +
+ include/linux/sunrpc/svc_xprt.h | 3 +-
+ include/linux/sysdev.h | 1 -
+ include/linux/textsearch.h | 3 +-
+ include/linux/uio_driver.h | 12 ++--
+ include/linux/usb.h | 9 +-
+ include/linux/uwb.h | 1 +
+ include/linux/uwb/umc.h | 7 +-
+ include/linux/vermagic.h | 1 -
+ include/linux/vlynq.h | 3 +-
+ include/media/saa7146.h | 3 +-
+ include/media/v4l2-int-device.h | 3 +-
+ include/net/bluetooth/hci_core.h | 24 +++---
+ include/net/inet_timewait_sock.h | 1 -
+ include/net/ip_vs.h | 15 ++--
+ include/net/lib80211.h | 3 +-
+ include/net/netfilter/nf_conntrack.h | 2 +
+ include/net/sch_generic.h | 1 -
+ include/net/sock.h | 2 +-
+ include/sound/core.h | 2 +-
+ include/trace/define_trace.h | 10 --
+ include/trace/events/module.h | 2 +-
+ include/xen/xenbus.h | 1 +
+ kernel/async.c | 2 +-
+ kernel/audit.c | 2 +-
+ kernel/auditsc.c | 2 +-
+ kernel/capability.c | 2 +-
+ kernel/cgroup_freezer.c | 2 +-
+ kernel/compat.c | 1 +
+ kernel/cpu.c | 2 +-
+ kernel/cpuset.c | 2 +-
+ kernel/crash_dump.c | 2 +-
+ kernel/cred.c | 2 +-
+ kernel/debug/kdb/kdb_debugger.c | 1 +
+ kernel/dma.c | 2 +-
+ kernel/events/core.c | 1 +
+ kernel/exit.c | 3 +-
+ kernel/fork.c | 3 +-
+ kernel/freezer.c | 2 +-
+ kernel/futex.c | 2 +-
+ kernel/groups.c | 2 +-
+ kernel/hrtimer.c | 2 +-
+ kernel/hung_task.c | 2 +-
+ kernel/irq/irqdesc.c | 2 +-
+ kernel/irq_work.c | 4 +-
+ kernel/kfifo.c | 2 +-
+ kernel/kprobes.c | 2 +-
+ kernel/ksysfs.c | 3 +-
+ kernel/kthread.c | 2 +-
+ kernel/latencytop.c | 2 +-
+ kernel/lockdep.c | 2 +-
+ kernel/lockdep_proc.c | 2 +-
+ kernel/module.c | 2 +-
+ kernel/mutex-debug.c | 2 +-
+ kernel/mutex.c | 2 +-
+ kernel/notifier.c | 2 +-
+ kernel/nsproxy.c | 2 +-
+ kernel/padata.c | 2 +-
+ kernel/params.c | 4 +-
+ kernel/pid.c | 2 +-
+ kernel/posix-timers.c | 2 +-
+ kernel/power/hibernate.c | 1 +
+ kernel/power/main.c | 1 +
+ kernel/power/qos.c | 1 +
+ kernel/power/suspend.c | 2 +
+ kernel/power/user.c | 1 +
+ kernel/profile.c | 2 +-
+ kernel/ptrace.c | 2 +-
+ kernel/range.c | 2 +-
+ kernel/rcupdate.c | 2 +-
+ kernel/rcutiny.c | 4 +-
+ kernel/rcutorture.c | 3 +-
+ kernel/rcutree.c | 2 +-
+ kernel/rcutree_trace.c | 3 +-
+ kernel/relay.c | 2 +-
+ kernel/resource.c | 2 +-
+ kernel/rtmutex-debug.c | 2 +-
+ kernel/rtmutex-tester.c | 2 +-
+ kernel/rtmutex.c | 2 +-
+ kernel/rwsem.c | 2 +-
+ kernel/sched.c | 2 +-
+ kernel/sched_clock.c | 2 +-
+ kernel/semaphore.c | 2 +-
+ kernel/signal.c | 2 +-
+ kernel/smp.c | 2 +-
+ kernel/softirq.c | 2 +-
+ kernel/spinlock.c | 2 +-
+ kernel/srcu.c | 2 +-
+ kernel/stacktrace.c | 2 +-
+ kernel/stop_machine.c | 2 +-
+ kernel/sys.c | 3 +-
+ kernel/time.c | 2 +-
+ kernel/time/posix-clock.c | 1 +
+ kernel/timer.c | 2 +-
+ kernel/trace/blktrace.c | 1 +
+ kernel/trace/ftrace.c | 1 +
+ kernel/trace/trace_syscalls.c | 1 +
+ kernel/up.c | 2 +-
+ kernel/user-return-notifier.c | 2 +-
+ kernel/user.c | 2 +-
+ kernel/user_namespace.c | 2 +-
+ kernel/utsname.c | 2 +-
+ kernel/utsname_sysctl.c | 2 +-
+ kernel/wait.c | 2 +-
+ kernel/watchdog.c | 3 +-
+ kernel/workqueue.c | 2 +-
+ lib/dma-debug.c | 1 +
+ lib/raid6/algos.c | 1 +
+ lib/raid6/mktables.c | 1 +
+ lib/raid6/recov.c | 1 +
+ mm/fremap.c | 1 -
+ mm/memcontrol.c | 1 +
+ mm/memory-failure.c | 1 +
+ mm/mmzone.c | 1 -
+ mm/quicklist.c | 1 -
+ mm/sparse-vmemmap.c | 1 -
+ mm/swap_state.c | 1 -
+ mm/swapfile.c | 1 -
+ net/802/fc.c | 1 +
+ net/802/garp.c | 1 +
+ net/802/stp.c | 1 +
+ net/8021q/vlan_core.c | 1 +
+ net/8021q/vlan_netlink.c | 1 +
+ net/appletalk/aarp.c | 1 +
+ net/appletalk/atalk_proc.c | 1 +
+ net/atm/pvc.c | 1 +
+ net/atm/svc.c | 1 +
+ net/ax25/ax25_route.c | 1 +
+ net/ax25/ax25_uid.c | 1 +
+ net/bluetooth/hci_sysfs.c | 1 +
+ net/bluetooth/l2cap_sock.c | 2 +
+ net/bluetooth/mgmt.c | 1 +
+ net/bridge/br_input.c | 1 +
+ net/bridge/br_stp_if.c | 1 +
+ net/caif/caif_dev.c | 1 +
+ net/caif/cfpkt_skbuff.c | 1 +
+ net/ceph/messenger.c | 1 +
+ net/compat.c | 1 +
+ net/core/dev_addr_lists.c | 1 +
+ net/core/fib_rules.c | 1 +
+ net/core/net-sysfs.c | 1 +
+ net/core/net-traces.c | 1 +
+ net/core/net_namespace.c | 1 +
+ net/core/netevent.c | 1 +
+ net/core/netpoll.c | 1 +
+ net/core/timestamping.c | 1 +
+ net/core/user_dma.c | 1 +
+ net/dcb/dcbevent.c | 1 +
+ net/dcb/dcbnl.c | 1 +
+ net/dccp/ackvec.c | 1 +
+ net/dccp/ccids/lib/tfrc.c | 1 +
+ net/dccp/timer.c | 1 +
+ net/decnet/dn_route.c | 1 +
+ net/decnet/dn_rules.c | 1 +
+ net/dsa/dsa.c | 1 +
+ net/ieee802154/nl-mac.c | 1 +
+ net/ipv4/fib_rules.c | 1 +
+ net/ipv4/fib_trie.c | 1 +
+ net/ipv4/inet_timewait_sock.c | 1 +
+ net/ipv4/ipconfig.c | 1 +
+ net/ipv4/ipmr.c | 1 +
+ net/ipv4/netfilter.c | 1 +
+ .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 1 +
+ net/ipv4/netfilter/nf_nat_proto_common.c | 1 +
+ net/ipv4/netfilter/nf_nat_proto_icmp.c | 1 +
+ net/ipv4/netfilter/nf_nat_proto_sctp.c | 1 +
+ net/ipv4/netfilter/nf_nat_proto_tcp.c | 1 +
+ net/ipv4/netfilter/nf_nat_proto_udp.c | 1 +
+ net/ipv4/netfilter/nf_nat_proto_udplite.c | 1 +
+ net/ipv4/ping.c | 1 +
+ net/ipv4/proc.c | 1 +
+ net/ipv4/raw.c | 1 +
+ net/ipv4/syncookies.c | 1 +
+ net/ipv4/udplite.c | 1 +
+ net/ipv4/xfrm4_state.c | 1 +
+ net/ipv6/addrconf.c | 1 +
+ net/ipv6/addrconf_core.c | 1 +
+ net/ipv6/exthdrs.c | 1 +
+ net/ipv6/exthdrs_core.c | 1 +
+ net/ipv6/fib6_rules.c | 1 +
+ net/ipv6/ip6_flowlabel.c | 1 +
+ net/ipv6/ip6mr.c | 1 +
+ net/ipv6/netfilter.c | 1 +
+ net/ipv6/proc.c | 1 +
+ net/ipv6/raw.c | 1 +
+ net/ipv6/reassembly.c | 1 +
+ net/ipv6/route.c | 1 +
+ net/ipv6/sysctl_net_ipv6.c | 1 +
+ net/ipv6/udplite.c | 1 +
+ net/ipv6/xfrm6_state.c | 1 +
+ net/ipx/ipx_proc.c | 1 +
+ net/irda/discovery.c | 1 +
+ net/irda/irda_device.c | 1 +
+ net/irda/irttp.c | 1 +
+ net/irda/qos.c | 2 +
+ net/llc/llc_input.c | 1 +
+ net/llc/llc_output.c | 1 +
+ net/llc/llc_proc.c | 1 +
+ net/mac80211/agg-rx.c | 1 +
+ net/mac80211/agg-tx.c | 1 +
+ net/mac80211/ht.c | 1 +
+ net/mac80211/key.c | 1 +
+ net/mac80211/led.c | 1 +
+ net/mac80211/mlme.c | 2 +
+ net/mac80211/offchannel.c | 1 +
+ net/mac80211/rate.c | 1 +
+ net/mac80211/rc80211_minstrel_debugfs.c | 1 +
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 1 +
+ net/mac80211/rc80211_pid_debugfs.c | 1 +
+ net/mac80211/rx.c | 1 +
+ net/mac80211/scan.c | 1 +
+ net/mac80211/status.c | 1 +
+ net/mac80211/tkip.c | 1 +
+ net/mac80211/tx.c | 1 +
+ net/mac80211/util.c | 1 +
+ net/netfilter/ipset/ip_set_getport.c | 1 +
+ net/netfilter/ipset/pfxlen.c | 1 +
+ net/netfilter/nf_conntrack_acct.c | 1 +
+ net/netfilter/nf_conntrack_ecache.c | 1 +
+ net/netfilter/nf_conntrack_expect.c | 2 +
+ net/netfilter/x_tables.c | 1 +
+ net/netfilter/xt_quota.c | 1 +
+ net/netfilter/xt_statistic.c | 1 +
+ net/netrom/nr_route.c | 1 +
+ net/nfc/af_nfc.c | 1 +
+ net/nfc/rawsock.c | 1 +
+ net/phonet/datagram.c | 1 +
+ net/phonet/pep.c | 1 +
+ net/phonet/socket.c | 1 +
+ net/rds/cong.c | 1 +
+ net/rds/connection.c | 1 +
+ net/rds/ib.c | 1 +
+ net/rds/info.c | 1 +
+ net/rds/iw.c | 1 +
+ net/rds/message.c | 1 +
+ net/rds/page.c | 1 +
+ net/rds/rdma_transport.c | 1 +
+ net/rds/recv.c | 1 +
+ net/rds/send.c | 2 +
+ net/rds/stats.c | 1 +
+ net/rds/tcp.c | 1 +
+ net/rds/threads.c | 1 +
+ net/rfkill/input.c | 1 +
+ net/rose/rose_route.c | 1 +
+ net/rxrpc/ar-output.c | 1 +
+ net/rxrpc/ar-recvmsg.c | 1 +
+ net/sched/act_api.c | 1 +
+ net/sched/cls_flow.c | 1 +
+ net/sched/sch_mq.c | 1 +
+ net/sched/sch_mqprio.c | 1 +
+ net/sctp/proc.c | 1 +
+ net/sctp/socket.c | 1 +
+ net/sunrpc/addr.c | 1 +
+ net/sunrpc/backchannel_rqst.c | 1 +
+ net/sunrpc/socklib.c | 1 +
+ net/sunrpc/svc_xprt.c | 1 +
+ net/sunrpc/svcsock.c | 1 +
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
+ net/sysctl_net.c | 1 +
+ net/tipc/core.c | 2 +
+ net/tipc/socket.c | 1 +
+ net/wimax/op-msg.c | 1 +
+ net/wimax/op-reset.c | 1 +
+ net/wimax/op-rfkill.c | 1 +
+ net/wimax/stack.c | 1 +
+ net/wireless/ibss.c | 1 +
+ net/wireless/mesh.c | 1 +
+ net/wireless/radiotap.c | 1 +
+ net/wireless/reg.c | 2 +
+ net/wireless/sme.c | 1 +
+ net/wireless/util.c | 1 +
+ net/wireless/wext-compat.c | 1 +
+ net/wireless/wext-core.c | 1 +
+ net/wireless/wext-sme.c | 1 +
+ net/wireless/wext-spy.c | 1 +
+ net/x25/x25_proc.c | 1 +
+ net/xfrm/xfrm_proc.c | 1 +
+ net/xfrm/xfrm_replay.c | 1 +
+ security/selinux/hooks.c | 1 +
+ security/selinux/netlink.c | 1 +
+ sound/aoa/soundbus/i2sbus/pcm.c | 1 +
+ sound/arm/pxa2xx-ac97-lib.c | 1 +
+ sound/arm/pxa2xx-pcm.c | 1 +
+ sound/core/control.c | 1 +
+ sound/core/device.c | 1 +
+ sound/core/hwdep.c | 1 +
+ sound/core/info.c | 1 +
+ sound/core/info_oss.c | 1 +
+ sound/core/init.c | 1 +
+ sound/core/isadma.c | 1 +
+ sound/core/jack.c | 1 +
+ sound/core/memory.c | 1 +
+ sound/core/misc.c | 1 +
+ sound/core/oss/mixer_oss.c | 1 +
+ sound/core/oss/pcm_oss.c | 2 +-
+ sound/core/pcm.c | 1 +
+ sound/core/pcm_lib.c | 1 +
+ sound/core/pcm_memory.c | 1 +
+ sound/core/pcm_misc.c | 1 +
+ sound/core/pcm_native.c | 1 +
+ sound/core/rawmidi.c | 1 +
+ sound/core/seq/oss/seq_oss.c | 2 +-
+ sound/core/seq/oss/seq_oss_init.c | 2 +-
+ sound/core/seq/oss/seq_oss_synth.c | 1 +
+ sound/core/seq/seq.c | 2 +-
+ sound/core/seq/seq_clientmgr.c | 1 +
+ sound/core/seq/seq_device.c | 1 +
+ sound/core/seq/seq_dummy.c | 2 +-
+ sound/core/seq/seq_info.c | 1 +
+ sound/core/seq/seq_lock.c | 1 +
+ sound/core/seq/seq_memory.c | 1 +
+ sound/core/seq/seq_midi.c | 2 +-
+ sound/core/seq/seq_midi_emul.c | 1 +
+ sound/core/seq/seq_midi_event.c | 1 +
+ sound/core/seq/seq_ports.c | 1 +
+ sound/core/seq/seq_system.c | 1 +
+ sound/core/seq/seq_virmidi.c | 1 +
+ sound/core/sound.c | 2 +-
+ sound/core/sound_oss.c | 1 +
+ sound/core/timer.c | 2 +-
+ sound/core/vmaster.c | 1 +
+ sound/drivers/aloop.c | 2 +-
+ sound/drivers/dummy.c | 2 +-
+ sound/drivers/ml403-ac97cr.c | 2 +-
+ sound/drivers/mpu401/mpu401.c | 2 +-
+ sound/drivers/mpu401/mpu401_uart.c | 1 +
+ sound/drivers/mtpav.c | 1 +
+ sound/drivers/mts64.c | 1 +
+ sound/drivers/opl3/opl3_lib.c | 1 +
+ sound/drivers/opl3/opl3_oss.c | 1 +
+ sound/drivers/opl3/opl3_seq.c | 1 +
+ sound/drivers/opl3/opl3_synth.c | 1 +
+ sound/drivers/opl4/opl4_lib.c | 1 +
+ sound/drivers/opl4/opl4_proc.c | 1 +
+ sound/drivers/opl4/opl4_seq.c | 1 +
+ sound/drivers/pcsp/pcsp.c | 2 +-
+ sound/drivers/portman2x4.c | 1 +
+ sound/drivers/serial-u16550.c | 2 +-
+ sound/drivers/virmidi.c | 2 +-
+ sound/drivers/vx/vx_core.c | 1 +
+ sound/drivers/vx/vx_hwdep.c | 1 +
+ sound/firewire/iso-resources.c | 1 +
+ sound/firewire/packets-buffer.c | 1 +
+ sound/i2c/cs8427.c | 1 +
+ sound/i2c/i2c.c | 1 +
+ sound/i2c/other/ak4113.c | 1 +
+ sound/i2c/other/ak4114.c | 1 +
+ sound/i2c/other/ak4117.c | 1 +
+ sound/i2c/other/ak4xxx-adda.c | 1 +
+ sound/i2c/other/pt2258.c | 1 +
+ sound/i2c/other/tea575x-tuner.c | 1 +
+ sound/i2c/tea6330t.c | 1 +
+ sound/isa/ad1816a/ad1816a.c | 2 +-
+ sound/isa/ad1848/ad1848.c | 2 +-
+ sound/isa/als100.c | 2 +-
+ sound/isa/azt2320.c | 2 +-
+ sound/isa/cmi8330.c | 2 +-
+ sound/isa/cs423x/cs4231.c | 2 +-
+ sound/isa/cs423x/cs4236.c | 2 +-
+ sound/isa/es1688/es1688.c | 2 +-
+ sound/isa/es1688/es1688_lib.c | 1 +
+ sound/isa/es18xx.c | 2 +-
+ sound/isa/gus/gus_main.c | 1 +
+ sound/isa/gus/gus_volume.c | 1 +
+ sound/isa/gus/gusclassic.c | 2 +-
+ sound/isa/gus/gusextreme.c | 2 +-
+ sound/isa/gus/gusmax.c | 2 +-
+ sound/isa/gus/interwave.c | 2 +-
+ sound/isa/msnd/msnd.c | 1 +
+ sound/isa/msnd/msnd_midi.c | 1 +
+ sound/isa/msnd/msnd_pinnacle_mixer.c | 1 +
+ sound/isa/opl3sa2.c | 2 +-
+ sound/isa/opti9xx/miro.c | 2 +-
+ sound/isa/opti9xx/opti92x-ad1848.c | 2 +-
+ sound/isa/sb/emu8000.c | 1 +
+ sound/isa/sb/emu8000_callback.c | 1 +
+ sound/isa/sb/emu8000_patch.c | 1 +
+ sound/isa/sb/emu8000_synth.c | 1 +
+ sound/isa/sb/sb16.c | 2 +-
+ sound/isa/sb/sb16_csp.c | 1 +
+ sound/isa/sb/sb16_main.c | 1 +
+ sound/isa/sb/sb8.c | 2 +-
+ sound/isa/sb/sb8_main.c | 1 +
+ sound/isa/sb/sb_common.c | 1 +
+ sound/isa/sscape.c | 2 +-
+ sound/isa/wavefront/wavefront.c | 2 +-
+ sound/isa/wavefront/wavefront_fx.c | 1 +
+ sound/isa/wavefront/wavefront_synth.c | 1 +
+ sound/isa/wss/wss_lib.c | 1 +
+ sound/mips/au1x00.c | 1 +
+ sound/mips/hal2.c | 1 +
+ sound/mips/sgio2audio.c | 1 +
+ sound/pci/ac97/ac97_codec.c | 2 +-
+ sound/pci/ac97/ac97_pcm.c | 1 +
+ sound/pci/ad1889.c | 1 +
+ sound/pci/ak4531_codec.c | 1 +
+ sound/pci/ali5451/ali5451.c | 2 +-
+ sound/pci/als300.c | 2 +-
+ sound/pci/als4000.c | 2 +-
+ sound/pci/asihpi/asihpi.c | 1 +
+ sound/pci/asihpi/hpioctl.c | 1 +
+ sound/pci/atiixp.c | 2 +-
+ sound/pci/atiixp_modem.c | 2 +-
+ sound/pci/au88x0/au88x0.c | 2 +-
+ sound/pci/au88x0/au88x0_game.c | 1 +
+ sound/pci/aw2/aw2-alsa.c | 1 +
+ sound/pci/azt3328.c | 2 +-
+ sound/pci/bt87x.c | 2 +-
+ sound/pci/ca0106/ca0106_main.c | 2 +-
+ sound/pci/cmipci.c | 2 +-
+ sound/pci/cs4281.c | 2 +-
+ sound/pci/cs46xx/cs46xx.c | 2 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 1 +
+ sound/pci/cs5530.c | 2 +-
+ sound/pci/cs5535audio/cs5535audio.c | 2 +-
+ sound/pci/ctxfi/xfi.c | 1 +
+ sound/pci/echoaudio/darla20.c | 2 +-
+ sound/pci/echoaudio/darla24.c | 2 +-
+ sound/pci/echoaudio/echo3g.c | 2 +-
+ sound/pci/echoaudio/echoaudio.c | 2 +
+ sound/pci/echoaudio/gina20.c | 2 +-
+ sound/pci/echoaudio/gina24.c | 2 +-
+ sound/pci/echoaudio/indigo.c | 2 +-
+ sound/pci/echoaudio/indigodj.c | 2 +-
+ sound/pci/echoaudio/indigodjx.c | 2 +-
+ sound/pci/echoaudio/indigoio.c | 2 +-
+ sound/pci/echoaudio/indigoiox.c | 2 +-
+ sound/pci/echoaudio/layla20.c | 2 +-
+ sound/pci/echoaudio/layla24.c | 2 +-
+ sound/pci/echoaudio/mia.c | 2 +-
+ sound/pci/echoaudio/mona.c | 2 +-
+ sound/pci/emu10k1/emu10k1.c | 2 +-
+ sound/pci/emu10k1/emu10k1_callback.c | 1 +
+ sound/pci/emu10k1/emu10k1_main.c | 1 +
+ sound/pci/emu10k1/emu10k1_synth.c | 1 +
+ sound/pci/emu10k1/emu10k1x.c | 2 +-
+ sound/pci/emu10k1/io.c | 1 +
+ sound/pci/emu10k1/memory.c | 1 +
+ sound/pci/emu10k1/voice.c | 1 +
+ sound/pci/ens1370.c | 2 +-
+ sound/pci/es1938.c | 2 +-
+ sound/pci/es1968.c | 2 +-
+ sound/pci/fm801.c | 2 +-
+ sound/pci/hda/hda_beep.c | 1 +
+ sound/pci/hda/hda_codec.c | 1 +
+ sound/pci/hda/hda_generic.c | 1 +
+ sound/pci/hda/hda_hwdep.c | 1 +
+ sound/pci/hda/patch_analog.c | 1 +
+ sound/pci/hda/patch_ca0110.c | 1 +
+ sound/pci/hda/patch_ca0132.c | 1 +
+ sound/pci/hda/patch_cirrus.c | 1 +
+ sound/pci/hda/patch_cmedia.c | 1 +
+ sound/pci/hda/patch_conexant.c | 1 +
+ sound/pci/hda/patch_hdmi.c | 2 +-
+ sound/pci/hda/patch_realtek.c | 1 +
+ sound/pci/hda/patch_si3054.c | 1 +
+ sound/pci/hda/patch_sigmatel.c | 1 +
+ sound/pci/hda/patch_via.c | 1 +
+ sound/pci/ice1712/ak4xxx.c | 1 +
+ sound/pci/ice1712/ice1712.c | 2 +-
+ sound/pci/ice1712/ice1724.c | 2 +-
+ sound/pci/intel8x0.c | 2 +-
+ sound/pci/intel8x0m.c | 2 +-
+ sound/pci/korg1212/korg1212.c | 2 +-
+ sound/pci/lola/lola.c | 2 +-
+ sound/pci/maestro3.c | 2 +-
+ sound/pci/mixart/mixart.c | 2 +-
+ sound/pci/mixart/mixart_hwdep.c | 1 +
+ sound/pci/nm256/nm256.c | 2 +-
+ sound/pci/oxygen/oxygen.c | 1 +
+ sound/pci/oxygen/oxygen_io.c | 1 +
+ sound/pci/oxygen/oxygen_lib.c | 1 +
+ sound/pci/oxygen/virtuoso.c | 1 +
+ sound/pci/pcxhr/pcxhr.c | 2 +-
+ sound/pci/pcxhr/pcxhr_hwdep.c | 1 +
+ sound/pci/riptide/riptide.c | 1 +
+ sound/pci/rme32.c | 2 +-
+ sound/pci/rme96.c | 2 +-
+ sound/pci/rme9652/hdsp.c | 2 +-
+ sound/pci/rme9652/hdspm.c | 2 +-
+ sound/pci/rme9652/rme9652.c | 2 +-
+ sound/pci/sis7019.c | 2 +-
+ sound/pci/sonicvibes.c | 2 +-
+ sound/pci/trident/trident.c | 2 +-
+ sound/pci/trident/trident_main.c | 1 +
+ sound/pci/via82xx.c | 2 +-
+ sound/pci/via82xx_modem.c | 2 +-
+ sound/pci/vx222/vx222.c | 2 +-
+ sound/pci/ymfpci/ymfpci.c | 2 +-
+ sound/pci/ymfpci/ymfpci_main.c | 1 +
+ sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +-
+ sound/pcmcia/vx/vxpocket.c | 2 +-
+ sound/ppc/powermac.c | 2 +-
+ sound/ppc/snd_ps3.c | 1 +
+ sound/sh/aica.c | 2 +-
+ sound/sh/sh_dac_audio.c | 1 +
+ sound/soc/blackfin/bf5xx-sport.c | 1 +
+ sound/soc/blackfin/bfin-eval-adav80x.c | 1 +
+ sound/soc/codecs/ac97.c | 1 +
+ sound/soc/codecs/ads117x.c | 1 +
+ sound/soc/codecs/ak4642.c | 1 +
+ sound/soc/codecs/cx20442.c | 1 +
+ sound/soc/codecs/da7210.c | 1 +
+ sound/soc/codecs/dmic.c | 1 +
+ sound/soc/codecs/pcm3008.c | 1 +
+ sound/soc/codecs/sn95031.c | 1 +
+ sound/soc/codecs/wl1273.c | 1 +
+ sound/soc/ep93xx/edb93xx.c | 1 +
+ sound/soc/ep93xx/snappercl15.c | 1 +
+ sound/soc/imx/wm1133-ev1.c | 1 +
+ sound/soc/mid-x86/mfld_machine.c | 1 +
+ sound/soc/mid-x86/sst_platform.c | 1 +
+ sound/soc/omap/am3517evm.c | 1 +
+ sound/soc/omap/ams-delta.c | 1 +
+ sound/soc/omap/igep0020.c | 1 +
+ sound/soc/omap/n810.c | 1 +
+ sound/soc/omap/omap-pcm.c | 1 +
+ sound/soc/omap/omap3beagle.c | 1 +
+ sound/soc/omap/omap3evm.c | 1 +
+ sound/soc/omap/omap3pandora.c | 1 +
+ sound/soc/omap/omap4-hdmi-card.c | 1 +
+ sound/soc/omap/osk5912.c | 1 +
+ sound/soc/omap/overo.c | 1 +
+ sound/soc/omap/rx51.c | 1 +
+ sound/soc/omap/sdp3430.c | 1 +
+ sound/soc/omap/sdp4430.c | 1 +
+ sound/soc/omap/zoom2.c | 1 +
+ sound/soc/pxa/pxa2xx-pcm.c | 1 +
+ sound/soc/samsung/ac97.c | 1 +
+ sound/soc/samsung/dma.c | 1 +
+ sound/soc/samsung/goni_wm8994.c | 1 +
+ sound/soc/samsung/h1940_uda1380.c | 1 +
+ sound/soc/samsung/i2s.c | 1 +
+ sound/soc/samsung/idma.c | 1 +
+ sound/soc/samsung/jive_wm8750.c | 1 +
+ sound/soc/samsung/ln2440sbc_alc650.c | 1 +
+ sound/soc/samsung/pcm.c | 1 +
+ sound/soc/samsung/rx1950_uda1380.c | 1 +
+ sound/soc/samsung/s3c2412-i2s.c | 1 +
+ sound/soc/samsung/s3c24xx-i2s.c | 1 +
+ sound/soc/samsung/s3c24xx_simtec.c | 1 +
+ sound/soc/samsung/s3c24xx_simtec_hermes.c | 1 +
+ sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 1 +
+ sound/soc/samsung/s3c24xx_uda134x.c | 1 +
+ sound/soc/samsung/smartq_wm8987.c | 1 +
+ sound/soc/samsung/smdk_spdif.c | 1 +
+ sound/soc/samsung/smdk_wm8580.c | 1 +
+ sound/soc/samsung/smdk_wm8580pcm.c | 1 +
+ sound/soc/samsung/smdk_wm8994pcm.c | 1 +
+ sound/soc/samsung/smdk_wm9713.c | 1 +
+ sound/soc/samsung/spdif.c | 1 +
+ sound/soc/samsung/speyside.c | 1 +
+ sound/soc/samsung/speyside_wm8962.c | 1 +
+ sound/soc/sh/fsi-ak4642.c | 1 +
+ sound/soc/sh/fsi-da7210.c | 1 +
+ sound/soc/sh/fsi-hdmi.c | 1 +
+ sound/soc/sh/fsi.c | 1 +
+ sound/soc/sh/siu_dai.c | 1 +
+ sound/soc/soc-cache.c | 1 +
+ sound/soc/soc-io.c | 1 +
+ sound/soc/soc-jack.c | 1 +
+ sound/soc/soc-utils.c | 1 +
+ sound/soc/tegra/tegra_asoc_utils.c | 1 +
+ sound/sparc/dbri.c | 1 +
+ sound/synth/emux/emux.c | 1 +
+ sound/synth/emux/emux_oss.c | 1 +
+ sound/synth/emux/emux_seq.c | 2 +-
+ sound/synth/emux/emux_synth.c | 1 +
+ sound/synth/emux/soundfont.c | 1 +
+ sound/synth/util_mem.c | 1 +
+ sound/usb/6fire/firmware.c | 1 +
+ sound/usb/card.c | 1 +
+ sound/usb/midi.c | 1 +
+ sound/usb/usx2y/us122l.c | 1 +
+ sound/usb/usx2y/usbusx2yaudio.c | 1 +
+ virt/kvm/iommu.c | 2 +
+ 2021 files changed, 2228 insertions(+), 579 deletions(-)
+ create mode 100644 include/linux/export.h
+$ git am -3 ../modsplit/drivers-md-change-module.h-export.h-in-persistent-da.patch
+Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/md/persistent-data/dm-btree-remove.c
+M drivers/md/persistent-data/dm-btree.c
+M drivers/md/persistent-data/dm-space-map-disk.c
+M drivers/md/persistent-data/dm-transaction-manager.c
+$ git add .
+$ git commit -v -a --amend
+[master 9fda039] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/block-bsg-lib.c-change-module.h-export.h-in-power-co.patch
+Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M block/bsg-lib.c
+$ git add .
+$ git commit -v -a --amend
+[master 4885b59] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/drivers-base-change-module.h-export.h-in-power-commo.patch
+Applying: drivers/base: change module.h -> export.h in power/common.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/base/power/common.c
+$ git add .
+$ git commit -v -a --amend
+[master ecc3de5] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/rtlwifi-use-of-module_param-requires-the-inclusion-o.patch
+Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/wireless/rtlwifi/debug.c
+$ git add .
+$ git commit -v -a --amend
+[master d63bb19] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/mmc-using-module_param-requires-the-inclusion-of-mod.patch
+Applying: mmc: using module_param requires the inclusion of moduleparam.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/mmc/core/debugfs.c
+$ git add .
+$ git commit -v -a --amend
+[master 73cc11e] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/NFC-use-of-module-facilities-requires-the-inclusion-.patch
+Applying: NFC: use of module facilities requires the inclusion of module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/nfc/nfcwilink.c
+$ git add .
+$ git commit -v -a --amend
+[master 120ea1f] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/block-mtip32xx-include-module.h-for-its-utilities.patch
+Applying: block/mtip32xx: include module.h for its utilities
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/block/mtip32xx/mtip32xx.c
+$ git add .
+$ git commit -v -a --amend
+[master 090fc9b] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/powerpc-powernv-include-export.h-in-hvc_opal.h-for-T.patch
+Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/tty/hvc/hvc_opal.c
+$ git add .
+$ git commit -v -a --amend
+[master efd1a23] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/PM-QoS-include-export.h-in-qos.c-for-EXPORT_SYMBOL.patch
+Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/base/power/qos.c
+$ git add .
+$ git commit -v -a --amend
+[master 4257184] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/net-Add-export.h-to-nfc-nci-core.c.patch
+Applying: net: Add export.h to nfc/nci/core.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M net/nfc/nci/core.c
+$ git add .
+$ git commit -v -a --amend
+[master f262c78] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/scsi-Add-export.h-to-drivers-scsi-libsas-sas_host_sm.patch
+Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/scsi/libsas/sas_host_smp.c
+$ git add .
+$ git commit -v -a --amend
+[master 32b6620] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/drivers-net-Add-module.h-to-wireless-ath-ath6kl-sdio.patch
+Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/wireless/ath/ath6kl/sdio.c
+$ git add .
+$ git commit -v -a --amend
+[master 5f24aa4] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/drivers-net-wireless-ath-ath5k-debug.c-does-not-need.patch
+Applying: drivers/net: wireless/ath/ath5k/debug.c does not need module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/wireless/ath/ath5k/debug.c
+$ git add .
+$ git commit -v -a --amend
+[master 012bac1] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/drivers-bcma-driver_chipcommon_pmu.c-needs-export.h-.patch
+Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/bcma/driver_chipcommon_pmu.c
+$ git add .
+$ git commit -v -a --amend
+[master 18f4d3c] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/drivers-base-Add-export.h-to-regmap-regcache.c.patch
+Applying: drivers/base: Add export.h to regmap/regcache.c
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/base/regmap/regcache.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/base/regmap/regcache.c
+$ git add .
+$ git commit -v -a --amend
+[master ba39d89] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/staging-Add-export.h-to-rts5139-rts51x_scsi.c.patch
+Applying: staging: Add export.h to rts5139/rts51x_scsi.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/rts5139/rts51x_scsi.c
+$ git add .
+$ git commit -v -a --amend
+[master d4d1a09] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/pinctrl-EXPORT_SYMBOL-needs-export.h.patch
+Applying: pinctrl: EXPORT_SYMBOL needs export.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/pinctrl/core.c
+$ git add .
+$ git commit -v -a --amend
+[master e9950cd] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/staging-Add-export.h-for-EXPORT_SYMBOL-to-drivers-st.patch
+Applying: staging: Add export.h for EXPORT_SYMBOL to drivers/staging/iio/industrialio-buffer.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/iio/industrialio-buffer.c
+$ git add .
+$ git commit -v -a --amend
+[master 077ed4c] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/ath6kl-THIS_MODULES-needs-export.h.patch
+Applying: ath6kl: THIS_MODULES needs export.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/wireless/ath/ath6kl/debug.c
+$ git add .
+$ git commit -v -a --amend
+[master 2b42608] Merge remote-tracking branch 'moduleh/for-sfr'
+$ git am -3 ../modsplit/ath6kl-module_param-needs-the-inclusion-of-modulepar.patch
+Applying: ath6kl: module_param needs the inclusion of moduleparam.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/wireless/ath/ath6kl/cfg80211.c
+$ git add .
+$ git commit -v -a --amend
+[master 8bf470b] Merge remote-tracking branch 'moduleh/for-sfr'
+Merging kvmtool/master
+$ git merge kvmtool/master
+Resolved 'include/net/9p/9p.h' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging include/net/9p/9p.h
+CONFLICT (content): Merge conflict in include/net/9p/9p.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 51023d7] Merge remote-tracking branch 'kvmtool/master'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 8 +
+ tools/kvm/.gitignore | 10 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 ++
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Makefile | 286 ++++++
+ tools/kvm/README | 109 +++
+ tools/kvm/bios.c | 157 ++++
+ tools/kvm/bios/.gitignore | 3 +
+ tools/kvm/bios/bios-rom.S | 12 +
+ tools/kvm/bios/e820.c | 73 ++
+ tools/kvm/bios/entry.S | 90 ++
+ tools/kvm/bios/gen-offsets.sh | 14 +
+ tools/kvm/bios/int10.c | 151 +++
+ tools/kvm/bios/int15.c | 18 +
+ tools/kvm/bios/local.S | 7 +
+ tools/kvm/bios/macro.S | 25 +
+ tools/kvm/bios/rom.ld.S | 17 +
+ tools/kvm/builtin-balloon.c | 75 ++
+ tools/kvm/builtin-debug.c | 66 ++
+ tools/kvm/builtin-help.c | 61 ++
+ tools/kvm/builtin-list.c | 66 ++
+ tools/kvm/builtin-pause.c | 66 ++
+ tools/kvm/builtin-resume.c | 66 ++
+ tools/kvm/builtin-run.c | 991 ++++++++++++++++++++
+ tools/kvm/builtin-setup.c | 214 +++++
+ tools/kvm/builtin-stat.c | 79 ++
+ tools/kvm/builtin-stop.c | 66 ++
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 14 +
+ tools/kvm/config/feature-tests.mak | 148 +++
+ tools/kvm/config/utilities.mak | 188 ++++
+ tools/kvm/cpuid.c | 55 ++
+ tools/kvm/disk/blk.c | 39 +
+ tools/kvm/disk/core.c | 222 +++++
+ tools/kvm/disk/qcow.c | 1099 ++++++++++++++++++++++
+ tools/kvm/disk/raw.c | 82 ++
+ tools/kvm/framebuffer.c | 68 ++
+ tools/kvm/guest/init.c | 46 +
+ tools/kvm/guest_compat.c | 104 +++
+ tools/kvm/hw/i8042.c | 348 +++++++
+ tools/kvm/hw/pci-shmem.c | 264 ++++++
+ tools/kvm/hw/rtc.c | 87 ++
+ tools/kvm/hw/serial.c | 364 ++++++++
+ tools/kvm/hw/vesa.c | 77 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/kvm/8250-serial.h | 10 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/assembly.h | 24 +
+ tools/kvm/include/kvm/barrier.h | 15 +
+ tools/kvm/include/kvm/bios-export.h | 13 +
+ tools/kvm/include/kvm/bios.h | 83 ++
+ tools/kvm/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 7 +
+ tools/kvm/include/kvm/builtin-debug.h | 7 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 7 +
+ tools/kvm/include/kvm/builtin-pause.h | 7 +
+ tools/kvm/include/kvm/builtin-resume.h | 7 +
+ tools/kvm/include/kvm/builtin-run.h | 7 +
+ tools/kvm/include/kvm/builtin-setup.h | 9 +
+ tools/kvm/include/kvm/builtin-stat.h | 7 +
+ tools/kvm/include/kvm/builtin-stop.h | 7 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 6 +
+ tools/kvm/include/kvm/cpufeature.h | 41 +
+ tools/kvm/include/kvm/disk-image.h | 73 ++
+ tools/kvm/include/kvm/e820.h | 12 +
+ tools/kvm/include/kvm/framebuffer.h | 34 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/interrupt.h | 26 +
+ tools/kvm/include/kvm/ioeventfd.h | 27 +
+ tools/kvm/include/kvm/ioport.h | 65 ++
+ tools/kvm/include/kvm/irq.h | 29 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-cpu.h | 44 +
+ tools/kvm/include/kvm/kvm.h | 108 +++
+ tools/kvm/include/kvm/mptable.h | 8 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 213 +++++
+ tools/kvm/include/kvm/pci-shmem.h | 28 +
+ tools/kvm/include/kvm/pci.h | 75 ++
+ tools/kvm/include/kvm/qcow.h | 122 +++
+ tools/kvm/include/kvm/rbtree-interval.h | 27 +
+ tools/kvm/include/kvm/read-write.h | 32 +
+ tools/kvm/include/kvm/rtc.h | 6 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 17 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 6 +
+ tools/kvm/include/kvm/symbol.h | 22 +
+ tools/kvm/include/kvm/term.h | 18 +
+ tools/kvm/include/kvm/threadpool.h | 37 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 358 ++++++++
+ tools/kvm/include/kvm/util.h | 78 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 75 ++
+ tools/kvm/include/kvm/virtio-balloon.h | 8 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 9 +
+ tools/kvm/include/kvm/virtio-net.h | 21 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 27 +
+ tools/kvm/include/kvm/virtio-pci.h | 59 ++
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio.h | 65 ++
+ tools/kvm/include/kvm/vnc.h | 14 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/kernel.h | 39 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/types.h | 50 +
+ tools/kvm/interrupt.c | 27 +
+ tools/kvm/ioeventfd.c | 128 +++
+ tools/kvm/ioport.c | 192 ++++
+ tools/kvm/irq.c | 193 ++++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 509 +++++++++++
+ tools/kvm/kvm.c | 749 +++++++++++++++
+ tools/kvm/main.c | 14 +
+ tools/kvm/mmio.c | 132 +++
+ tools/kvm/mptable.c | 284 ++++++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 +++
+ tools/kvm/net/uip/core.c | 190 ++++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 203 +++++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 317 +++++++
+ tools/kvm/net/uip/udp.c | 236 +++++
+ tools/kvm/pci.c | 169 ++++
+ tools/kvm/read-write.c | 318 +++++++
+ tools/kvm/symbol.c | 98 ++
+ tools/kvm/term.c | 170 ++++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 109 +++
+ tools/kvm/threadpool.c | 146 +++
+ tools/kvm/ui/sdl.c | 279 ++++++
+ tools/kvm/ui/vnc.c | 218 +++++
+ tools/kvm/util.c | 101 ++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 ++++++++++++
+ tools/kvm/util/rbtree-interval.c | 90 ++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 13 +
+ tools/kvm/virtio/9p-pdu.c | 287 ++++++
+ tools/kvm/virtio/9p.c | 1263 ++++++++++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 288 ++++++
+ tools/kvm/virtio/blk.c | 247 +++++
+ tools/kvm/virtio/console.c | 196 ++++
+ tools/kvm/virtio/core.c | 123 +++
+ tools/kvm/virtio/net.c | 421 +++++++++
+ tools/kvm/virtio/pci.c | 314 +++++++
+ tools/kvm/virtio/rng.c | 183 ++++
+ 179 files changed, 18059 insertions(+), 0 deletions(-)
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/bios.c
+ create mode 100644 tools/kvm/bios/.gitignore
+ create mode 100644 tools/kvm/bios/bios-rom.S
+ create mode 100644 tools/kvm/bios/e820.c
+ create mode 100644 tools/kvm/bios/entry.S
+ create mode 100644 tools/kvm/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/bios/int10.c
+ create mode 100644 tools/kvm/bios/int15.c
+ create mode 100644 tools/kvm/bios/local.S
+ create mode 100644 tools/kvm/bios/macro.S
+ create mode 100644 tools/kvm/bios/rom.ld.S
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/cpuid.c
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/assembly.h
+ create mode 100644 tools/kvm/include/kvm/barrier.h
+ create mode 100644 tools/kvm/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/include/kvm/bios.h
+ create mode 100644 tools/kvm/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/mptable.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/interrupt.c
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/irq.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/mptable.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/read-write.c
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/threadpool.c
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100644 tools/kvm/util.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+Merging scsi-post-merge/merge-base:master
+Merging c6x/for-linux-next
+$ git merge c6x/for-linux-next
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ Documentation/devicetree/bindings/c6x/clocks.txt | 40 +
+ Documentation/devicetree/bindings/c6x/dscr.txt | 127 +++
+ Documentation/devicetree/bindings/c6x/emifa.txt | 62 ++
+ .../devicetree/bindings/c6x/interrupt.txt | 104 +++
+ Documentation/devicetree/bindings/c6x/soc.txt | 28 +
+ Documentation/devicetree/bindings/c6x/timer64.txt | 26 +
+ MAINTAINERS | 8 +
+ arch/c6x/Kconfig | 174 +++++
+ arch/c6x/Makefile | 60 ++
+ arch/c6x/boot/Makefile | 30 +
+ arch/c6x/boot/dts/dsk6455.dts | 62 ++
+ arch/c6x/boot/dts/evmc6457.dts | 48 ++
+ arch/c6x/boot/dts/evmc6472.dts | 73 ++
+ arch/c6x/boot/dts/evmc6474.dts | 58 ++
+ arch/c6x/boot/dts/tms320c6455.dtsi | 96 +++
+ arch/c6x/boot/dts/tms320c6457.dtsi | 68 ++
+ arch/c6x/boot/dts/tms320c6472.dtsi | 134 ++++
+ arch/c6x/boot/dts/tms320c6474.dtsi | 89 +++
+ arch/c6x/boot/linked_dtb.S | 2 +
+ arch/c6x/configs/dsk6455_defconfig | 44 ++
+ arch/c6x/configs/evmc6457_defconfig | 41 +
+ arch/c6x/configs/evmc6472_defconfig | 42 +
+ arch/c6x/configs/evmc6474_defconfig | 42 +
+ arch/c6x/include/asm/Kbuild | 54 ++
+ arch/c6x/include/asm/asm-offsets.h | 1 +
+ arch/c6x/include/asm/bitops.h | 105 +++
+ arch/c6x/include/asm/byteorder.h | 12 +
+ arch/c6x/include/asm/cache.h | 90 +++
+ arch/c6x/include/asm/cacheflush.h | 65 ++
+ arch/c6x/include/asm/checksum.h | 34 +
+ arch/c6x/include/asm/clkdev.h | 22 +
+ arch/c6x/include/asm/clock.h | 148 ++++
+ arch/c6x/include/asm/delay.h | 67 ++
+ arch/c6x/include/asm/dma-mapping.h | 91 +++
+ arch/c6x/include/asm/dscr.h | 34 +
+ arch/c6x/include/asm/elf.h | 113 +++
+ arch/c6x/include/asm/ftrace.h | 6 +
+ arch/c6x/include/asm/hardirq.h | 20 +
+ arch/c6x/include/asm/irq.h | 302 ++++++++
+ arch/c6x/include/asm/irqflags.h | 72 ++
+ arch/c6x/include/asm/linkage.h | 30 +
+ arch/c6x/include/asm/megamod-pic.h | 9 +
+ arch/c6x/include/asm/memblock.h | 4 +
+ arch/c6x/include/asm/mmu.h | 18 +
+ arch/c6x/include/asm/module.h | 33 +
+ arch/c6x/include/asm/mutex.h | 6 +
+ arch/c6x/include/asm/page.h | 11 +
+ arch/c6x/include/asm/pgtable.h | 81 ++
+ arch/c6x/include/asm/processor.h | 132 ++++
+ arch/c6x/include/asm/procinfo.h | 28 +
+ arch/c6x/include/asm/prom.h | 1 +
+ arch/c6x/include/asm/ptrace.h | 174 +++++
+ arch/c6x/include/asm/sections.h | 12 +
+ arch/c6x/include/asm/setup.h | 32 +
+ arch/c6x/include/asm/sigcontext.h | 80 ++
+ arch/c6x/include/asm/signal.h | 17 +
+ arch/c6x/include/asm/soc.h | 35 +
+ arch/c6x/include/asm/string.h | 21 +
+ arch/c6x/include/asm/swab.h | 54 ++
+ arch/c6x/include/asm/syscall.h | 123 +++
+ arch/c6x/include/asm/syscalls.h | 55 ++
+ arch/c6x/include/asm/system.h | 168 ++++
+ arch/c6x/include/asm/thread_info.h | 121 +++
+ arch/c6x/include/asm/timer64.h | 6 +
+ arch/c6x/include/asm/timex.h | 33 +
+ arch/c6x/include/asm/tlb.h | 8 +
+ arch/c6x/include/asm/traps.h | 36 +
+ arch/c6x/include/asm/uaccess.h | 107 +++
+ arch/c6x/include/asm/unaligned.h | 170 +++++
+ arch/c6x/include/asm/unistd.h | 26 +
+ arch/c6x/kernel/Makefile | 12 +
+ arch/c6x/kernel/asm-offsets.c | 123 +++
+ arch/c6x/kernel/c6x_ksyms.c | 66 ++
+ arch/c6x/kernel/devicetree.c | 53 ++
+ arch/c6x/kernel/dma.c | 153 ++++
+ arch/c6x/kernel/entry.S | 803 ++++++++++++++++++++
+ arch/c6x/kernel/head.S | 84 ++
+ arch/c6x/kernel/irq.c | 728 ++++++++++++++++++
+ arch/c6x/kernel/module.c | 123 +++
+ arch/c6x/kernel/process.c | 263 +++++++
+ arch/c6x/kernel/ptrace.c | 187 +++++
+ arch/c6x/kernel/setup.c | 498 ++++++++++++
+ arch/c6x/kernel/signal.c | 377 +++++++++
+ arch/c6x/kernel/soc.c | 91 +++
+ arch/c6x/kernel/switch_to.S | 74 ++
+ arch/c6x/kernel/sys_c6x.c | 74 ++
+ arch/c6x/kernel/time.c | 65 ++
+ arch/c6x/kernel/traps.c | 423 ++++++++++
+ arch/c6x/kernel/vectors.S | 81 ++
+ arch/c6x/kernel/vmlinux.lds.S | 162 ++++
+ arch/c6x/lib/Makefile | 7 +
+ arch/c6x/lib/checksum.c | 36 +
+ arch/c6x/lib/csum_64plus.S | 419 ++++++++++
+ arch/c6x/lib/divi.S | 53 ++
+ arch/c6x/lib/divremi.S | 46 ++
+ arch/c6x/lib/divremu.S | 87 +++
+ arch/c6x/lib/divu.S | 98 +++
+ arch/c6x/lib/llshl.S | 37 +
+ arch/c6x/lib/llshr.S | 38 +
+ arch/c6x/lib/llshru.S | 38 +
+ arch/c6x/lib/memcpy_64plus.S | 46 ++
+ arch/c6x/lib/mpyll.S | 49 ++
+ arch/c6x/lib/negll.S | 31 +
+ arch/c6x/lib/pop_rts.S | 32 +
+ arch/c6x/lib/push_rts.S | 31 +
+ arch/c6x/lib/remi.S | 64 ++
+ arch/c6x/lib/remu.S | 82 ++
+ arch/c6x/lib/strasgi.S | 89 +++
+ arch/c6x/lib/strasgi_64plus.S | 39 +
+ arch/c6x/mm/Makefile | 5 +
+ arch/c6x/mm/dma-coherent.c | 143 ++++
+ arch/c6x/mm/init.c | 113 +++
+ arch/c6x/platforms/Kconfig | 16 +
+ arch/c6x/platforms/Makefile | 12 +
+ arch/c6x/platforms/cache.c | 445 +++++++++++
+ arch/c6x/platforms/dscr.c | 598 +++++++++++++++
+ arch/c6x/platforms/emif.c | 88 +++
+ arch/c6x/platforms/megamod-pic.c | 349 +++++++++
+ arch/c6x/platforms/platform.c | 17 +
+ arch/c6x/platforms/pll.c | 444 +++++++++++
+ arch/c6x/platforms/plldata.c | 404 ++++++++++
+ arch/c6x/platforms/timer64.c | 236 ++++++
+ include/asm-generic/io.h | 2 +-
+ include/asm-generic/page.h | 10 +-
+ include/asm-generic/uaccess.h | 7 +-
+ include/linux/elf-em.h | 1 +
+ 126 files changed, 12972 insertions(+), 5 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt
+ create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt
+ create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt
+ create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt
+ create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt
+ create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt
+ create mode 100644 arch/c6x/Kconfig
+ create mode 100644 arch/c6x/Makefile
+ create mode 100644 arch/c6x/boot/Makefile
+ create mode 100644 arch/c6x/boot/dts/dsk6455.dts
+ create mode 100644 arch/c6x/boot/dts/evmc6457.dts
+ create mode 100644 arch/c6x/boot/dts/evmc6472.dts
+ create mode 100644 arch/c6x/boot/dts/evmc6474.dts
+ create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi
+ create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi
+ create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi
+ create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi
+ create mode 100644 arch/c6x/boot/linked_dtb.S
+ create mode 100644 arch/c6x/configs/dsk6455_defconfig
+ create mode 100644 arch/c6x/configs/evmc6457_defconfig
+ create mode 100644 arch/c6x/configs/evmc6472_defconfig
+ create mode 100644 arch/c6x/configs/evmc6474_defconfig
+ create mode 100644 arch/c6x/include/asm/Kbuild
+ create mode 100644 arch/c6x/include/asm/asm-offsets.h
+ create mode 100644 arch/c6x/include/asm/bitops.h
+ create mode 100644 arch/c6x/include/asm/byteorder.h
+ create mode 100644 arch/c6x/include/asm/cache.h
+ create mode 100644 arch/c6x/include/asm/cacheflush.h
+ create mode 100644 arch/c6x/include/asm/checksum.h
+ create mode 100644 arch/c6x/include/asm/clkdev.h
+ create mode 100644 arch/c6x/include/asm/clock.h
+ create mode 100644 arch/c6x/include/asm/delay.h
+ create mode 100644 arch/c6x/include/asm/dma-mapping.h
+ create mode 100644 arch/c6x/include/asm/dscr.h
+ create mode 100644 arch/c6x/include/asm/elf.h
+ create mode 100644 arch/c6x/include/asm/ftrace.h
+ create mode 100644 arch/c6x/include/asm/hardirq.h
+ create mode 100644 arch/c6x/include/asm/irq.h
+ create mode 100644 arch/c6x/include/asm/irqflags.h
+ create mode 100644 arch/c6x/include/asm/linkage.h
+ create mode 100644 arch/c6x/include/asm/megamod-pic.h
+ create mode 100644 arch/c6x/include/asm/memblock.h
+ create mode 100644 arch/c6x/include/asm/mmu.h
+ create mode 100644 arch/c6x/include/asm/module.h
+ create mode 100644 arch/c6x/include/asm/mutex.h
+ create mode 100644 arch/c6x/include/asm/page.h
+ create mode 100644 arch/c6x/include/asm/pgtable.h
+ create mode 100644 arch/c6x/include/asm/processor.h
+ create mode 100644 arch/c6x/include/asm/procinfo.h
+ create mode 100644 arch/c6x/include/asm/prom.h
+ create mode 100644 arch/c6x/include/asm/ptrace.h
+ create mode 100644 arch/c6x/include/asm/sections.h
+ create mode 100644 arch/c6x/include/asm/setup.h
+ create mode 100644 arch/c6x/include/asm/sigcontext.h
+ create mode 100644 arch/c6x/include/asm/signal.h
+ create mode 100644 arch/c6x/include/asm/soc.h
+ create mode 100644 arch/c6x/include/asm/string.h
+ create mode 100644 arch/c6x/include/asm/swab.h
+ create mode 100644 arch/c6x/include/asm/syscall.h
+ create mode 100644 arch/c6x/include/asm/syscalls.h
+ create mode 100644 arch/c6x/include/asm/system.h
+ create mode 100644 arch/c6x/include/asm/thread_info.h
+ create mode 100644 arch/c6x/include/asm/timer64.h
+ create mode 100644 arch/c6x/include/asm/timex.h
+ create mode 100644 arch/c6x/include/asm/tlb.h
+ create mode 100644 arch/c6x/include/asm/traps.h
+ create mode 100644 arch/c6x/include/asm/uaccess.h
+ create mode 100644 arch/c6x/include/asm/unaligned.h
+ create mode 100644 arch/c6x/include/asm/unistd.h
+ create mode 100644 arch/c6x/kernel/Makefile
+ create mode 100644 arch/c6x/kernel/asm-offsets.c
+ create mode 100644 arch/c6x/kernel/c6x_ksyms.c
+ create mode 100644 arch/c6x/kernel/devicetree.c
+ create mode 100644 arch/c6x/kernel/dma.c
+ create mode 100644 arch/c6x/kernel/entry.S
+ create mode 100644 arch/c6x/kernel/head.S
+ create mode 100644 arch/c6x/kernel/irq.c
+ create mode 100644 arch/c6x/kernel/module.c
+ create mode 100644 arch/c6x/kernel/process.c
+ create mode 100644 arch/c6x/kernel/ptrace.c
+ create mode 100644 arch/c6x/kernel/setup.c
+ create mode 100644 arch/c6x/kernel/signal.c
+ create mode 100644 arch/c6x/kernel/soc.c
+ create mode 100644 arch/c6x/kernel/switch_to.S
+ create mode 100644 arch/c6x/kernel/sys_c6x.c
+ create mode 100644 arch/c6x/kernel/time.c
+ create mode 100644 arch/c6x/kernel/traps.c
+ create mode 100644 arch/c6x/kernel/vectors.S
+ create mode 100644 arch/c6x/kernel/vmlinux.lds.S
+ create mode 100644 arch/c6x/lib/Makefile
+ create mode 100644 arch/c6x/lib/checksum.c
+ create mode 100644 arch/c6x/lib/csum_64plus.S
+ create mode 100644 arch/c6x/lib/divi.S
+ create mode 100644 arch/c6x/lib/divremi.S
+ create mode 100644 arch/c6x/lib/divremu.S
+ create mode 100644 arch/c6x/lib/divu.S
+ create mode 100644 arch/c6x/lib/llshl.S
+ create mode 100644 arch/c6x/lib/llshr.S
+ create mode 100644 arch/c6x/lib/llshru.S
+ create mode 100644 arch/c6x/lib/memcpy_64plus.S
+ create mode 100644 arch/c6x/lib/mpyll.S
+ create mode 100644 arch/c6x/lib/negll.S
+ create mode 100644 arch/c6x/lib/pop_rts.S
+ create mode 100644 arch/c6x/lib/push_rts.S
+ create mode 100644 arch/c6x/lib/remi.S
+ create mode 100644 arch/c6x/lib/remu.S
+ create mode 100644 arch/c6x/lib/strasgi.S
+ create mode 100644 arch/c6x/lib/strasgi_64plus.S
+ create mode 100644 arch/c6x/mm/Makefile
+ create mode 100644 arch/c6x/mm/dma-coherent.c
+ create mode 100644 arch/c6x/mm/init.c
+ create mode 100644 arch/c6x/platforms/Kconfig
+ create mode 100644 arch/c6x/platforms/Makefile
+ create mode 100644 arch/c6x/platforms/cache.c
+ create mode 100644 arch/c6x/platforms/dscr.c
+ create mode 100644 arch/c6x/platforms/emif.c
+ create mode 100644 arch/c6x/platforms/megamod-pic.c
+ create mode 100644 arch/c6x/platforms/platform.c
+ create mode 100644 arch/c6x/platforms/pll.c
+ create mode 100644 arch/c6x/platforms/plldata.c
+ create mode 100644 arch/c6x/platforms/timer64.c
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
+From ../next
+ * [new branch] quilt/akpm -> akpm
+$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
+From ../next
+ * [new branch] quilt/akpm-base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
+Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
+Applying: drm: fix kconfig unmet dependency warning
+Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
+Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
+Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
+Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: hp_accel: Add a new PNP id
+Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
+Applying: x86: fix mmap random address range
+Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
+Applying: vrtc: change its year offset from 1960 to 1972
+Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
+Applying: mrst: battery fixes
+Applying: drivers/power/intel_mid_battery.c: fix build
+Applying: x86,mrst: add mapping for bma023
+Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
+Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
+Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
+Applying: x86: tlb flush avoid superflous leave_mm()
+Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
+Applying: arm, exec: remove redundant set_fs(USER_DS)
+Applying: audit: always follow va_copy() with va_end()
+Applying: btrfs: don't dereference extent_mapping if NULL
+Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
+Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
+Applying: ia64, exec: remove redundant set_fs(USER_DS)
+Applying: brlocks/lglocks: clean up code
+Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
+Applying: ipc/mqueue: cleanup definition names and locations
+Applying: ipc/mqueue: switch back to using non-max values on create
+Applying: ipc/mqueue: enforce hard limits
+Applying: ipc/mqueue: update maximums for the mqueue subsystem
+Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
+Applying: unicore32, exec: remove redundant set_fs(USER_DS)
+Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
+Applying: debugobjects: extend debugobjects to assert that an object is initialized
+Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
+Applying: ext4: use proper little-endian bitops
+Applying: ocfs2: avoid unaligned access to dqc_bitmap
+Applying: parisc, exec: remove redundant set_fs(USER_DS)
+Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
+Applying: scsi: fix a header to include linux/types.h
+Applying: drivers/scsi/megaraid.c: fix sparse warnings
+Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
+Applying: drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
+Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
+Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
+Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
+Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
+Applying: loop: prevent information leak after failed read
+Applying: loop: cleanup set_status interface
+Applying: loop-cleanup-set_status-interface-checkpatch-fixes
+Applying: cciss: add half second delay to PCI PM reset code
+Applying: cciss: auto engage SCSI mid layer at driver load time
+Applying: slab: add taint flag outputting to debug paths.
+Applying: slub: add taint flag outputting to debug paths
+Applying: drivers/tty/serial/pch_uart.c: add console support
+Applying: Cross Memory Attach
+Applying: cross-memory-attach-update
+Applying: cross-memory-attach-v4
+Applying: mm: compaction: trivial clean up in acct_isolated()
+Applying: mm: change isolate mode from #define to bitwise type
+Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
+Applying: mm: compaction: make isolate_lru_page() filter-aware
+Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
+Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
+Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
+Applying: mm: migration: clean up unmap_and_move()
+Applying: radix_tree: clean away saw_unset_tag leftovers
+Applying: vmscan: add block plug for page reclaim
+Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
+Applying: mm/page-writeback.c: document bdi_min_ratio
+Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
+Applying: oom: remove oom_disable_count
+Applying: oom: fix race while temporarily setting current's oom_score_adj
+Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
+Applying: mm: output a list of loaded modules when we hit bad_page()
+Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
+Applying: mm: distinguish between mlocked and pinned pages
+Applying: mm: add comments to explain mm_struct fields
+Applying: mm-add-comments-to-explain-mm_struct-fields-fix
+Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
+Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
+Applying: xfs: warn if direct reclaim tries to writeback pages
+Applying: ext4: warn if direct reclaim tries to writeback pages
+Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
+Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
+Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
+Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
+Applying: vmscan: count pages into balanced for zone with good watermark
+Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
+Applying: lib/string.c: introduce memchr_inv()
+Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
+Applying: mm/debug-pagealloc.c: use memchr_inv
+Applying: vmscan: fix initial shrinker size handling
+Applying: vmscan: use atomic-long for shrinker batching
+Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
+Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
+Applying: vmscan: promote shared file mapped pages
+Applying: vmscan: activate executable pages after first usage
+Applying: memblock: add memblock_start_of_DRAM()
+Applying: memblock: add NO_BOOTMEM config symbol
+Applying: mremap: check for overflow using deltas
+Applying: mremap: avoid sending one IPI per page
+Applying: thp: mremap support and TLB optimization
+Applying: thp-mremap-support-and-tlb-optimization-fix
+Applying: thp-mremap-support-and-tlb-optimization-fix-fix
+Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
+Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
+Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
+Applying: mm: neaten warn_alloc_failed
+Applying: mm-neaten-warn_alloc_failed-fix
+Applying: debug-pagealloc: add support for highmem pages
+Applying: debug-pagealloc-add-support-for-highmem-pages-fix
+Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
+Applying: mm: add free_hot_cold_page_list() helper
+Applying: mm/memblock.c: small function definition fixes
+Applying: mm: compaction: compact unevictable pages
+Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
+Applying: mm: compaction: accounting fix
+Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
+Applying: mm: fix page-faults detection in swap-token logic
+Applying: mm/vmalloc.c: report more vmalloc failures
+Applying: mm: add extra free kbytes tunable
+Applying: mm-add-extra-free-kbytes-tunable-update
+Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
+Applying: mm: thp: tail page refcounting fix
+Applying: thp-tail-page-refcounting-fix-6
+Applying: ksm: fix the comment of try_to_unmap_one()
+Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
+Applying: vmscan: fix shrinker callback bug in fs/super.c
+Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
+Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
+Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
+Applying: HWPOISON: convert pr_debug()s to pr_info()s
+Applying: mm: compaction: make compact_zone_order() static
+Applying: mm: fix kunmap_high() comment
+Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
+Applying: mm: disable user interface to manually rescue unevictable pages
+Applying: mm/memblock.c: quiet sparse noise
+Applying: mm/thrash.c: quiet sparse noise
+Applying: mm/mempolicy.c: quiet sparse noise
+Applying: mm/huge_memory.c: quiet sparse noise
+Applying: vmscan: add barrier to prevent evictable page in unevictable list
+Applying: selinuxfs: remove custom hex_to_bin()
+Applying: include/linux/security.h: fix security_inode_init_security() arg
+Applying: hpet: factor timer allocate from open
+Applying: alpha: wire up accept4 syscall
+Applying: alpha: wire up sendmmsg syscall
+Applying: intel_idle: fix API misuse
+Applying: intel_idle: disable auto_demotion for hotplugged CPUs
+Applying: fs/pipe.c: add ->statfs callback for pipefs
+Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
+Applying: hwmon: convert idr to ida and use ida_simple interface
+Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
+Applying: lis3lv02d: avoid divide by zero due to unchecked
+Applying: lis3: update maintainer information
+Applying: lis3: add support for HP EliteBook 2730p
+Applying: lis3: add support for HP EliteBook 8540w
+Applying: hp_accel: add HP ProBook 655x
+Applying: lis3: free regulators if probe() fails
+Applying: lis3: use consistent naming of variables
+Applying: lis3: change exported function to use passed parameter
+Applying: lis3: remove the references to the global variable in core driver
+Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
+Applying: lis3lv02d: make regulator API usage unconditional
+Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
+Applying: stop_machine: make stop_machine safe and efficient to call early
+Applying: stop_machine-make-stop_machine-safe-and-efficient-to-call-early-v3.
+Applying: watchdog: move watchdog_*_all_cpus under CONFIG_SYSCTL
+Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
+Applying: dynamic_debug: remove num_enabled accounting
+Applying: dynamic_debug: use a single printk() to emit messages
+Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
+Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
+Applying: printk: add ignore_loglevel as module parameter
+Applying: printk: add console_suspend module parameter
+Applying: printk: fix bounds checking for log_prefix
+Applying: printk: remove bounds checking for log_prefix
+Applying: treewide: use __printf not __attribute__((format(printf,...)))
+Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
+Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
+Applying: fs/namei.c: remove unused getname_flags()
+Applying: poll: add poll_requested_events() function
+Applying: MAINTAINERS: add new entry for ideapad-laptop
+Applying: video/backlight: remove obsolete cleanup for clientdata
+Applying: backlight: fix broken regulator API usage in l4f00242t03
+Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
+Applying: backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity()
+Applying: leds: Renesas TPU LED driver
+Applying: leds-renesas-tpu-led-driver-v2-fix
+Applying: drivers/leds/led-triggers.c: fix memory leak
+Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
+Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
+Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
+Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
+Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
+Applying: lib/spinlock_debug.c: print owner on spinlock lockup
+Applying: lib/bitmap.c: quiet sparse noise about address space
+Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
+Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
+Applying: lib/idr.c: fix comment for ida_get_new_above()
+Applying: llist: using in_nmi requires including hardirq.h
+Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
+Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
+Applying: lib/crc: add slice by 8 algorithm to crc32.c
+Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
+Applying: epoll: fix spurious lockdep warnings
+Applying: epoll: limit paths
+Applying: binfmt_elf: fix PIE execution with randomization disabled
+Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
+Applying: oprofilefs: handle zero-length writes
+Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
+Applying: rtc: add initial support for mcp7941x parts
+Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
+Applying: minix: describe usage of different magic numbers
+Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
+Applying: cgroups: don't attach task to subsystem if migration failed
+Applying: cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
+Applying: cgroups: add res_counter_write_u64() API
+Applying: cgroups: new resource counter inheritance API
+Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
+Applying: cgroups: new cancel_attach_task() subsystem callback
+Applying: cgroups: ability to stop res charge propagation on bounded ancestor
+Applying: cgroups: add res counter common ancestor searching
+Applying: res_counter: allow charge failure pointer to be null
+Applying: cgroups: pull up res counter charge failure interpretation to caller
+Applying: cgroups: allow subsystems to cancel a fork
+Applying: cgroups: add a task counter subsystem
+Applying: memcg: rename mem variable to memcg
+Applying: memcg: fix oom schedule_timeout()
+Applying: memcg: replace ss->id_lock with a rwlock
+Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
+Applying: memcg: skip scanning active lists based on individual size
+Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
+Applying: memcg: close race between charge and putback
+Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
+Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
+Applying: procfs: report EISDIR when reading sysctl dirs in proc
+Applying: proc: fix races against execve() of /proc/PID/fd**
+Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
+Applying: proc: force dcache drop on unauthorized access
+Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
+Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
+Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
+Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
+Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
+Applying: RapidIO: add mport driver for Tsi721 bridge
+Applying: RapidIO: Tsi721 driver - fixes for the initial release
+Applying: RapidIO: fix potential null deref in rio_setup_device()
+Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
+Applying: sysctl: add support for poll()
+Applying: sysctl-add-support-for-poll-fix
+Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
+Applying: pps: default echo function
+Applying: pps: new client driver using GPIO
+Applying: pps-new-client-driver-using-gpio-fix
+Applying: pps gpio client: add missing dependency
+Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
+Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
+Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
+Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
+Applying: drivers/w1/w1_int.c: multiple masters used same init_name
+Applying: aio: allocate kiocbs in batches
+Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
+Applying: dio: separate fields only used in the submission path from struct dio
+Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
+Applying: dio: fix a wrong comment
+Applying: dio: rearrange fields in dio/dio_submit to avoid holes
+Applying: dio: use a slab cache for struct dio
+Applying: dio: separate map_bh from dio
+Applying: dio: inline the complete submission path
+Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
+Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
+Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
+Applying: dio: remove unnecessary dio argument from dio_pages_present()
+Applying: dio: remove unused dio parameter from dio_bio_add_page()
+Applying: vfs: cache request_queue in struct block_device
+Applying: dio: optimize cache misses in the submission path
+Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
+Applying: dio: using prefetch requires including prefetch.h
+Applying: ipc/mqueue: vlammoc requires vmalloc.h
+Applying: cgroups: ERR_PTR needs err.h
+Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm
+From ../rebase-tmp
+ + e086d6f...780ceed akpm -> akpm (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm
+$ git merge --no-ff akpm
+Merge made by recursive.
+ Documentation/DocBook/debugobjects.tmpl | 50 +
+ Documentation/blockdev/cciss.txt | 14 +-
+ Documentation/cgroups/cgroups.txt | 13 +-
+ Documentation/cgroups/memory.txt | 1 -
+ Documentation/cgroups/resource_counter.txt | 20 +-
+ Documentation/cgroups/task_counter.txt | 153 ++
+ Documentation/feature-removal-schedule.txt | 35 -
+ Documentation/kernel-parameters.txt | 8 +
+ Documentation/rapidio/tsi721.txt | 49 +
+ Documentation/sysctl/vm.txt | 16 +
+ .../trace/postprocess/trace-vmscan-postprocess.pl | 8 +-
+ MAINTAINERS | 8 +
+ arch/alpha/boot/misc.c | 3 +-
+ arch/alpha/include/asm/console.h | 3 +-
+ arch/alpha/include/asm/unistd.h | 4 +-
+ arch/alpha/kernel/systbls.S | 2 +
+ arch/arm/include/asm/processor.h | 1 -
+ arch/arm/mach-imx/mach-mx27_3ds.c | 6 +-
+ arch/arm/mach-imx/mach-mx31_3ds.c | 6 +-
+ arch/arm/mach-ux500/mbox-db5500.c | 2 +-
+ arch/frv/include/asm/system.h | 2 +-
+ arch/ia64/include/asm/mca.h | 3 +-
+ arch/ia64/include/asm/processor.h | 1 -
+ arch/m68k/include/asm/natfeat.h | 3 +-
+ arch/mn10300/include/asm/gdb-stub.h | 5 +-
+ arch/parisc/include/asm/processor.h | 2 -
+ arch/parisc/kernel/process.c | 1 -
+ arch/powerpc/include/asm/systbl.h | 2 +
+ arch/powerpc/include/asm/udbg.h | 3 +-
+ arch/powerpc/include/asm/unistd.h | 4 +-
+ arch/powerpc/mm/gup.c | 5 +-
+ arch/powerpc/sysdev/fsl_rio.c | 1 +
+ arch/s390/include/asm/debug.h | 11 +-
+ arch/um/include/shared/user.h | 8 +-
+ arch/unicore32/include/asm/processor.h | 1 -
+ arch/x86/ia32/ia32entry.S | 2 +
+ arch/x86/include/asm/mrst.h | 9 +
+ arch/x86/include/asm/unistd_32.h | 4 +-
+ arch/x86/include/asm/unistd_64.h | 4 +
+ arch/x86/kernel/e820.c | 59 +-
+ arch/x86/kernel/ptrace.c | 3 +-
+ arch/x86/kernel/rtc.c | 5 +
+ arch/x86/kernel/syscall_table_32.S | 2 +
+ arch/x86/mm/gup.c | 5 +-
+ arch/x86/mm/highmem_32.c | 2 +
+ arch/x86/mm/mmap.c | 4 +-
+ arch/x86/mm/pageattr.c | 2 +-
+ arch/x86/mm/tlb.c | 16 +-
+ arch/x86/platform/iris/iris.c | 67 +-
+ arch/x86/platform/mrst/mrst.c | 1 +
+ arch/x86/platform/mrst/vrtc.c | 4 +-
+ block/blk-cgroup.c | 12 +-
+ drivers/block/cciss.c | 3 +-
+ drivers/block/cciss_scsi.c | 1 +
+ drivers/block/loop.c | 47 +-
+ drivers/char/hpet.c | 56 +-
+ drivers/edac/mpc85xx_edac.c | 2 +-
+ drivers/firmware/dmi_scan.c | 6 +-
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/vga/vgaarb.c | 18 +-
+ drivers/hwmon/hwmon.c | 32 +-
+ drivers/hwmon/ibmaem.c | 47 +-
+ drivers/idle/intel_idle.c | 59 +-
+ drivers/infiniband/core/umem.c | 6 +-
+ drivers/infiniband/hw/ipath/ipath_user_pages.c | 6 +-
+ drivers/infiniband/hw/qib/qib_user_pages.c | 4 +-
+ drivers/isdn/hisax/callc.c | 4 +-
+ drivers/isdn/hisax/hisax.h | 4 +-
+ drivers/isdn/hisax/isdnl1.h | 2 +-
+ drivers/isdn/hisax/isdnl3.c | 2 +-
+ drivers/isdn/hisax/st5481_d.c | 4 +-
+ drivers/leds/Kconfig | 12 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/led-triggers.c | 5 +-
+ drivers/leds/leds-gpio.c | 2 +-
+ drivers/leds/leds-lm3530.c | 1 -
+ drivers/leds/leds-renesas-tpu.c | 357 +++
+ drivers/message/fusion/mptbase.c | 7 +-
+ drivers/message/fusion/mptbase.h | 1 +
+ drivers/misc/fsa9480.c | 3 +-
+ drivers/misc/lis3lv02d/lis3lv02d.c | 389 ++--
+ drivers/misc/lis3lv02d/lis3lv02d.h | 9 +-
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 45 +-
+ drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +-
+ drivers/net/ethernet/i825xx/3c505.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 -
+ drivers/net/rionet.c | 4 +-
+ drivers/net/wireless/ath/ath.h | 5 +-
+ drivers/net/wireless/ath/ath5k/debug.h | 4 +-
+ drivers/net/wireless/ath/ath6kl/debug.h | 4 +-
+ drivers/net/wireless/b43/b43.h | 12 +-
+ drivers/net/wireless/b43legacy/b43legacy.h | 16 +-
+ drivers/oprofile/oprofilefs.c | 5 +-
+ drivers/platform/x86/acerhdf.c | 1 +
+ drivers/platform/x86/hp_accel.c | 15 +-
+ drivers/power/ds2780_battery.c | 86 +-
+ drivers/power/intel_mid_battery.c | 12 +-
+ drivers/pps/clients/Kconfig | 9 +
+ drivers/pps/clients/Makefile | 1 +
+ drivers/pps/clients/pps-gpio.c | 227 ++
+ drivers/pps/clients/pps-ktimer.c | 12 -
+ drivers/pps/clients/pps_parport.c | 9 -
+ drivers/pps/kapi.c | 20 +-
+ drivers/rapidio/Kconfig | 6 +-
+ drivers/rapidio/Makefile | 1 +
+ drivers/rapidio/devices/Kconfig | 10 +
+ drivers/rapidio/devices/Makefile | 5 +
+ drivers/rapidio/devices/tsi721.c | 2360 ++++++++++++++++++++
+ drivers/rapidio/devices/tsi721.h | 766 +++++++
+ drivers/rapidio/rio-scan.c | 6 +-
+ drivers/rtc/class.c | 32 +-
+ drivers/rtc/rtc-ds1307.c | 27 +
+ drivers/rtc/rtc-mc13xxx.c | 6 +-
+ drivers/rtc/rtc-mrst.c | 19 +-
+ drivers/scsi/aacraid/commctrl.c | 1 +
+ drivers/scsi/megaraid.c | 8 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +-
+ drivers/scsi/osd/osd_uld.c | 22 +-
+ drivers/scsi/sd.c | 32 +-
+ drivers/scsi/sg.c | 25 +-
+ drivers/staging/iio/trigger.h | 3 +-
+ drivers/tty/serial/Kconfig | 9 +
+ drivers/tty/serial/pch_uart.c | 160 ++-
+ drivers/video/backlight/adp8870_bl.c | 2 -
+ drivers/video/backlight/generic_bl.c | 4 +-
+ drivers/video/backlight/l4f00242t03.c | 70 +-
+ drivers/w1/slaves/w1_ds2760.c | 48 +-
+ drivers/w1/slaves/w1_ds2780.c | 96 +-
+ drivers/w1/slaves/w1_ds2780.h | 2 +
+ drivers/w1/w1_int.c | 1 +
+ fs/Kconfig | 2 +-
+ fs/aio.c | 140 +-
+ fs/binfmt_elf.c | 11 +-
+ fs/block_dev.c | 3 +
+ fs/btrfs/inode.c | 3 +-
+ fs/buffer.c | 5 +-
+ fs/compat.c | 7 +-
+ fs/dcache.c | 10 +-
+ fs/direct-io.c | 690 +++---
+ fs/ecryptfs/ecryptfs_kernel.h | 2 +-
+ fs/eventpoll.c | 270 ++-
+ fs/exec.c | 4 -
+ fs/ext2/ext2.h | 8 +-
+ fs/ext4/ext4.h | 51 +-
+ fs/ext4/ialloc.c | 4 +-
+ fs/ext4/inode.c | 6 +-
+ fs/fat/fat.h | 9 +-
+ fs/file_table.c | 23 +-
+ fs/gfs2/glock.h | 2 +-
+ fs/hpfs/hpfs_fn.h | 4 +-
+ fs/internal.h | 3 +-
+ fs/logfs/logfs.h | 1 -
+ fs/logfs/super.c | 22 -
+ fs/namei.c | 45 +-
+ fs/namespace.c | 124 +-
+ fs/nilfs2/nilfs.h | 8 +-
+ fs/ntfs/debug.h | 15 +-
+ fs/ocfs2/ocfs2.h | 47 +
+ fs/ocfs2/quota_local.c | 10 +-
+ fs/ocfs2/super.h | 14 +-
+ fs/partitions/ldm.c | 16 +-
+ fs/pipe.c | 1 +
+ fs/pnode.c | 4 +-
+ fs/proc/base.c | 127 +-
+ fs/proc/proc_sysctl.c | 46 +
+ fs/proc/task_mmu.c | 2 +
+ fs/read_write.c | 8 +-
+ fs/select.c | 38 +-
+ fs/stat.c | 5 +-
+ fs/super.c | 2 +-
+ fs/udf/udfdecl.h | 4 +-
+ fs/ufs/ufs.h | 9 +-
+ fs/xfs/xfs_aops.c | 8 +-
+ fs/xfs/xfs_message.h | 42 +-
+ include/asm-generic/bug.h | 11 +-
+ include/asm-generic/page.h | 4 +-
+ include/drm/drmP.h | 10 +-
+ include/linux/aio.h | 1 +
+ include/linux/audit.h | 11 +-
+ include/linux/bio.h | 6 +-
+ include/linux/blktrace_api.h | 2 +-
+ include/linux/cgroup.h | 30 +-
+ include/linux/cgroup_subsys.h | 8 +
+ include/linux/compaction.h | 8 -
+ include/linux/compat.h | 3 +-
+ include/linux/debugobjects.h | 6 +
+ include/linux/device.h | 110 +-
+ include/linux/dmar.h | 2 +
+ include/linux/dynamic_debug.h | 85 +-
+ include/linux/eventpoll.h | 1 +
+ include/linux/ext3_fs.h | 16 +-
+ include/linux/fs.h | 16 +-
+ include/linux/fscache-cache.h | 8 +-
+ include/linux/gameport.h | 8 +-
+ include/linux/gfp.h | 1 +
+ include/linux/hpet.h | 1 +
+ include/linux/huge_mm.h | 5 +
+ include/linux/ipc_namespace.h | 40 +-
+ include/linux/kallsyms.h | 5 +-
+ include/linux/kdb.h | 9 +-
+ include/linux/kernel.h | 48 +-
+ include/linux/kexec.h | 4 +-
+ include/linux/kmod.h | 4 +-
+ include/linux/kobject.h | 26 +-
+ include/linux/kthread.h | 4 +-
+ include/linux/lglock.h | 152 +--
+ include/linux/libata.h | 18 +-
+ include/linux/lis3lv02d.h | 1 -
+ include/linux/llist.h | 4 +-
+ include/linux/magic.h | 10 +-
+ include/linux/memblock.h | 1 +
+ include/linux/memcontrol.h | 47 +-
+ include/linux/mm.h | 60 +-
+ include/linux/mm_types.h | 36 +-
+ include/linux/mmiotrace.h | 8 +-
+ include/linux/mmzone.h | 17 +-
+ include/linux/namei.h | 1 +
+ include/linux/netdevice.h | 34 +-
+ include/linux/oom.h | 1 +
+ include/linux/platform_data/leds-renesas-tpu.h | 14 +
+ include/linux/poll.h | 7 +-
+ include/linux/pps-gpio.h | 32 +
+ include/linux/printk.h | 12 +-
+ include/linux/quotaops.h | 2 +-
+ include/linux/res_counter.h | 27 +-
+ include/linux/rio_ids.h | 1 +
+ include/linux/security.h | 2 +-
+ include/linux/seq_file.h | 3 +-
+ include/linux/shrinker.h | 3 +-
+ include/linux/spi/l4f00242t03.h | 2 -
+ include/linux/string.h | 1 +
+ include/linux/swap.h | 43 +-
+ include/linux/syscalls.h | 13 +
+ include/linux/sysctl.h | 22 +
+ include/linux/trace_seq.h | 8 +-
+ include/linux/utsname.h | 16 +
+ include/linux/vmalloc.h | 1 +
+ include/linux/writeback.h | 2 -
+ include/net/bluetooth/bluetooth.h | 2 +-
+ include/net/netfilter/nf_log.h | 3 +-
+ include/net/sock.h | 4 +-
+ include/scsi/scsi_netlink.h | 2 +-
+ include/sound/core.h | 4 +-
+ include/sound/info.h | 4 +-
+ include/sound/seq_kernel.h | 4 +-
+ include/trace/events/vmscan.h | 8 +-
+ include/xen/hvc-console.h | 4 +-
+ include/xen/xenbus.h | 12 +-
+ init/Kconfig | 13 +-
+ init/do_mounts.c | 48 +-
+ init/do_mounts_rd.c | 14 +
+ ipc/mq_sysctl.c | 31 +-
+ ipc/mqueue.c | 24 +-
+ ipc/shm.c | 2 +-
+ kernel/Makefile | 3 +-
+ kernel/audit.c | 5 +-
+ kernel/cgroup.c | 93 +-
+ kernel/cgroup_freezer.c | 9 +-
+ kernel/cgroup_task_counter.c | 240 ++
+ kernel/cpuset.c | 15 +-
+ kernel/events/core.c | 11 +-
+ kernel/exit.c | 4 +-
+ kernel/fork.c | 18 +-
+ kernel/lglock.c | 101 +
+ kernel/printk.c | 10 +-
+ kernel/res_counter.c | 97 +-
+ kernel/sched.c | 6 +-
+ kernel/stop_machine.c | 22 +
+ kernel/sys.c | 2 +
+ kernel/sys_ni.c | 4 +
+ kernel/sysctl.c | 11 +-
+ kernel/timer.c | 54 +-
+ kernel/utsname_sysctl.c | 23 +
+ kernel/watchdog.c | 4 +-
+ lib/Kconfig.debug | 5 +-
+ lib/bitmap.c | 10 +-
+ lib/crc32.c | 370 +++-
+ lib/crc32defs.h | 16 +-
+ lib/debugobjects.c | 33 +
+ lib/dynamic_debug.c | 91 +-
+ lib/gen_crc32table.c | 59 +-
+ lib/idr.c | 4 +-
+ lib/kstrtox.c | 75 +-
+ lib/kstrtox.h | 8 +
+ lib/percpu_counter.c | 2 +
+ lib/radix-tree.c | 10 +-
+ lib/spinlock_debug.c | 19 +-
+ lib/string.c | 54 +
+ lib/vsprintf.c | 33 +-
+ mm/Kconfig | 3 +
+ mm/Makefile | 3 +-
+ mm/backing-dev.c | 5 +-
+ mm/compaction.c | 37 +-
+ mm/debug-pagealloc.c | 56 +-
+ mm/filemap.c | 3 +
+ mm/highmem.c | 2 +-
+ mm/huge_memory.c | 87 +-
+ mm/internal.h | 46 +
+ mm/ksm.c | 3 +-
+ mm/memblock.c | 11 +-
+ mm/memcontrol.c | 1009 +++++-----
+ mm/memory-failure.c | 12 +-
+ mm/memory.c | 15 +-
+ mm/mempolicy.c | 2 +-
+ mm/migrate.c | 75 +-
+ mm/mmap.c | 9 +-
+ mm/mremap.c | 42 +-
+ mm/oom_kill.c | 47 +-
+ mm/page-writeback.c | 126 +-
+ mm/page_alloc.c | 66 +-
+ mm/page_cgroup.c | 7 +-
+ mm/process_vm_access.c | 496 ++++
+ mm/rmap.c | 5 +-
+ mm/shmem.c | 6 +
+ mm/slab.c | 9 +-
+ mm/slub.c | 49 +-
+ mm/swap.c | 97 +-
+ mm/swapfile.c | 2 +-
+ mm/thrash.c | 2 +-
+ mm/vmalloc.c | 80 +-
+ mm/vmscan.c | 360 ++--
+ mm/vmstat.c | 1 +
+ net/netfilter/nf_conntrack_netlink.c | 5 +
+ net/nfc/nfc.h | 2 +-
+ net/rds/rds.h | 8 +-
+ net/sunrpc/svc.c | 5 +-
+ scripts/checkpatch.pl | 6 +-
+ security/keys/compat.c | 2 +-
+ security/keys/keyctl.c | 2 +-
+ security/selinux/selinuxfs.c | 14 +-
+ sound/firewire/cmp.c | 2 +-
+ 332 files changed, 9925 insertions(+), 3513 deletions(-)
+ create mode 100644 Documentation/cgroups/task_counter.txt
+ create mode 100644 Documentation/rapidio/tsi721.txt
+ create mode 100644 drivers/leds/leds-renesas-tpu.c
+ create mode 100644 drivers/pps/clients/pps-gpio.c
+ create mode 100644 drivers/rapidio/devices/Kconfig
+ create mode 100644 drivers/rapidio/devices/Makefile
+ create mode 100644 drivers/rapidio/devices/tsi721.c
+ create mode 100644 drivers/rapidio/devices/tsi721.h
+ create mode 100644 include/linux/platform_data/leds-renesas-tpu.h
+ create mode 100644 include/linux/pps-gpio.h
+ create mode 100644 kernel/cgroup_task_counter.c
+ create mode 100644 kernel/lglock.c
+ create mode 100644 lib/kstrtox.h
+ create mode 100644 mm/process_vm_access.c
projects / karo-tx-linux.git / commitdiff