Merge git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 22:00:56 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 22:00:56 +0000 (15:00 -0700)
* git://github.com/rustyrussell/linux:
  virtio-blk: use ida to allocate disk index
  virtio: Add platform bus driver for memory mapped virtio device
  virtio: Dont add "config" to list for !per_vq_vector
  virtio: console: wait for first console port for early console output
  virtio: console: add port stats for bytes received, sent and discarded
  virtio: console: make discard_port_data() use get_inbuf()
  virtio: console: rename variable
  virtio: console: make get_inbuf() return port->inbuf if present
  virtio: console: Fix return type for get_inbuf()
  virtio: console: Use wait_event_freezable instead of _interruptible
  virtio: console: Ignore port name update request if name already set
  virtio: console: Fix indentation
  virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx
  virtio.h: correct comment for struct virtio_driver
  virtio-net: Use virtio_config_val() for retrieving config
  virtio_config: Add virtio_config_val_len()
  virtio-console: Use virtio_config_val() for retrieving config

1072 files changed:
Documentation/devicetree/bindings/arm/calxeda.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/fsl.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/gic.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/omap/dsp.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/omap/iva.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/omap/l3-noc.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/omap/mpu.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/omap/omap.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/picoxcell.txt [new file with mode: 0644]
Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt [new file with mode: 0644]
Documentation/devicetree/bindings/tty/serial/msm_serial.txt [new file with mode: 0644]
Documentation/filesystems/Locking
Documentation/filesystems/ext3.txt
Documentation/filesystems/ext4.txt
Documentation/virtual/uml/UserModeLinux-HOWTO.txt
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/Makefile
arch/arm/boot/dts/at91sam9g20.dtsi [new file with mode: 0644]
arch/arm/boot/dts/at91sam9g45.dtsi [new file with mode: 0644]
arch/arm/boot/dts/at91sam9m10g45ek.dts [new file with mode: 0644]
arch/arm/boot/dts/highbank.dts [new file with mode: 0644]
arch/arm/boot/dts/imx51-babbage.dts [new file with mode: 0644]
arch/arm/boot/dts/imx51.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx53-ard.dts [new file with mode: 0644]
arch/arm/boot/dts/imx53-evk.dts [new file with mode: 0644]
arch/arm/boot/dts/imx53-qsb.dts [new file with mode: 0644]
arch/arm/boot/dts/imx53-smd.dts [new file with mode: 0644]
arch/arm/boot/dts/imx53.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx6q-sabreauto.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6q.dtsi [new file with mode: 0644]
arch/arm/boot/dts/msm8660-surf.dts [new file with mode: 0644]
arch/arm/boot/dts/omap3-beagle.dts [new file with mode: 0644]
arch/arm/boot/dts/omap3.dtsi [new file with mode: 0644]
arch/arm/boot/dts/omap4-panda.dts [new file with mode: 0644]
arch/arm/boot/dts/omap4-sdp.dts [new file with mode: 0644]
arch/arm/boot/dts/omap4.dtsi [new file with mode: 0644]
arch/arm/boot/dts/picoxcell-pc3x2.dtsi [new file with mode: 0644]
arch/arm/boot/dts/picoxcell-pc3x3.dtsi [new file with mode: 0644]
arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts [new file with mode: 0644]
arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts [new file with mode: 0644]
arch/arm/boot/dts/prima2-cb.dts
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-seaboard.dts
arch/arm/boot/dts/tegra-ventana.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/usb_a9g20.dts [new file with mode: 0644]
arch/arm/common/Kconfig
arch/arm/common/gic.c
arch/arm/configs/at91sam9g45_defconfig [new file with mode: 0644]
arch/arm/configs/exynos4_defconfig
arch/arm/configs/imx_v4_v5_defconfig [moved from arch/arm/configs/mx27_defconfig with 69% similarity]
arch/arm/configs/mx1_defconfig [deleted file]
arch/arm/configs/mx21_defconfig [deleted file]
arch/arm/configs/mx3_defconfig
arch/arm/configs/mx5_defconfig [moved from arch/arm/configs/mx51_defconfig with 82% similarity]
arch/arm/configs/mxs_defconfig
arch/arm/configs/tegra_defconfig
arch/arm/include/asm/device.h
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/include/asm/hardware/gic.h
arch/arm/include/asm/hardware/it8152.h
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/Makefile.boot
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91rm9200.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/board-dt.c [new file with mode: 0644]
arch/arm/mach-at91/board-rsi-ews.c [new file with mode: 0644]
arch/arm/mach-at91/board-usb-a9260.c [deleted file]
arch/arm/mach-at91/board-usb-a926x.c [moved from arch/arm/mach-at91/board-usb-a9263.c with 54% similarity]
arch/arm/mach-at91/include/mach/board.h
arch/arm/mach-at91/include/mach/timex.h
arch/arm/mach-davinci/Kconfig
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/da850.c
arch/arm/mach-davinci/devices-da8xx.c
arch/arm/mach-davinci/devices-tnetv107x.c
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm644x.c
arch/arm/mach-davinci/dm646x.c
arch/arm/mach-davinci/dma.c
arch/arm/mach-davinci/include/mach/mmc.h
arch/arm/mach-davinci/include/mach/mux.h
arch/arm/mach-ep93xx/Kconfig
arch/arm/mach-ep93xx/Makefile
arch/arm/mach-ep93xx/vision_ep9307.c [new file with mode: 0644]
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile
arch/arm/mach-exynos4/clock-exynos4210.c [new file with mode: 0644]
arch/arm/mach-exynos4/clock-exynos4212.c [new file with mode: 0644]
arch/arm/mach-exynos4/clock.c
arch/arm/mach-exynos4/cpu.c
arch/arm/mach-exynos4/hotplug.c
arch/arm/mach-exynos4/include/mach/entry-macro.S
arch/arm/mach-exynos4/include/mach/exynos4-clock.h [new file with mode: 0644]
arch/arm/mach-exynos4/include/mach/irqs.h
arch/arm/mach-exynos4/include/mach/map.h
arch/arm/mach-exynos4/include/mach/regs-clock.h
arch/arm/mach-exynos4/include/mach/regs-mct.h
arch/arm/mach-exynos4/mach-origen.c [new file with mode: 0644]
arch/arm/mach-exynos4/mach-smdk4x12.c [new file with mode: 0644]
arch/arm/mach-exynos4/mach-smdkc210.c [deleted file]
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/mct.c
arch/arm/mach-exynos4/platsmp.c
arch/arm/mach-exynos4/pm.c
arch/arm/mach-highbank/Makefile [new file with mode: 0644]
arch/arm/mach-highbank/Makefile.boot [new file with mode: 0644]
arch/arm/mach-highbank/clock.c [new file with mode: 0644]
arch/arm/mach-highbank/core.h [new file with mode: 0644]
arch/arm/mach-highbank/highbank.c [new file with mode: 0644]
arch/arm/mach-highbank/hotplug.c [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/debug-macro.S [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/entry-macro.S [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/gpio.h [moved from arch/um/include/asm/ftrace.h with 100% similarity]
arch/arm/mach-highbank/include/mach/io.h [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/irqs.h [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/memory.h [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/system.h [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/timex.h [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/uncompress.h [new file with mode: 0644]
arch/arm/mach-highbank/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-highbank/lluart.c [new file with mode: 0644]
arch/arm/mach-highbank/localtimer.c [new file with mode: 0644]
arch/arm/mach-highbank/platsmp.c [new file with mode: 0644]
arch/arm/mach-highbank/pm.c [new file with mode: 0644]
arch/arm/mach-highbank/sysregs.h [new file with mode: 0644]
arch/arm/mach-highbank/system.c [new file with mode: 0644]
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/Makefile.boot
arch/arm/mach-imx/cache-l2x0.c [deleted file]
arch/arm/mach-imx/clock-imx25.c
arch/arm/mach-imx/clock-imx27.c
arch/arm/mach-imx/clock-imx31.c
arch/arm/mach-imx/clock-imx35.c
arch/arm/mach-imx/clock-imx6q.c [new file with mode: 0644]
arch/arm/mach-imx/cpu-imx25.c [new file with mode: 0644]
arch/arm/mach-imx/cpu-imx27.c
arch/arm/mach-imx/cpu-imx31.c
arch/arm/mach-imx/cpu-imx35.c
arch/arm/mach-imx/devices-imx27.h
arch/arm/mach-imx/devices-imx31.h
arch/arm/mach-imx/devices-imx35.h
arch/arm/mach-imx/gpc.c [new file with mode: 0644]
arch/arm/mach-imx/head-v7.S [new file with mode: 0644]
arch/arm/mach-imx/hotplug.c [new file with mode: 0644]
arch/arm/mach-imx/lluart.c [new file with mode: 0644]
arch/arm/mach-imx/localtimer.c [new file with mode: 0644]
arch/arm/mach-imx/mach-apf9328.c
arch/arm/mach-imx/mach-armadillo5x0.c
arch/arm/mach-imx/mach-bug.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-imx/mach-imx27ipcam.c
arch/arm/mach-imx/mach-imx27lite.c
arch/arm/mach-imx/mach-imx6q.c [new file with mode: 0644]
arch/arm/mach-imx/mach-kzm_arm11_01.c
arch/arm/mach-imx/mach-mx1ads.c
arch/arm/mach-imx/mach-mx21ads.c
arch/arm/mach-imx/mach-mx25_3ds.c
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-mx31ads.c
arch/arm/mach-imx/mach-mx31lilly.c
arch/arm/mach-imx/mach-mx31lite.c
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-imx/mach-mx35_3ds.c
arch/arm/mach-imx/mach-mxt_td60.c
arch/arm/mach-imx/mach-pca100.c
arch/arm/mach-imx/mach-pcm037.c
arch/arm/mach-imx/mach-pcm038.c
arch/arm/mach-imx/mach-pcm043.c
arch/arm/mach-imx/mach-qong.c
arch/arm/mach-imx/mach-scb9328.c
arch/arm/mach-imx/mach-vpr200.c
arch/arm/mach-imx/mm-imx3.c [new file with mode: 0644]
arch/arm/mach-imx/mm-imx31.c [deleted file]
arch/arm/mach-imx/mm-imx35.c [deleted file]
arch/arm/mach-imx/mmdc.c [new file with mode: 0644]
arch/arm/mach-imx/platsmp.c [new file with mode: 0644]
arch/arm/mach-imx/pm-imx27.c
arch/arm/mach-imx/pm-imx6q.c [new file with mode: 0644]
arch/arm/mach-imx/src.c [new file with mode: 0644]
arch/arm/mach-ixp4xx/Kconfig
arch/arm/mach-ixp4xx/Makefile
arch/arm/mach-ixp4xx/include/mach/uncompress.h
arch/arm/mach-ixp4xx/miccpt-pci.c [new file with mode: 0644]
arch/arm/mach-ixp4xx/omixp-setup.c [new file with mode: 0644]
arch/arm/mach-mmp/Kconfig
arch/arm/mach-mmp/Makefile
arch/arm/mach-mmp/clock.h
arch/arm/mach-mmp/common.c
arch/arm/mach-mmp/gplugd.c
arch/arm/mach-mmp/include/mach/addr-map.h
arch/arm/mach-mmp/include/mach/gpio-pxa.h
arch/arm/mach-mmp/mmp2.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-msm/hotplug.c
arch/arm/mach-msm/platsmp.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/board-cpuimx51.c
arch/arm/mach-mx5/board-cpuimx51sd.c
arch/arm/mach-mx5/board-mx50_rdp.c
arch/arm/mach-mx5/board-mx51_3ds.c
arch/arm/mach-mx5/board-mx51_babbage.c
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-mx5/board-mx53_ard.c
arch/arm/mach-mx5/board-mx53_evk.c
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/cpu.c
arch/arm/mach-mx5/devices-imx51.h
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/devices.c [deleted file]
arch/arm/mach-mx5/devices.h [deleted file]
arch/arm/mach-mx5/ehci.c
arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
arch/arm/mach-mx5/imx51-dt.c [new file with mode: 0644]
arch/arm/mach-mx5/imx53-dt.c [new file with mode: 0644]
arch/arm/mach-mx5/mm-mx50.c [deleted file]
arch/arm/mach-mx5/mm.c
arch/arm/mach-mx5/mx51_efika.c
arch/arm/mach-mx5/pm-imx5.c
arch/arm/mach-mx5/system.c
arch/arm/mach-mxs/Kconfig
arch/arm/mach-mxs/Makefile
arch/arm/mach-mxs/clock-mx28.c
arch/arm/mach-mxs/devices-mx23.h
arch/arm/mach-mxs/devices-mx28.h
arch/arm/mach-mxs/devices/Kconfig
arch/arm/mach-mxs/devices/Makefile
arch/arm/mach-mxs/devices/platform-mxs-saif.c [new file with mode: 0644]
arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c [new file with mode: 0644]
arch/arm/mach-mxs/include/mach/debug-macro.S
arch/arm/mach-mxs/include/mach/devices-common.h
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-mxs/include/mach/mxs.h
arch/arm/mach-mxs/include/mach/uncompress.h
arch/arm/mach-mxs/mach-m28evk.c [new file with mode: 0644]
arch/arm/mach-mxs/mach-mx23evk.c
arch/arm/mach-mxs/mach-mx28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
arch/arm/mach-mxs/mach-tx28.c
arch/arm/mach-mxs/mm-mx28.c [deleted file]
arch/arm/mach-mxs/mm.c [moved from arch/arm/mach-mxs/mm-mx23.c with 75% similarity]
arch/arm/mach-nuc93x/Kconfig [deleted file]
arch/arm/mach-nuc93x/Makefile [deleted file]
arch/arm/mach-nuc93x/Makefile.boot [deleted file]
arch/arm/mach-nuc93x/clock.c [deleted file]
arch/arm/mach-nuc93x/clock.h [deleted file]
arch/arm/mach-nuc93x/cpu.c [deleted file]
arch/arm/mach-nuc93x/cpu.h [deleted file]
arch/arm/mach-nuc93x/dev.c [deleted file]
arch/arm/mach-nuc93x/include/mach/entry-macro.S [deleted file]
arch/arm/mach-nuc93x/include/mach/hardware.h [deleted file]
arch/arm/mach-nuc93x/include/mach/io.h [deleted file]
arch/arm/mach-nuc93x/include/mach/irqs.h [deleted file]
arch/arm/mach-nuc93x/include/mach/map.h [deleted file]
arch/arm/mach-nuc93x/include/mach/regs-clock.h [deleted file]
arch/arm/mach-nuc93x/include/mach/regs-ebi.h [deleted file]
arch/arm/mach-nuc93x/include/mach/regs-irq.h [deleted file]
arch/arm/mach-nuc93x/include/mach/regs-serial.h [deleted file]
arch/arm/mach-nuc93x/include/mach/regs-timer.h [deleted file]
arch/arm/mach-nuc93x/include/mach/system.h [deleted file]
arch/arm/mach-nuc93x/include/mach/timex.h [deleted file]
arch/arm/mach-nuc93x/include/mach/uncompress.h [deleted file]
arch/arm/mach-nuc93x/include/mach/vmalloc.h [deleted file]
arch/arm/mach-nuc93x/irq.c [deleted file]
arch/arm/mach-nuc93x/mach-nuc932evb.c [deleted file]
arch/arm/mach-nuc93x/nuc932.c [deleted file]
arch/arm/mach-nuc93x/nuc932.h [deleted file]
arch/arm/mach-nuc93x/time.c [deleted file]
arch/arm/mach-omap1/Makefile
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-fsample.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap1/mcbsp.c
arch/arm/mach-omap1/timer.c [new file with mode: 0644]
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-am3517crane.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-flash.c
arch/arm/mach-omap2/board-flash.h
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-omap2/board-zoom.c
arch/arm/mach-omap2/clock2420_data.c
arch/arm/mach-omap2/clock2430_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/clockdomain.c
arch/arm/mach-omap2/clockdomain.h
arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
arch/arm/mach-omap2/clockdomain44xx.c
arch/arm/mach-omap2/clockdomains2420_data.c [new file with mode: 0644]
arch/arm/mach-omap2/clockdomains2430_data.c [new file with mode: 0644]
arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
arch/arm/mach-omap2/clockdomains3xxx_data.c [new file with mode: 0644]
arch/arm/mach-omap2/clockdomains44xx_data.c
arch/arm/mach-omap2/common.c
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/display.c
arch/arm/mach-omap2/dma.c
arch/arm/mach-omap2/gpio.c
arch/arm/mach-omap2/hsmmc.c
arch/arm/mach-omap2/hwspinlock.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/io.h
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_l3_noc.c
arch/arm/mach-omap2/omap_l3_noc.h
arch/arm/mach-omap2/omap_l3_smx.c
arch/arm/mach-omap2/omap_l3_smx.h
arch/arm/mach-omap2/omap_twl.c
arch/arm/mach-omap2/opp.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/powerdomain-common.c
arch/arm/mach-omap2/powerdomain.c
arch/arm/mach-omap2/powerdomain.h
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
arch/arm/mach-omap2/powerdomains2xxx_data.c
arch/arm/mach-omap2/powerdomains3xxx_data.c
arch/arm/mach-omap2/powerdomains44xx_data.c
arch/arm/mach-omap2/prcm.c
arch/arm/mach-omap2/prm2xxx_3xxx.c
arch/arm/mach-omap2/prm2xxx_3xxx.h
arch/arm/mach-omap2/prm44xx.c
arch/arm/mach-omap2/prm44xx.h
arch/arm/mach-omap2/sdrc.c
arch/arm/mach-omap2/serial.c
arch/arm/mach-omap2/smartreflex-class3.c
arch/arm/mach-omap2/smartreflex.c
arch/arm/mach-omap2/sr_device.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/mach-omap2/vc.c [new file with mode: 0644]
arch/arm/mach-omap2/vc.h
arch/arm/mach-omap2/vc3xxx_data.c
arch/arm/mach-omap2/vc44xx_data.c
arch/arm/mach-omap2/voltage.c
arch/arm/mach-omap2/voltage.h
arch/arm/mach-omap2/voltagedomains2xxx_data.c [new file with mode: 0644]
arch/arm/mach-omap2/voltagedomains3xxx_data.c
arch/arm/mach-omap2/voltagedomains44xx_data.c
arch/arm/mach-omap2/vp.c [new file with mode: 0644]
arch/arm/mach-omap2/vp.h
arch/arm/mach-omap2/vp3xxx_data.c
arch/arm/mach-omap2/vp44xx_data.c
arch/arm/mach-picoxcell/Makefile [new file with mode: 0644]
arch/arm/mach-picoxcell/Makefile.boot [new file with mode: 0644]
arch/arm/mach-picoxcell/common.c [new file with mode: 0644]
arch/arm/mach-picoxcell/common.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/debug-macro.S [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/entry-macro.S [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/gpio.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/hardware.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/io.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/irqs.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/map.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/memory.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/system.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/timex.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/uncompress.h [new file with mode: 0644]
arch/arm/mach-picoxcell/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-picoxcell/io.c [new file with mode: 0644]
arch/arm/mach-picoxcell/time.c [new file with mode: 0644]
arch/arm/mach-prima2/Makefile
arch/arm/mach-prima2/clock.c
arch/arm/mach-prima2/irq.c
arch/arm/mach-prima2/l2x0.c
arch/arm/mach-prima2/pm.c [new file with mode: 0644]
arch/arm/mach-prima2/pm.h [new file with mode: 0644]
arch/arm/mach-prima2/prima2.c
arch/arm/mach-prima2/rtciobrg.c [new file with mode: 0644]
arch/arm/mach-prima2/sleep.S [new file with mode: 0644]
arch/arm/mach-prima2/timer.c
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
arch/arm/mach-pxa/balloon3.c
arch/arm/mach-pxa/cm-x2xx-pci.c
arch/arm/mach-pxa/cm-x2xx.c
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/include/mach/addr-map.h
arch/arm/mach-pxa/include/mach/balloon3.h
arch/arm/mach-pxa/include/mach/gpio-pxa.h
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/include/mach/lpd270.h
arch/arm/mach-pxa/include/mach/mtd-xip.h
arch/arm/mach-pxa/include/mach/palm27x.h
arch/arm/mach-pxa/include/mach/palmtx.h
arch/arm/mach-pxa/include/mach/pxa27x.h
arch/arm/mach-pxa/include/mach/pxa95x.h [new file with mode: 0644]
arch/arm/mach-pxa/include/mach/pxafb.h
arch/arm/mach-pxa/include/mach/smemc.h
arch/arm/mach-pxa/include/mach/zeus.h
arch/arm/mach-pxa/include/mach/zylonite.h
arch/arm/mach-pxa/irq.c
arch/arm/mach-pxa/lpd270.c
arch/arm/mach-pxa/palmtreo.c
arch/arm/mach-pxa/palmtx.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx-ulpi.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/saarb.c
arch/arm/mach-pxa/z2.c
arch/arm/mach-pxa/zeus.c
arch/arm/mach-realview/hotplug.c
arch/arm/mach-realview/include/mach/debug-macro.S
arch/arm/mach-s3c2410/Kconfig
arch/arm/mach-s3c2410/Makefile
arch/arm/mach-s3c2410/dma.c
arch/arm/mach-s3c2410/gpio.c [deleted file]
arch/arm/mach-s3c2410/include/mach/map.h
arch/arm/mach-s3c2412/Kconfig
arch/arm/mach-s3c2412/Makefile
arch/arm/mach-s3c2412/dma.c
arch/arm/mach-s3c2412/gpio.c [deleted file]
arch/arm/mach-s3c2440/Kconfig
arch/arm/mach-s3c2440/dma.c
arch/arm/mach-s3c2443/dma.c
arch/arm/mach-s3c64xx/cpu.c
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s5p64x0/dev-spi.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
arch/arm/mach-s5p64x0/irq-eint.c
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-shmobile/smp-sh73a0.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/Makefile.boot
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/board-harmony-pinmux.c
arch/arm/mach-tegra/board-harmony-power.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-paz00-pinmux.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard-pinmux.c
arch/arm/mach-tegra/board-seaboard.c
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-tegra/board-trimslice-pinmux.c
arch/arm/mach-tegra/board-trimslice.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpu-tegra.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/devices.h
arch/arm/mach-tegra/dma.c
arch/arm/mach-tegra/include/mach/io.h
arch/arm/mach-tegra/include/mach/pinmux.h
arch/arm/mach-tegra/include/mach/powergate.h
arch/arm/mach-tegra/io.c
arch/arm/mach-tegra/pcie.c
arch/arm/mach-tegra/pinmux-t2-tables.c
arch/arm/mach-tegra/pinmux.c
arch/arm/mach-tegra/powergate.c
arch/arm/mach-tegra/tegra2_clocks.c
arch/arm/mach-tegra/timer.c
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/Makefile.boot
arch/arm/mach-u300/core.c
arch/arm/mach-u300/include/mach/memory.h
arch/arm/mach-u300/u300.c
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/board-mop500-pins.c
arch/arm/mach-ux500/board-mop500-sdi.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/board-mop500.h
arch/arm/mach-ux500/cache-l2x0.c [new file with mode: 0644]
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/hotplug.c
arch/arm/mach-ux500/include/mach/db5500-regs.h
arch/arm/mach-ux500/include/mach/db8500-regs.h
arch/arm/mach-ux500/include/mach/uncompress.h
arch/arm/mach-ux500/pins-db8500.h
arch/arm/mach-ux500/platsmp.c
arch/arm/mach-ux500/timer.c [new file with mode: 0644]
arch/arm/mach-vexpress/hotplug.c
arch/arm/mm/Kconfig
arch/arm/plat-mxc/Kconfig
arch/arm/plat-mxc/Makefile
arch/arm/plat-mxc/audmux-v2.c
arch/arm/plat-mxc/avic.c
arch/arm/plat-mxc/cpu.c
arch/arm/plat-mxc/devices.c
arch/arm/plat-mxc/devices/Kconfig
arch/arm/plat-mxc/devices/Makefile
arch/arm/plat-mxc/devices/platform-ahci-imx.c [new file with mode: 0644]
arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c
arch/arm/plat-mxc/devices/platform-imx-i2c.c
arch/arm/plat-mxc/devices/platform-mxc-ehci.c
arch/arm/plat-mxc/devices/platform-pata_imx.c [new file with mode: 0644]
arch/arm/plat-mxc/gic.c [new file with mode: 0644]
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/debug-macro.S
arch/arm/plat-mxc/include/mach/devices-common.h
arch/arm/plat-mxc/include/mach/entry-macro.S
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/hardware.h
arch/arm/plat-mxc/include/mach/io.h
arch/arm/plat-mxc/include/mach/iomux-mx3.h
arch/arm/plat-mxc/include/mach/iomux-mx51.h
arch/arm/plat-mxc/include/mach/iomux-mx53.h
arch/arm/plat-mxc/include/mach/iomux-v3.h
arch/arm/plat-mxc/include/mach/irqs.h
arch/arm/plat-mxc/include/mach/mx25.h
arch/arm/plat-mxc/include/mach/mx27.h
arch/arm/plat-mxc/include/mach/mx31.h
arch/arm/plat-mxc/include/mach/mx35.h
arch/arm/plat-mxc/include/mach/mx3x.h
arch/arm/plat-mxc/include/mach/mx51.h
arch/arm/plat-mxc/include/mach/mx53.h
arch/arm/plat-mxc/include/mach/mx6q.h [new file with mode: 0644]
arch/arm/plat-mxc/include/mach/mxc.h
arch/arm/plat-mxc/include/mach/system.h
arch/arm/plat-mxc/irq-common.c
arch/arm/plat-mxc/irq-common.h
arch/arm/plat-mxc/pwm.c
arch/arm/plat-mxc/system.c
arch/arm/plat-mxc/tzic.c
arch/arm/plat-nomadik/Kconfig
arch/arm/plat-nomadik/include/plat/mtu.h
arch/arm/plat-nomadik/include/plat/pincfg.h
arch/arm/plat-nomadik/timer.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/dmtimer.c
arch/arm/plat-omap/i2c.c
arch/arm/plat-omap/include/plat/clock.h
arch/arm/plat-omap/include/plat/common.h
arch/arm/plat-omap/include/plat/cpu.h
arch/arm/plat-omap/include/plat/dmtimer.h
arch/arm/plat-omap/include/plat/io.h
arch/arm/plat-omap/include/plat/mcbsp.h
arch/arm/plat-omap/include/plat/omap_device.h
arch/arm/plat-omap/include/plat/omap_hwmod.h
arch/arm/plat-omap/include/plat/voltage.h [new file with mode: 0644]
arch/arm/plat-omap/io.c
arch/arm/plat-omap/mcbsp.c
arch/arm/plat-omap/omap_device.c
arch/arm/plat-omap/sram.c
arch/arm/plat-pxa/include/plat/mfp.h
arch/arm/plat-pxa/mfp.c
arch/arm/plat-s3c24xx/cpu.c
arch/arm/plat-s3c24xx/include/plat/map.h [deleted file]
arch/arm/plat-s5p/cpu.c
arch/arm/plat-s5p/include/plat/exynos4.h
arch/arm/plat-s5p/include/plat/pll.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/cpu.c [new file with mode: 0644]
arch/arm/plat-samsung/dev-hsmmc.c
arch/arm/plat-samsung/dev-hsmmc1.c
arch/arm/plat-samsung/dev-hsmmc2.c
arch/arm/plat-samsung/dev-hsmmc3.c
arch/arm/plat-samsung/dev-ts.c
arch/arm/plat-samsung/include/plat/cpu.h
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
arch/arm/plat-samsung/include/plat/map-s3c.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/map-s5p.h [moved from arch/arm/plat-s5p/include/plat/map-s5p.h with 94% similarity]
arch/arm/plat-samsung/include/plat/sdhci.h
arch/arm/plat-samsung/platformdata.c
arch/arm/plat-versatile/platsmp.c
arch/s390/hypfs/inode.c
arch/um/Kconfig.char
arch/um/Kconfig.rest
arch/um/Kconfig.um
arch/um/Makefile
arch/um/Makefile-x86_64 [deleted file]
arch/um/drivers/chan.h [moved from arch/um/include/shared/chan_kern.h with 95% similarity]
arch/um/drivers/chan_kern.c
arch/um/drivers/chan_user.c
arch/um/drivers/chan_user.h [moved from arch/um/include/shared/chan_user.h with 100% similarity]
arch/um/drivers/cow_sys.h
arch/um/drivers/daemon_user.c
arch/um/drivers/fd.c
arch/um/drivers/harddog_user.c
arch/um/drivers/line.c
arch/um/drivers/line.h [moved from arch/um/include/shared/line.h with 100% similarity]
arch/um/drivers/mconsole.h [moved from arch/um/include/shared/mconsole.h with 100% similarity]
arch/um/drivers/mconsole_kern.h [moved from arch/um/include/shared/mconsole_kern.h with 100% similarity]
arch/um/drivers/mconsole_user.c
arch/um/drivers/net_user.c
arch/um/drivers/pcap_user.c
arch/um/drivers/port_user.c
arch/um/drivers/pty.c
arch/um/drivers/slip_user.c
arch/um/drivers/slirp_user.c
arch/um/drivers/ssl.c
arch/um/drivers/stdio_console.c
arch/um/drivers/tty.c
arch/um/drivers/ubd_kern.c
arch/um/drivers/ubd_user.c
arch/um/drivers/ubd_user.h [moved from arch/um/include/shared/ubd_user.h with 100% similarity]
arch/um/drivers/umcast_user.c
arch/um/drivers/vde_user.c
arch/um/drivers/xterm.c
arch/um/include/asm/Kbuild [new file with mode: 0644]
arch/um/include/asm/bug.h [deleted file]
arch/um/include/asm/checksum.h [deleted file]
arch/um/include/asm/cputime.h [deleted file]
arch/um/include/asm/device.h [deleted file]
arch/um/include/asm/emergency-restart.h [deleted file]
arch/um/include/asm/futex.h [deleted file]
arch/um/include/asm/hardirq.h [deleted file]
arch/um/include/asm/hw_irq.h [deleted file]
arch/um/include/asm/irq_regs.h [deleted file]
arch/um/include/asm/irqflags.h
arch/um/include/asm/kdebug.h [deleted file]
arch/um/include/asm/mmu.h
arch/um/include/asm/mmu_context.h
arch/um/include/asm/page.h
arch/um/include/asm/page_offset.h [deleted file]
arch/um/include/asm/pda.h [deleted file]
arch/um/include/asm/percpu.h [deleted file]
arch/um/include/asm/ptrace-generic.h
arch/um/include/asm/sections.h [deleted file]
arch/um/include/asm/system.h [deleted file]
arch/um/include/asm/topology.h [deleted file]
arch/um/include/asm/uaccess.h
arch/um/include/asm/xor.h [deleted file]
arch/um/include/shared/as-layout.h
arch/um/include/shared/common-offsets.h
arch/um/include/shared/initrd.h [deleted file]
arch/um/include/shared/kern.h
arch/um/include/shared/kern_util.h
arch/um/include/shared/ldt.h [deleted file]
arch/um/include/shared/mem_kern.h [deleted file]
arch/um/include/shared/os.h
arch/um/include/shared/process.h [deleted file]
arch/um/include/shared/ptrace_user.h
arch/um/include/shared/skas_ptregs.h [deleted file]
arch/um/include/shared/syscall.h [deleted file]
arch/um/include/shared/task.h [deleted file]
arch/um/include/shared/tlb.h [deleted file]
arch/um/include/shared/um_malloc.h
arch/um/include/shared/um_mmu.h [deleted file]
arch/um/include/shared/um_uaccess.h [deleted file]
arch/um/include/shared/user.h
arch/um/kernel/Makefile
arch/um/kernel/exec.c
arch/um/kernel/gmon_syms.c
arch/um/kernel/initrd.c
arch/um/kernel/irq.c
arch/um/kernel/ksyms.c
arch/um/kernel/mem.c
arch/um/kernel/physmem.c
arch/um/kernel/process.c
arch/um/kernel/signal.c
arch/um/kernel/skas/clone.c
arch/um/kernel/skas/uaccess.c
arch/um/kernel/tlb.c
arch/um/kernel/trap.c
arch/um/kernel/uaccess.c [deleted file]
arch/um/kernel/um_arch.c
arch/um/os-Linux/Makefile
arch/um/os-Linux/aio.c
arch/um/os-Linux/drivers/ethertap_user.c
arch/um/os-Linux/drivers/tuntap_user.c
arch/um/os-Linux/elf_aux.c
arch/um/os-Linux/file.c
arch/um/os-Linux/helper.c
arch/um/os-Linux/internal.h [new file with mode: 0644]
arch/um/os-Linux/irq.c
arch/um/os-Linux/main.c
arch/um/os-Linux/mem.c
arch/um/os-Linux/process.c
arch/um/os-Linux/sigio.c
arch/um/os-Linux/signal.c
arch/um/os-Linux/skas/mem.c
arch/um/os-Linux/skas/process.c
arch/um/os-Linux/start_up.c
arch/um/os-Linux/sys-i386/signal.c [deleted file]
arch/um/os-Linux/sys-x86_64/Makefile [deleted file]
arch/um/os-Linux/sys-x86_64/registers.c [deleted file]
arch/um/os-Linux/sys-x86_64/signal.c [deleted file]
arch/um/os-Linux/sys-x86_64/task_size.c [deleted file]
arch/um/os-Linux/time.c
arch/um/os-Linux/tls.c [deleted file]
arch/um/os-Linux/tty.c
arch/um/os-Linux/uaccess.c [deleted file]
arch/um/os-Linux/umid.c
arch/um/os-Linux/util.c
arch/um/scripts/Makefile.rules
arch/um/sys-i386/Makefile [deleted file]
arch/um/sys-i386/asm/elf.h [deleted file]
arch/um/sys-i386/asm/module.h [deleted file]
arch/um/sys-i386/atomic64_cx8_32.S [deleted file]
arch/um/sys-i386/bug.c [deleted file]
arch/um/sys-i386/ksyms.c [deleted file]
arch/um/sys-i386/shared/sysdep/barrier.h [deleted file]
arch/um/sys-i386/shared/sysdep/host_ldt.h [deleted file]
arch/um/sys-i386/shared/sysdep/ptrace_user.h [deleted file]
arch/um/sys-i386/shared/sysdep/sc.h [deleted file]
arch/um/sys-i386/shared/sysdep/sigcontext.h [deleted file]
arch/um/sys-i386/shared/sysdep/system.h [deleted file]
arch/um/sys-i386/shared/sysdep/vm-flags.h [deleted file]
arch/um/sys-i386/stub_segv.c [deleted file]
arch/um/sys-i386/user-offsets.c [deleted file]
arch/um/sys-x86_64/Makefile [deleted file]
arch/um/sys-x86_64/asm/archparam.h [deleted file]
arch/um/sys-x86_64/asm/module.h [deleted file]
arch/um/sys-x86_64/delay.c [deleted file]
arch/um/sys-x86_64/fault.c [deleted file]
arch/um/sys-x86_64/ptrace_user.c [deleted file]
arch/um/sys-x86_64/shared/sysdep/barrier.h [deleted file]
arch/um/sys-x86_64/shared/sysdep/host_ldt.h [deleted file]
arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h [deleted file]
arch/um/sys-x86_64/shared/sysdep/ptrace_user.h [deleted file]
arch/um/sys-x86_64/shared/sysdep/sc.h [deleted file]
arch/um/sys-x86_64/shared/sysdep/sigcontext.h [deleted file]
arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h [deleted file]
arch/um/sys-x86_64/shared/sysdep/tls.h [deleted file]
arch/um/sys-x86_64/signal.c [deleted file]
arch/x86/Makefile.um [moved from arch/um/Makefile-i386 with 64% similarity]
arch/x86/um/Kconfig [moved from arch/um/Kconfig.x86 with 100% similarity]
arch/x86/um/Makefile [new file with mode: 0644]
arch/x86/um/asm/apic.h [moved from arch/um/include/asm/apic.h with 100% similarity]
arch/x86/um/asm/arch_hweight.h [moved from arch/um/include/asm/arch_hweight.h with 100% similarity]
arch/x86/um/asm/archparam.h [moved from arch/um/sys-i386/asm/archparam.h with 62% similarity]
arch/x86/um/asm/checksum.h [new file with mode: 0644]
arch/x86/um/asm/checksum_32.h [moved from arch/um/sys-i386/shared/sysdep/checksum.h with 99% similarity]
arch/x86/um/asm/checksum_64.h [moved from arch/um/sys-x86_64/shared/sysdep/checksum.h with 100% similarity]
arch/x86/um/asm/desc.h [moved from arch/um/include/asm/desc.h with 100% similarity]
arch/x86/um/asm/elf.h [moved from arch/um/sys-x86_64/asm/elf.h with 59% similarity]
arch/x86/um/asm/irq_vectors.h [moved from arch/um/include/asm/irq_vectors.h with 100% similarity]
arch/x86/um/asm/mm_context.h [new file with mode: 0644]
arch/x86/um/asm/module.h [new file with mode: 0644]
arch/x86/um/asm/processor.h [new file with mode: 0644]
arch/x86/um/asm/processor_32.h [moved from arch/um/sys-i386/asm/processor.h with 78% similarity]
arch/x86/um/asm/processor_64.h [moved from arch/um/sys-x86_64/asm/processor.h with 77% similarity]
arch/x86/um/asm/ptrace.h [new file with mode: 0644]
arch/x86/um/asm/ptrace_32.h [moved from arch/um/sys-i386/asm/ptrace.h with 100% similarity]
arch/x86/um/asm/ptrace_64.h [moved from arch/um/sys-x86_64/asm/ptrace.h with 98% similarity]
arch/x86/um/asm/required-features.h [moved from arch/um/include/asm/required-features.h with 100% similarity]
arch/x86/um/asm/segment.h [moved from arch/um/include/asm/segment.h with 100% similarity]
arch/x86/um/asm/system.h [moved from arch/um/sys-x86_64/shared/sysdep/system.h with 96% similarity]
arch/x86/um/asm/vm-flags.h [moved from arch/um/sys-x86_64/shared/sysdep/vm-flags.h with 58% similarity]
arch/x86/um/bug.c [moved from arch/um/sys-x86_64/bug.c with 100% similarity]
arch/x86/um/bugs_32.c [moved from arch/um/sys-i386/bugs.c with 94% similarity]
arch/x86/um/bugs_64.c [moved from arch/um/sys-x86_64/bugs.c with 100% similarity]
arch/x86/um/checksum_32.S [moved from arch/um/sys-i386/checksum.S with 100% similarity]
arch/x86/um/delay.c [moved from arch/um/sys-i386/delay.c with 100% similarity]
arch/x86/um/elfcore.c [moved from arch/um/sys-i386/elfcore.c with 100% similarity]
arch/x86/um/fault.c [moved from arch/um/sys-i386/fault.c with 100% similarity]
arch/x86/um/ksyms.c [moved from arch/um/sys-x86_64/ksyms.c with 90% similarity]
arch/x86/um/ldt.c [moved from arch/um/sys-i386/ldt.c with 92% similarity]
arch/x86/um/mem_32.c [moved from arch/um/sys-i386/mem.c with 100% similarity]
arch/x86/um/mem_64.c [moved from arch/um/sys-x86_64/mem.c with 100% similarity]
arch/x86/um/os-Linux/Makefile [moved from arch/um/os-Linux/sys-i386/Makefile with 61% similarity]
arch/x86/um/os-Linux/mcontext.c [new file with mode: 0644]
arch/x86/um/os-Linux/prctl.c [moved from arch/um/os-Linux/sys-x86_64/prctl.c with 100% similarity]
arch/x86/um/os-Linux/registers.c [moved from arch/um/os-Linux/sys-i386/registers.c with 79% similarity]
arch/x86/um/os-Linux/task_size.c [moved from arch/um/os-Linux/sys-i386/task_size.c with 95% similarity]
arch/x86/um/os-Linux/tls.c [moved from arch/um/os-Linux/sys-i386/tls.c with 53% similarity]
arch/x86/um/ptrace_32.c [moved from arch/um/sys-i386/ptrace.c with 83% similarity]
arch/x86/um/ptrace_64.c [moved from arch/um/sys-x86_64/ptrace.c with 72% similarity]
arch/x86/um/ptrace_user.c [moved from arch/um/sys-i386/ptrace_user.c with 94% similarity]
arch/x86/um/setjmp_32.S [moved from arch/um/sys-i386/setjmp.S with 100% similarity]
arch/x86/um/setjmp_64.S [moved from arch/um/sys-x86_64/setjmp.S with 100% similarity]
arch/x86/um/shared/sysdep/archsetjmp.h [new file with mode: 0644]
arch/x86/um/shared/sysdep/archsetjmp_32.h [moved from arch/um/sys-i386/shared/sysdep/archsetjmp.h with 100% similarity]
arch/x86/um/shared/sysdep/archsetjmp_64.h [moved from arch/um/sys-x86_64/shared/sysdep/archsetjmp.h with 100% similarity]
arch/x86/um/shared/sysdep/faultinfo.h [new file with mode: 0644]
arch/x86/um/shared/sysdep/faultinfo_32.h [moved from arch/um/sys-i386/shared/sysdep/faultinfo.h with 80% similarity]
arch/x86/um/shared/sysdep/faultinfo_64.h [moved from arch/um/sys-x86_64/shared/sysdep/faultinfo.h with 84% similarity]
arch/x86/um/shared/sysdep/kernel-offsets.h [moved from arch/um/sys-i386/shared/sysdep/kernel-offsets.h with 100% similarity]
arch/x86/um/shared/sysdep/mcontext.h [new file with mode: 0644]
arch/x86/um/shared/sysdep/ptrace.h [new file with mode: 0644]
arch/x86/um/shared/sysdep/ptrace_32.h [moved from arch/um/sys-i386/shared/sysdep/ptrace.h with 56% similarity]
arch/x86/um/shared/sysdep/ptrace_64.h [moved from arch/um/sys-x86_64/shared/sysdep/ptrace.h with 53% similarity]
arch/x86/um/shared/sysdep/ptrace_user.h [new file with mode: 0644]
arch/x86/um/shared/sysdep/skas_ptrace.h [moved from arch/um/sys-i386/shared/sysdep/skas_ptrace.h with 80% similarity]
arch/x86/um/shared/sysdep/stub.h [new file with mode: 0644]
arch/x86/um/shared/sysdep/stub_32.h [moved from arch/um/sys-i386/shared/sysdep/stub.h with 90% similarity]
arch/x86/um/shared/sysdep/stub_64.h [moved from arch/um/sys-x86_64/shared/sysdep/stub.h with 91% similarity]
arch/x86/um/shared/sysdep/syscalls.h [new file with mode: 0644]
arch/x86/um/shared/sysdep/syscalls_32.h [moved from arch/um/sys-i386/shared/sysdep/syscalls.h with 100% similarity]
arch/x86/um/shared/sysdep/syscalls_64.h [moved from arch/um/sys-x86_64/shared/sysdep/syscalls.h with 96% similarity]
arch/x86/um/shared/sysdep/tls.h [moved from arch/um/sys-i386/shared/sysdep/tls.h with 79% similarity]
arch/x86/um/signal.c [moved from arch/um/sys-i386/signal.c with 70% similarity]
arch/x86/um/stub_32.S [moved from arch/um/sys-i386/stub.S with 100% similarity]
arch/x86/um/stub_64.S [moved from arch/um/sys-x86_64/stub.S with 100% similarity]
arch/x86/um/stub_segv.c [moved from arch/um/sys-x86_64/stub_segv.c with 53% similarity]
arch/x86/um/sys_call_table_32.S [moved from arch/um/sys-i386/sys_call_table.S with 82% similarity]
arch/x86/um/sys_call_table_64.c [moved from arch/um/sys-x86_64/syscall_table.c with 95% similarity]
arch/x86/um/syscalls_32.c [moved from arch/um/sys-i386/syscalls.c with 100% similarity]
arch/x86/um/syscalls_64.c [moved from arch/um/sys-x86_64/syscalls.c with 100% similarity]
arch/x86/um/sysrq_32.c [moved from arch/um/sys-i386/sysrq.c with 100% similarity]
arch/x86/um/sysrq_64.c [moved from arch/um/sys-x86_64/sysrq.c with 95% similarity]
arch/x86/um/tls_32.c [moved from arch/um/sys-i386/tls.c with 100% similarity]
arch/x86/um/tls_64.c [moved from arch/um/sys-x86_64/tls.c with 100% similarity]
arch/x86/um/user-offsets.c [moved from arch/um/sys-x86_64/user-offsets.c with 54% similarity]
arch/x86/um/vdso/Makefile [moved from arch/um/sys-x86_64/vdso/Makefile with 94% similarity]
arch/x86/um/vdso/checkundef.sh [moved from arch/um/sys-x86_64/vdso/checkundef.sh with 100% similarity]
arch/x86/um/vdso/um_vdso.c [moved from arch/um/sys-x86_64/vdso/um_vdso.c with 100% similarity]
arch/x86/um/vdso/vdso-layout.lds.S [moved from arch/um/sys-x86_64/vdso/vdso-layout.lds.S with 100% similarity]
arch/x86/um/vdso/vdso-note.S [moved from arch/um/sys-x86_64/vdso/vdso-note.S with 100% similarity]
arch/x86/um/vdso/vdso.S [moved from arch/um/sys-x86_64/vdso/vdso.S with 69% similarity]
arch/x86/um/vdso/vdso.lds.S [moved from arch/um/sys-x86_64/vdso/vdso.lds.S with 100% similarity]
arch/x86/um/vdso/vma.c [moved from arch/um/sys-x86_64/vdso/vma.c with 96% similarity]
drivers/char/Kconfig
drivers/char/hw_random/Kconfig
drivers/char/hw_random/Makefile
drivers/char/hw_random/atmel-rng.c [new file with mode: 0644]
drivers/char/ttyprintk.c
drivers/clocksource/Kconfig
drivers/clocksource/Makefile
drivers/clocksource/clksrc-dbx500-prcmu.c [new file with mode: 0644]
drivers/gpio/gpio-mxc.c
drivers/gpio/gpio-mxs.c
drivers/gpio/gpio-pxa.c
drivers/gpio/gpio-tegra.c
drivers/input/Kconfig
drivers/isdn/Kconfig
drivers/misc/Kconfig
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/mxcmmc.c
drivers/mtd/mtdchar.c
drivers/net/wireless/ath/Kconfig
drivers/net/wireless/rtlwifi/Kconfig
drivers/of/base.c
drivers/of/irq.c
drivers/pcmcia/pxa2xx_balloon3.c
drivers/power/Kconfig
drivers/rtc/Kconfig
drivers/staging/pohmelfs/inode.c
drivers/tty/Kconfig
drivers/tty/serial/msm_serial.c
drivers/usb/host/ohci-at91.c
drivers/video/mbx/mbxfb.c
drivers/video/pxafb.c
drivers/watchdog/Kconfig
fs/9p/vfs_inode.c
fs/9p/vfs_inode_dotl.c
fs/adfs/inode.c
fs/affs/amigaffs.c
fs/affs/inode.c
fs/affs/namei.c
fs/afs/fsclient.c
fs/afs/inode.c
fs/autofs4/inode.c
fs/befs/linuxvfs.c
fs/bfs/dir.c
fs/bfs/inode.c
fs/binfmt_misc.c
fs/btrfs/delayed-inode.c
fs/btrfs/disk-io.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c
fs/ceph/caps.c
fs/ceph/inode.c
fs/cifs/inode.c
fs/cifs/link.c
fs/coda/coda_linux.c
fs/coda/dir.c
fs/dcache.c
fs/devpts/inode.c
fs/ecryptfs/inode.c
fs/efs/inode.c
fs/exofs/inode.c
fs/ext2/balloc.c
fs/ext2/ialloc.c
fs/ext2/inode.c
fs/ext2/super.c
fs/ext3/balloc.c
fs/ext3/fsync.c
fs/ext3/ialloc.c
fs/ext3/inode.c
fs/ext3/ioctl.c
fs/ext3/namei.c
fs/ext3/super.c
fs/ext4/balloc.c
fs/ext4/ext4.h
fs/ext4/ext4_extents.h
fs/ext4/ext4_jbd2.c
fs/ext4/extents.c
fs/ext4/file.c
fs/ext4/fsync.c
fs/ext4/ialloc.c
fs/ext4/indirect.c
fs/ext4/inode.c
fs/ext4/ioctl.c
fs/ext4/mballoc.c
fs/ext4/mballoc.h
fs/ext4/migrate.c
fs/ext4/mmp.c
fs/ext4/move_extent.c
fs/ext4/namei.c
fs/ext4/page-io.c
fs/ext4/resize.c
fs/ext4/super.c
fs/ext4/xattr.c
fs/fat/inode.c
fs/fat/namei_msdos.c
fs/fat/namei_vfat.c
fs/freevxfs/vxfs_inode.c
fs/fuse/control.c
fs/fuse/inode.c
fs/gfs2/glops.c
fs/hfs/dir.c
fs/hfs/inode.c
fs/hfsplus/dir.c
fs/hfsplus/inode.c
fs/hostfs/hostfs_kern.c
fs/hostfs/hostfs_user.c
fs/hpfs/dir.c
fs/hpfs/inode.c
fs/hpfs/namei.c
fs/hppfs/hppfs.c
fs/hugetlbfs/inode.c
fs/inode.c
fs/isofs/inode.c
fs/isofs/rock.c
fs/jbd/journal.c
fs/jbd2/commit.c
fs/jbd2/journal.c
fs/jbd2/recovery.c
fs/jbd2/transaction.c
fs/jffs2/dir.c
fs/jffs2/fs.c
fs/jfs/jfs_imap.c
fs/jfs/jfs_inode.c
fs/jfs/namei.c
fs/jfs/super.c
fs/libfs.c
fs/logfs/dir.c
fs/logfs/inode.c
fs/logfs/readwrite.c
fs/minix/inode.c
fs/namei.c
fs/ncpfs/inode.c
fs/nfs/inode.c
fs/nilfs2/inode.c
fs/nilfs2/namei.c
fs/ntfs/inode.c
fs/ocfs2/dir.c
fs/ocfs2/dlmglue.c
fs/ocfs2/inode.c
fs/ocfs2/namei.c
fs/openpromfs/inode.c
fs/proc/base.c
fs/proc/generic.c
fs/proc/inode.c
fs/proc/proc_sysctl.c
fs/qnx4/inode.c
fs/quota/quota.c
fs/reiserfs/inode.c
fs/reiserfs/namei.c
fs/romfs/super.c
fs/squashfs/inode.c
fs/stack.c
fs/stat.c
fs/super.c
fs/sysfs/inode.c
fs/sysv/inode.c
fs/ubifs/super.c
fs/ubifs/xattr.c
fs/udf/balloc.c
fs/udf/directory.c
fs/udf/inode.c
fs/udf/lowlevel.c
fs/udf/misc.c
fs/udf/namei.c
fs/udf/partition.c
fs/udf/super.c
fs/udf/truncate.c
fs/udf/udf_sb.h
fs/udf/udfdecl.h
fs/udf/udftime.c
fs/udf/unicode.c
fs/ufs/ialloc.c
fs/ufs/inode.c
fs/xfs/xfs_iops.c
include/linux/clksrc-dbx500-prcmu.h [new file with mode: 0644]
include/linux/dcache.h
include/linux/ext2_fs.h
include/linux/ext3_fs.h
include/linux/ext3_fs_sb.h
include/linux/fs.h
include/linux/irqdomain.h
include/linux/jbd.h
include/linux/jbd2.h
include/linux/jbd_common.h [new file with mode: 0644]
include/linux/namei.h
include/linux/of.h
include/linux/of_irq.h
include/linux/rtc/sirfsoc_rtciobrg.h [new file with mode: 0644]
include/trace/events/ext4.h
kernel/irq/irqdomain.c
mm/shmem.c
security/integrity/ima/Kconfig
sound/Kconfig

diff --git a/Documentation/devicetree/bindings/arm/calxeda.txt b/Documentation/devicetree/bindings/arm/calxeda.txt
new file mode 100644 (file)
index 0000000..4755caa
--- /dev/null
@@ -0,0 +1,8 @@
+Calxeda Highbank Platforms Device Tree Bindings
+-----------------------------------------------
+
+Boards with Calxeda Cortex-A9 based Highbank SOC shall have the following
+properties.
+
+Required root node properties:
+    - compatible = "calxeda,highbank";
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
new file mode 100644 (file)
index 0000000..c9848ad
--- /dev/null
@@ -0,0 +1,26 @@
+Freescale i.MX Platforms Device Tree Bindings
+-----------------------------------------------
+
+i.MX51 Babbage Board
+Required root node properties:
+    - compatible = "fsl,imx51-babbage", "fsl,imx51";
+
+i.MX53 Automotive Reference Design Board
+Required root node properties:
+    - compatible = "fsl,imx53-ard", "fsl,imx53";
+
+i.MX53 Evaluation Kit
+Required root node properties:
+    - compatible = "fsl,imx53-evk", "fsl,imx53";
+
+i.MX53 Quick Start Board
+Required root node properties:
+    - compatible = "fsl,imx53-qsb", "fsl,imx53";
+
+i.MX53 Smart Mobile Reference Design Board
+Required root node properties:
+    - compatible = "fsl,imx53-smd", "fsl,imx53";
+
+i.MX6 Quad SABRE Automotive Board
+Required root node properties:
+    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt
new file mode 100644 (file)
index 0000000..52916b4
--- /dev/null
@@ -0,0 +1,55 @@
+* ARM Generic Interrupt Controller
+
+ARM SMP cores are often associated with a GIC, providing per processor
+interrupts (PPI), shared processor interrupts (SPI) and software
+generated interrupts (SGI).
+
+Primary GIC is attached directly to the CPU and typically has PPIs and SGIs.
+Secondary GICs are cascaded into the upward interrupt controller and do not
+have PPIs or SGIs.
+
+Main node required properties:
+
+- compatible : should be one of:
+       "arm,cortex-a9-gic"
+       "arm,arm11mp-gic"
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode an
+  interrupt source.  The type shall be a <u32> and the value shall be 3.
+
+  The 1st cell is the interrupt type; 0 for SPI interrupts, 1 for PPI
+  interrupts.
+
+  The 2nd cell contains the interrupt number for the interrupt type.
+  SPI interrupts are in the range [0-987].  PPI interrupts are in the
+  range [0-15].
+
+  The 3rd cell is the flags, encoded as follows:
+       bits[3:0] trigger type and level flags.
+               1 = low-to-high edge triggered
+               2 = high-to-low edge triggered
+               4 = active high level-sensitive
+               8 = active low level-sensitive
+       bits[15:8] PPI interrupt cpu mask.  Each bit corresponds to each of
+       the 8 possible cpus attached to the GIC.  A bit set to '1' indicated
+       the interrupt is wired to that CPU.  Only valid for PPI interrupts.
+
+- reg : Specifies base physical address(s) and size of the GIC registers. The
+  first region is the GIC distributor register base and size. The 2nd region is
+  the GIC cpu interface register base and size.
+
+Optional
+- interrupts   : Interrupt source of the parent interrupt controller. Only
+  present on secondary GICs.
+
+Example:
+
+       intc: interrupt-controller@fff11000 {
+               compatible = "arm,cortex-a9-gic";
+               #interrupt-cells = <3>;
+               #address-cells = <1>;
+               interrupt-controller;
+               reg = <0xfff11000 0x1000>,
+                     <0xfff10100 0x100>;
+       };
+
diff --git a/Documentation/devicetree/bindings/arm/omap/dsp.txt b/Documentation/devicetree/bindings/arm/omap/dsp.txt
new file mode 100644 (file)
index 0000000..d3830a3
--- /dev/null
@@ -0,0 +1,14 @@
+* TI - DSP (Digital Signal Processor)
+
+TI DSP included in OMAP SoC
+
+Required properties:
+- compatible : Should be "ti,omap3-c64" for OMAP3 & 4
+- ti,hwmods: "dsp"
+
+Examples:
+
+dsp {
+    compatible = "ti,omap3-c64";
+    ti,hwmods = "dsp";
+};
diff --git a/Documentation/devicetree/bindings/arm/omap/iva.txt b/Documentation/devicetree/bindings/arm/omap/iva.txt
new file mode 100644 (file)
index 0000000..6d62951
--- /dev/null
@@ -0,0 +1,19 @@
+* TI - IVA (Imaging and Video Accelerator) subsystem
+
+The IVA contain various audio, video or imaging HW accelerator
+depending of the version.
+
+Required properties:
+- compatible : Should be:
+  - "ti,ivahd" for OMAP4
+  - "ti,iva2.2" for OMAP3
+  - "ti,iva2.1" for OMAP2430
+  - "ti,iva1" for OMAP2420
+- ti,hwmods: "iva"
+
+Examples:
+
+iva {
+    compatible = "ti,ivahd", "ti,iva";
+    ti,hwmods = "iva";
+};
diff --git a/Documentation/devicetree/bindings/arm/omap/l3-noc.txt b/Documentation/devicetree/bindings/arm/omap/l3-noc.txt
new file mode 100644 (file)
index 0000000..6888a5e
--- /dev/null
@@ -0,0 +1,19 @@
+* TI - L3 Network On Chip (NoC)
+
+This version is an implementation of the generic NoC IP
+provided by Arteris.
+
+Required properties:
+- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family
+               Should be "ti,omap4-l3-noc" for OMAP4 family
+- ti,hwmods: "l3_main_1", ... One hwmod for each noc domain.
+
+Examples:
+
+ocp {
+       compatible = "ti,omap4-l3-noc", "simple-bus";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       ranges;
+       ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
+};
diff --git a/Documentation/devicetree/bindings/arm/omap/mpu.txt b/Documentation/devicetree/bindings/arm/omap/mpu.txt
new file mode 100644 (file)
index 0000000..1a5a42c
--- /dev/null
@@ -0,0 +1,27 @@
+* TI - MPU (Main Processor Unit) subsystem
+
+The MPU subsystem contain one or several ARM cores
+depending of the version.
+The MPU contain CPUs, GIC, L2 cache and a local PRCM.
+
+Required properties:
+- compatible : Should be "ti,omap3-mpu" for OMAP3
+               Should be "ti,omap4-mpu" for OMAP4
+- ti,hwmods: "mpu"
+
+Examples:
+
+- For an OMAP4 SMP system:
+
+mpu {
+    compatible = "ti,omap4-mpu";
+    ti,hwmods = "mpu";
+};
+
+
+- For an OMAP3 monocore system:
+
+mpu {
+    compatible = "ti,omap3-mpu";
+    ti,hwmods = "mpu";
+};
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
new file mode 100644 (file)
index 0000000..dbdab40
--- /dev/null
@@ -0,0 +1,43 @@
+* Texas Instruments OMAP
+
+OMAP is currently using a static file per SoC family to describe the
+IPs present in the SoC.
+On top of that an omap_device is created to extend the platform_device
+capabilities and to allow binding with one or several hwmods.
+The hwmods will contain all the information to build the device:
+adresse range, irq lines, dma lines, interconnect, PRCM register,
+clock domain, input clocks.
+For the moment just point to the existing hwmod, the next step will be
+to move data from hwmod to device-tree representation.
+
+
+Required properties:
+- compatible: Every devices present in OMAP SoC should be in the
+  form: "ti,XXX"
+- ti,hwmods: list of hwmod names (ascii strings), that comes from the OMAP
+  HW documentation, attached to a device. Must contain at least
+  one hwmod.
+
+Optional properties:
+- ti,no_idle_on_suspend: When present, it prevents the PM to idle the module
+  during suspend.
+
+
+Example:
+
+spinlock@1 {
+    compatible = "ti,omap4-spinlock";
+    ti,hwmods = "spinlock";
+};
+
+
+Boards:
+
+- OMAP3 BeagleBoard : Low cost community board
+  compatible = "ti,omap3-beagle", "ti,omap3"
+
+- OMAP4 SDP : Software Developement Board
+  compatible = "ti,omap4-sdp", "ti,omap4430"
+
+- OMAP4 PandaBoard : Low cost community board
+  compatible = "ti,omap4-panda", "ti,omap4430"
diff --git a/Documentation/devicetree/bindings/arm/picoxcell.txt b/Documentation/devicetree/bindings/arm/picoxcell.txt
new file mode 100644 (file)
index 0000000..e75c0ef
--- /dev/null
@@ -0,0 +1,24 @@
+Picochip picoXcell device tree bindings.
+========================================
+
+Required root node properties:
+    - compatible:
+       - "picochip,pc7302-pc3x3" : PC7302 development board with PC3X3 device.
+       - "picochip,pc7302-pc3x2" : PC7302 development board with PC3X2 device.
+       - "picochip,pc3x3" : picoXcell PC3X3 device based board.
+       - "picochip,pc3x2" : picoXcell PC3X2 device based board.
+
+Timers required properties:
+    - compatible = "picochip,pc3x2-timer"
+    - interrupts : The single IRQ line for the timer.
+    - clock-freq : The frequency in HZ of the timer.
+    - reg : The register bank for the timer.
+
+Note: two timers are required - one for the scheduler clock and one for the
+event tick/NOHZ.
+
+VIC required properties:
+    - compatible = "arm,pl192-vic".
+    - interrupt-controller.
+    - reg : The register bank for the device.
+    - #interrupt-cells : Must be 1.
diff --git a/Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt b/Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt
new file mode 100644 (file)
index 0000000..36f82db
--- /dev/null
@@ -0,0 +1,5 @@
+NVIDIA Tegra 2 pinmux controller
+
+Required properties:
+- compatible : "nvidia,tegra20-pinmux"
+
diff --git a/Documentation/devicetree/bindings/tty/serial/msm_serial.txt b/Documentation/devicetree/bindings/tty/serial/msm_serial.txt
new file mode 100644 (file)
index 0000000..aef383e
--- /dev/null
@@ -0,0 +1,27 @@
+* Qualcomm MSM UART
+
+Required properties:
+- compatible :
+       - "qcom,msm-uart", and one of "qcom,msm-hsuart" or
+         "qcom,msm-lsuart".
+- reg : offset and length of the register set for the device
+       for the hsuart operating in compatible mode, there should be a
+       second pair describing the gsbi registers.
+- interrupts : should contain the uart interrupt.
+
+There are two different UART blocks used in MSM devices,
+"qcom,msm-hsuart" and "qcom,msm-lsuart".  The msm-serial driver is
+able to handle both of these, and matches against the "qcom,msm-uart"
+as the compatibility.
+
+The registers for the "qcom,msm-hsuart" device need to specify both
+register blocks, even for the common driver.
+
+Example:
+
+       uart@19c400000 {
+               compatible = "qcom,msm-hsuart", "qcom,msm-uart";
+               reg = <0x19c40000 0x1000>,
+                     <0x19c00000 0x1000>;
+               interrupts = <195>;
+       };
index 6533807..d819ba1 100644 (file)
@@ -29,6 +29,7 @@ d_hash                no              no              no              maybe
 d_compare:     yes             no              no              maybe
 d_delete:      no              yes             no              no
 d_release:     no              no              yes             no
+d_prune:        no              yes             no              no
 d_iput:                no              no              yes             no
 d_dname:       no              no              no              no
 d_automount:   no              no              yes             no
index 22f3a0e..b100adc 100644 (file)
@@ -73,14 +73,6 @@ nobarrier    (*)     This also requires an IO stack which can support
                        also be used to enable or disable barriers, for
                        consistency with other ext3 mount options.
 
-orlov          (*)     This enables the new Orlov block allocator. It is
-                       enabled by default.
-
-oldalloc               This disables the Orlov block allocator and enables
-                       the old block allocator.  Orlov should have better
-                       performance - we'd like to get some feedback if it's
-                       the contrary for you.
-
 user_xattr             Enables Extended User Attributes.  Additionally, you
                        need to have extended attribute support enabled in the
                        kernel configuration (CONFIG_EXT3_FS_XATTR).  See the
index 232a575..4917cf2 100644 (file)
@@ -160,7 +160,9 @@ noload                      if the filesystem was not unmounted cleanly,
                        lead to any number of problems.
 
 data=journal           All data are committed into the journal prior to being
-                       written into the main file system.
+                       written into the main file system.  Enabling
+                       this mode will disable delayed allocation and
+                       O_DIRECT support.
 
 data=ordered   (*)     All data are forced directly out to the main file
                        system prior to its metadata being committed to the
@@ -201,30 +203,19 @@ inode_readahead_blks=n    This tuning parameter controls the maximum
                        table readahead algorithm will pre-read into
                        the buffer cache.  The default value is 32 blocks.
 
-orlov          (*)     This enables the new Orlov block allocator. It is
-                       enabled by default.
-
-oldalloc               This disables the Orlov block allocator and enables
-                       the old block allocator.  Orlov should have better
-                       performance - we'd like to get some feedback if it's
-                       the contrary for you.
-
-user_xattr             Enables Extended User Attributes.  Additionally, you
-                       need to have extended attribute support enabled in the
-                       kernel configuration (CONFIG_EXT4_FS_XATTR).  See the
-                       attr(5) manual page and http://acl.bestbits.at/ to
-                       learn more about extended attributes.
-
-nouser_xattr           Disables Extended User Attributes.
-
-acl                    Enables POSIX Access Control Lists support.
-                       Additionally, you need to have ACL support enabled in
-                       the kernel configuration (CONFIG_EXT4_FS_POSIX_ACL).
-                       See the acl(5) manual page and http://acl.bestbits.at/
-                       for more information.
+nouser_xattr           Disables Extended User Attributes. If you have extended
+                       attribute support enabled in the kernel configuration
+                       (CONFIG_EXT4_FS_XATTR), extended attribute support
+                       is enabled by default on mount. See the attr(5) manual
+                       page and http://acl.bestbits.at/ for more information
+                       about extended attributes.
 
 noacl                  This option disables POSIX Access Control List
-                       support.
+                       support. If ACL support is enabled in the kernel
+                       configuration (CONFIG_EXT4_FS_POSIX_ACL), ACL is
+                       enabled by default on mount. See the acl(5) manual
+                       page and http://acl.bestbits.at/ for more information
+                       about acl.
 
 bsddf          (*)     Make 'df' act like BSD.
 minixdf                        Make 'df' act like Minix.
@@ -419,8 +410,8 @@ written to the journal first, and then to its final location.
 In the event of a crash, the journal can be replayed, bringing both data and
 metadata into a consistent state.  This mode is the slowest except when data
 needs to be read from and written to disk at the same time where it
-outperforms all others modes.  Currently ext4 does not have delayed
-allocation support if this data journalling mode is selected.
+outperforms all others modes.  Enabling this mode will disable delayed
+allocation and O_DIRECT support.
 
 /proc entries
 =============
index 5d0fc8b..77dfecf 100644 (file)
 
   ______________________________________________________________________
 
-  1\b1.\b.  I\bIn\bnt\btr\bro\bod\bdu\buc\bct\bti\bio\bon\bn
+  1.  Introduction
 
   Welcome to User Mode Linux.  It's going to be fun.
 
 
 
-  1\b1.\b.1\b1.\b.  H\bHo\bow\bw i\bis\bs U\bUs\bse\ber\br M\bMo\bod\bde\be L\bLi\bin\bnu\bux\bx D\bDi\bif\bff\bfe\ber\bre\ben\bnt\bt?\b?
+  1.1.  How is User Mode Linux Different?
 
   Normally, the Linux Kernel talks straight to your hardware (video
   card, keyboard, hard drives, etc), and any programs which run ask the
 
 
 
-  1\b1.\b.2\b2.\b.  W\bWh\bhy\by W\bWo\bou\bul\bld\bd I\bI W\bWa\ban\bnt\bt U\bUs\bse\ber\br M\bMo\bod\bde\be L\bLi\bin\bnu\bux\bx?\b?
+  1.2.  Why Would I Want User Mode Linux?
 
 
   1. If User Mode Linux crashes, your host kernel is still fine.
 
 
 
-  2\b2.\b.  C\bCo\bom\bmp\bpi\bil\bli\bin\bng\bg t\bth\bhe\be k\bke\ber\brn\bne\bel\bl a\ban\bnd\bd m\bmo\bod\bdu\bul\ble\bes\bs
+  2.  Compiling the kernel and modules
 
 
 
 
-  2\b2.\b.1\b1.\b.  C\bCo\bom\bmp\bpi\bil\bli\bin\bng\bg t\bth\bhe\be k\bke\ber\brn\bne\bel\bl
+  2.1.  Compiling the kernel
 
 
   Compiling the user mode kernel is just like compiling any other
   bug fixes and enhancements that have gone into subsequent releases.
 
 
-  2\b2.\b.2\b2.\b.  C\bCo\bom\bmp\bpi\bil\bli\bin\bng\bg a\ban\bnd\bd i\bin\bns\bst\bta\bal\bll\bli\bin\bng\bg k\bke\ber\brn\bne\bel\bl m\bmo\bod\bdu\bul\ble\bes\bs
+  2.2.  Compiling and installing kernel modules
 
   UML modules are built in the same way as the native kernel (with the
   exception of the 'ARCH=um' that you always need for UML):
 
 
 
-  2\b2.\b.3\b3.\b.  C\bCo\bom\bmp\bpi\bil\bli\bin\bng\bg a\ban\bnd\bd i\bin\bns\bst\bta\bal\bll\bli\bin\bng\bg u\bum\bml\bl_\b_u\but\bti\bil\bli\bit\bti\bie\bes\bs
+  2.3.  Compiling and installing uml_utilities
 
   Many features of the UML kernel require a user-space helper program,
   so a uml_utilities package is distributed separately from the kernel
   patch which provides these helpers. Included within this is:
 
-  +\bo  port-helper - Used by consoles which connect to xterms or ports
+  o  port-helper - Used by consoles which connect to xterms or ports
 
-  +\bo  tunctl - Configuration tool to create and delete tap devices
+  o  tunctl - Configuration tool to create and delete tap devices
 
-  +\bo  uml_net - Setuid binary for automatic tap device configuration
+  o  uml_net - Setuid binary for automatic tap device configuration
 
-  +\bo  uml_switch - User-space virtual switch required for daemon
+  o  uml_switch - User-space virtual switch required for daemon
      transport
 
      The uml_utilities tree is compiled with:
 
 
 
-  3\b3.\b.  R\bRu\bun\bnn\bni\bin\bng\bg U\bUM\bML\bL a\ban\bnd\bd l\blo\bog\bgg\bgi\bin\bng\bg i\bin\bn
+  3.  Running UML and logging in
 
 
 
-  3\b3.\b.1\b1.\b.  R\bRu\bun\bnn\bni\bin\bng\bg U\bUM\bML\bL
+  3.1.  Running UML
 
   It runs on 2.2.15 or later, and all 2.4 kernels.
 
 
 
 
-  3\b3.\b.2\b2.\b.  L\bLo\bog\bgg\bgi\bin\bng\bg i\bin\bn
+  3.2.  Logging in
 
 
 
 
   There are a couple of other ways to log in:
 
-  +\bo  On a virtual console
+  o  On a virtual console
 
 
 
 
 
 
-  +\bo  Over the serial line
+  o  Over the serial line
 
 
      In the boot output, find a line that looks like:
 
 
 
-  +\bo  Over the net
+  o  Over the net
 
 
      If the network is running, then you can telnet to the virtual
   down and the process will exit.
 
 
-  3\b3.\b.3\b3.\b.  E\bEx\bxa\bam\bmp\bpl\ble\bes\bs
+  3.3.  Examples
 
   Here are some examples of UML in action:
 
-  +\bo  A login session <http://user-mode-linux.sourceforge.net/login.html>
+  o  A login session <http://user-mode-linux.sourceforge.net/login.html>
 
-  +\bo  A virtual network <http://user-mode-linux.sourceforge.net/net.html>
+  o  A virtual network <http://user-mode-linux.sourceforge.net/net.html>
 
 
 
 
 
 
-  4\b4.\b.  U\bUM\bML\bL o\bon\bn 2\b2G\bG/\b/2\b2G\bG h\bho\bos\bst\bts\bs
+  4.  UML on 2G/2G hosts
 
 
 
 
-  4\b4.\b.1\b1.\b.  I\bIn\bnt\btr\bro\bod\bdu\buc\bct\bti\bio\bon\bn
+  4.1.  Introduction
 
 
   Most Linux machines are configured so that the kernel occupies the
 
 
 
-  4\b4.\b.2\b2.\b.  T\bTh\bhe\be p\bpr\bro\bob\bbl\ble\bem\bm
+  4.2.  The problem
 
 
   The prebuilt UML binaries on this site will not run on 2G/2G hosts
 
 
 
-  4\b4.\b.3\b3.\b.  T\bTh\bhe\be s\bso\bol\blu\but\bti\bio\bon\bn
+  4.3.  The solution
 
 
   The fix for this is to rebuild UML from source after enabling
 
 
 
-  5\b5.\b.  S\bSe\bet\btt\bti\bin\bng\bg u\bup\bp s\bse\ber\bri\bia\bal\bl l\bli\bin\bne\bes\bs a\ban\bnd\bd c\bco\bon\bns\bso\bol\ble\bes\bs
+  5.  Setting up serial lines and consoles
 
 
   It is possible to attach UML serial lines and consoles to many types
   You can attach them to host ptys, ttys, file descriptors, and ports.
   This allows you to do things like
 
-  +\bo  have a UML console appear on an unused host console,
+  o  have a UML console appear on an unused host console,
 
-  +\bo  hook two virtual machines together by having one attach to a pty
+  o  hook two virtual machines together by having one attach to a pty
      and having the other attach to the corresponding tty
 
-  +\bo  make a virtual machine accessible from the net by attaching a
+  o  make a virtual machine accessible from the net by attaching a
      console to a port on the host.
 
 
 
 
 
-  5\b5.\b.1\b1.\b.  S\bSp\bpe\bec\bci\bif\bfy\byi\bin\bng\bg t\bth\bhe\be d\bde\bev\bvi\bic\bce\be
+  5.1.  Specifying the device
 
   Devices are specified with "con" or "ssl" (console or serial line,
   respectively), optionally with a device number if you are talking
 
 
 
-  5\b5.\b.2\b2.\b.  S\bSp\bpe\bec\bci\bif\bfy\byi\bin\bng\bg t\bth\bhe\be c\bch\bha\ban\bnn\bne\bel\bl
+  5.2.  Specifying the channel
 
   There are a number of different types of channels to attach a UML
   device to, each with a different way of specifying exactly what to
   attach to.
 
-  +\bo  pseudo-terminals - device=pty pts terminals - device=pts
+  o  pseudo-terminals - device=pty pts terminals - device=pts
 
 
      This will cause UML to allocate a free host pseudo-terminal for the
      log.  You access it by attaching a terminal program to the
      corresponding tty:
 
-  +\bo  screen /dev/pts/n
+  o  screen /dev/pts/n
 
-  +\bo  screen /dev/ttyxx
+  o  screen /dev/ttyxx
 
-  +\bo  minicom -o -p /dev/ttyxx - minicom seems not able to handle pts
+  o  minicom -o -p /dev/ttyxx - minicom seems not able to handle pts
      devices
 
-  +\bo  kermit - start it up, 'open' the device, then 'connect'
+  o  kermit - start it up, 'open' the device, then 'connect'
 
 
 
 
 
-  +\bo  terminals - device=tty:tty device file
+  o  terminals - device=tty:tty device file
 
 
      This will make UML attach the device to the specified tty (i.e
 
 
 
-  +\bo  xterms - device=xterm
+  o  xterms - device=xterm
 
 
      UML will run an xterm and the device will be attached to it.
 
 
 
-  +\bo  Port - device=port:port number
+  o  Port - device=port:port number
 
 
      This will attach the UML devices to the specified host port.
 
 
 
-  +\bo  already-existing file descriptors - device=file descriptor
+  o  already-existing file descriptors - device=file descriptor
 
 
      If you set up a file descriptor on the UML command line, you can
 
 
 
-  +\bo  Nothing - device=null
+  o  Nothing - device=null
 
 
      This allows the device to be opened, in contrast to 'none', but
 
 
 
-  +\bo  None - device=none
+  o  None - device=none
 
 
      This causes the device to disappear.
 
 
 
-  will cause serial line 3 to accept input on the host's /dev/tty3 and
+  will cause serial line 3 to accept input on the host's /dev/tty2 and
   display output on an xterm.  That's a silly example - the most common
   use of this syntax is to reattach the main console to stdin and stdout
   as shown above.
 
 
 
-  5\b5.\b.3\b3.\b.  E\bEx\bxa\bam\bmp\bpl\ble\bes\bs
+  5.3.  Examples
 
   There are a number of interesting things you can do with this
   capability.
   prompt of the other virtual machine.
 
 
-  6\b6.\b.  S\bSe\bet\btt\bti\bin\bng\bg u\bup\bp t\bth\bhe\be n\bne\bet\btw\bwo\bor\brk\bk
+  6.  Setting up the network
 
 
 
   There are currently five transport types available for a UML virtual
   machine to exchange packets with other hosts:
 
-  +\bo  ethertap
+  o  ethertap
 
-  +\bo  TUN/TAP
+  o  TUN/TAP
 
-  +\bo  Multicast
+  o  Multicast
 
-  +\bo  a switch daemon
+  o  a switch daemon
 
-  +\bo  slip
+  o  slip
 
-  +\bo  slirp
+  o  slirp
 
-  +\bo  pcap
+  o  pcap
 
      The TUN/TAP, ethertap, slip, and slirp transports allow a UML
      instance to exchange packets with the host.  They may be directed
   With so many host transports, which one should you use?  Here's when
   you should use each one:
 
-  +\bo  ethertap - if you want access to the host networking and it is
+  o  ethertap - if you want access to the host networking and it is
      running 2.2
 
-  +\bo  TUN/TAP - if you want access to the host networking and it is
+  o  TUN/TAP - if you want access to the host networking and it is
      running 2.4.  Also, the TUN/TAP transport is able to use a
      preconfigured device, allowing it to avoid using the setuid uml_net
      helper, which is a security advantage.
 
-  +\bo  Multicast - if you want a purely virtual network and you don't want
+  o  Multicast - if you want a purely virtual network and you don't want
      to set up anything but the UML
 
-  +\bo  a switch daemon - if you want a purely virtual network and you
+  o  a switch daemon - if you want a purely virtual network and you
      don't mind running the daemon in order to get somewhat better
      performance
 
-  +\bo  slip - there is no particular reason to run the slip backend unless
+  o  slip - there is no particular reason to run the slip backend unless
      ethertap and TUN/TAP are just not available for some reason
 
-  +\bo  slirp - if you don't have root access on the host to setup
+  o  slirp - if you don't have root access on the host to setup
      networking, or if you don't want to allocate an IP to your UML
 
-  +\bo  pcap - not much use for actual network connectivity, but great for
+  o  pcap - not much use for actual network connectivity, but great for
      monitoring traffic on the host
 
      Ethertap is available on 2.4 and works fine.  TUN/TAP is preferred
      exploit the helper's root privileges.
 
 
-  6\b6.\b.1\b1.\b.  G\bGe\ben\bne\ber\bra\bal\bl s\bse\bet\btu\bup\bp
+  6.1.  General setup
 
   First, you must have the virtual network enabled in your UML.  If are
   running a prebuilt kernel from this site, everything is already
 
 
 
-  6\b6.\b.2\b2.\b.  U\bUs\bse\ber\brs\bsp\bpa\bac\bce\be d\bda\bae\bem\bmo\bon\bns\bs
+  6.2.  Userspace daemons
 
   You will likely need the setuid helper, or the switch daemon, or both.
   They are both installed with the RPM and deb, so if you've installed
 
 
 
-  6\b6.\b.3\b3.\b.  S\bSp\bpe\bec\bci\bif\bfy\byi\bin\bng\bg e\bet\bth\bhe\ber\brn\bne\bet\bt a\bad\bdd\bdr\bre\bes\bss\bse\bes\bs
+  6.3.  Specifying ethernet addresses
 
   Below, you will see that the TUN/TAP, ethertap, and daemon interfaces
   allow you to specify hardware addresses for the virtual ethernet
   sufficient to guarantee a unique hardware address for the device.  A
   couple of exceptions are:
 
-  +\bo  Another set of virtual ethernet devices are on the same network and
+  o  Another set of virtual ethernet devices are on the same network and
      they are assigned hardware addresses using a different scheme which
      may conflict with the UML IP address-based scheme
 
-  +\bo  You aren't going to use the device for IP networking, so you don't
+  o  You aren't going to use the device for IP networking, so you don't
      assign the device an IP address
 
      If you let the driver provide the hardware address, you should make
 
 
 
-  6\b6.\b.4\b4.\b.  U\bUM\bML\bL i\bin\bnt\bte\ber\brf\bfa\bac\bce\be s\bse\bet\btu\bup\bp
+  6.4.  UML interface setup
 
   Once the network devices have been described on the command line, you
   should boot UML and log in.
 
 
 
-  6\b6.\b.5\b5.\b.  M\bMu\bul\blt\bti\bic\bca\bas\bst\bt
+  6.5.  Multicast
 
   The simplest way to set up a virtual network between multiple UMLs is
   to use the mcast transport.  This was written by Harald Welte and is
 
 
 
-  6\b6.\b.6\b6.\b.  T\bTU\bUN\bN/\b/T\bTA\bAP\bP w\bwi\bit\bth\bh t\bth\bhe\be u\bum\bml\bl_\b_n\bne\bet\bt h\bhe\bel\blp\bpe\ber\br
+  6.6.  TUN/TAP with the uml_net helper
 
   TUN/TAP is the preferred mechanism on 2.4 to exchange packets with the
   host.  The TUN/TAP backend has been in UML since 2.4.9-3um.
   There are a couple potential problems with running the TUN/TAP
   transport on a 2.4 host kernel
 
-  +\bo  TUN/TAP seems not to work on 2.4.3 and earlier.  Upgrade the host
+  o  TUN/TAP seems not to work on 2.4.3 and earlier.  Upgrade the host
      kernel or use the ethertap transport.
 
-  +\bo  With an upgraded kernel, TUN/TAP may fail with
+  o  With an upgraded kernel, TUN/TAP may fail with
 
 
        File descriptor in bad state
 
 
 
-  6\b6.\b.7\b7.\b.  T\bTU\bUN\bN/\b/T\bTA\bAP\bP w\bwi\bit\bth\bh a\ba p\bpr\bre\bec\bco\bon\bnf\bfi\big\bgu\bur\bre\bed\bd t\bta\bap\bp d\bde\bev\bvi\bic\bce\be
+  6.7.  TUN/TAP with a preconfigured tap device
 
   If you prefer not to have UML use uml_net (which is somewhat
   insecure), with UML 2.4.17-11, you can set up a TUN/TAP device
   there is no need for root assistance.  Setting up the device is done
   as follows:
 
-  +\bo  Create the device with tunctl (available from the UML utilities
+  o  Create the device with tunctl (available from the UML utilities
      tarball)
 
 
   where uid is the user id or username that UML will be run as.  This
   will tell you what device was created.
 
-  +\bo  Configure the device IP (change IP addresses and device name to
+  o  Configure the device IP (change IP addresses and device name to
      suit)
 
 
 
 
 
-  +\bo  Set up routing and arping if desired - this is my recipe, there are
+  o  Set up routing and arping if desired - this is my recipe, there are
      other ways of doing the same thing
 
 
   utility which reads the information from a config file and sets up
   devices at boot time.
 
-  +\bo  Rather than using up two IPs and ARPing for one of them, you can
+  o  Rather than using up two IPs and ARPing for one of them, you can
      also provide direct access to your LAN by the UML by using a
      bridge.
 
   Note that 'br0' should be setup using ifconfig with the existing IP
   address of eth0, as eth0 no longer has its own IP.
 
-  +\bo
+  o
 
 
      Also, the /dev/net/tun device must be writable by the user running
   devices and chgrp /dev/net/tun to that group with mode 664 or 660.
 
 
-  +\bo  Once the device is set up, run UML with 'eth0=tuntap,device name'
+  o  Once the device is set up, run UML with 'eth0=tuntap,device name'
      (i.e. 'eth0=tuntap,tap0') on the command line (or do it with the
      mconsole config command).
 
-  +\bo  Bring the eth device up in UML and you're in business.
+  o  Bring the eth device up in UML and you're in business.
 
      If you don't want that tap device any more, you can make it non-
      persistent with
 
 
 
-  6\b6.\b.8\b8.\b.  E\bEt\bth\bhe\ber\brt\bta\bap\bp
+  6.8.  Ethertap
 
   Ethertap is the general mechanism on 2.2 for userspace processes to
   exchange packets with the kernel.
 
 
 
-  6\b6.\b.9\b9.\b.  T\bTh\bhe\be s\bsw\bwi\bit\btc\bch\bh d\bda\bae\bem\bmo\bon\bn
+  6.9.  The switch daemon
 
-  N\bNo\bot\bte\be: This is the daemon formerly known as uml_router, but which was
+  Note: This is the daemon formerly known as uml_router, but which was
   renamed so the network weenies of the world would stop growling at me.
 
 
 
 
 
-  6\b6.\b.1\b10\b0.\b.  S\bSl\bli\bip\bp
+  6.10.  Slip
 
   Slip is another, less general, mechanism for a process to communicate
   with the host networking.  In contrast to the ethertap interface,
 
 
 
-  6\b6.\b.1\b11\b1.\b.  S\bSl\bli\bir\brp\bp
+  6.11.  Slirp
 
   slirp uses an external program, usually /usr/bin/slirp, to provide IP
   only networking connectivity through the host. This is similar to IP
 
 
 
-  6\b6.\b.1\b12\b2.\b.  p\bpc\bca\bap\bp
+  6.12.  pcap
 
   The pcap transport is attached to a UML ethernet device on the command
   line or with uml_mconsole with the following syntax: