Google Git
Sign in
kernel / pub / scm / linux / kernel / git / bcousson / linux-omap-dt / e9942c5af4fd47e8f2cb44fd75a986c2c6e37e01 / . / Next / merge.log
blob: ed25402f011b2f20fb112cdca4af8c695a55198d [file] [log] [blame]
$ date
Mon Jan 16 09:53:47 EST 2012
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 2485a4b Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Merging origin/master (122804e Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
$ git merge origin/master
Updating 2485a4b..122804e
Fast-forward
CREDITS | 5 +
Documentation/ABI/testing/sysfs-kernel-slab | 4 +
Documentation/ABI/testing/sysfs-module | 16 +
Documentation/DocBook/media/constraints.png.b64 | 59 +
Documentation/DocBook/media/dvb/dvbproperty.xml | 19 +-
Documentation/DocBook/media/dvb/frontend.xml | 8 +-
Documentation/DocBook/media/selection.png.b64 | 206 +
Documentation/DocBook/media/v4l/biblio.xml | 8 -
Documentation/DocBook/media/v4l/common.xml | 10 +-
Documentation/DocBook/media/v4l/compat.xml | 30 +-
Documentation/DocBook/media/v4l/controls.xml | 43 +-
Documentation/DocBook/media/v4l/dev-capture.xml | 8 -
Documentation/DocBook/media/v4l/dev-codec.xml | 8 -
Documentation/DocBook/media/v4l/dev-effect.xml | 8 -
Documentation/DocBook/media/v4l/dev-event.xml | 8 -
Documentation/DocBook/media/v4l/dev-osd.xml | 8 -
Documentation/DocBook/media/v4l/dev-output.xml | 8 -
Documentation/DocBook/media/v4l/dev-overlay.xml | 8 -
Documentation/DocBook/media/v4l/dev-radio.xml | 8 -
Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 8 -
Documentation/DocBook/media/v4l/dev-rds.xml | 16 +-
Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 9 -
Documentation/DocBook/media/v4l/dev-teletext.xml | 8 -
Documentation/DocBook/media/v4l/driver.xml | 8 -
Documentation/DocBook/media/v4l/func-close.xml | 8 -
Documentation/DocBook/media/v4l/func-ioctl.xml | 8 -
Documentation/DocBook/media/v4l/func-mmap.xml | 8 -
Documentation/DocBook/media/v4l/func-munmap.xml | 8 -
Documentation/DocBook/media/v4l/func-open.xml | 8 -
Documentation/DocBook/media/v4l/func-poll.xml | 8 -
Documentation/DocBook/media/v4l/func-read.xml | 8 -
Documentation/DocBook/media/v4l/func-select.xml | 8 -
Documentation/DocBook/media/v4l/func-write.xml | 8 -
Documentation/DocBook/media/v4l/io.xml | 8 -
Documentation/DocBook/media/v4l/libv4l.xml | 7 -
Documentation/DocBook/media/v4l/pixfmt-grey.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-m420.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-nv12.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-nv16.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-nv24.xml | 121 +
.../DocBook/media/v4l/pixfmt-packed-rgb.xml | 15 +-
.../DocBook/media/v4l/pixfmt-packed-yuv.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-uyvy.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-vyuy.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-y16.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-y41p.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-yuv410.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-yuv420.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-yuyv.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt-yvyu.xml | 8 -
Documentation/DocBook/media/v4l/pixfmt.xml | 14 +-
Documentation/DocBook/media/v4l/selection-api.xml | 321 ++
Documentation/DocBook/media/v4l/v4l2.xml | 1 +
.../DocBook/media/v4l/vidioc-enum-dv-presets.xml | 8 -
.../DocBook/media/v4l/vidioc-enum-fmt.xml | 8 -
.../DocBook/media/v4l/vidioc-enuminput.xml | 8 -
.../DocBook/media/v4l/vidioc-enumoutput.xml | 8 -
Documentation/DocBook/media/v4l/vidioc-enumstd.xml | 8 -
Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml | 8 -
.../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 7 -
Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 14 +-
.../DocBook/media/v4l/vidioc-g-frequency.xml | 8 -
.../DocBook/media/v4l/vidioc-g-modulator.xml | 8 -
.../DocBook/media/v4l/vidioc-g-priority.xml | 8 -
.../DocBook/media/v4l/vidioc-g-selection.xml | 304 ++
Documentation/DocBook/media/v4l/vidioc-g-std.xml | 8 -
Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 18 +-
.../DocBook/media/v4l/vidioc-querybuf.xml | 8 -
.../DocBook/media/v4l/vidioc-queryctrl.xml | 8 -
.../DocBook/media/v4l/vidioc-s-hw-freq-seek.xml | 8 -
Documentation/cgroups/memory.txt | 9 +-
Documentation/devicetree/bindings/mfd/mc13xxx.txt | 78 +
.../devicetree/bindings/mfd/twl-familly.txt | 47 +
.../devicetree/bindings/resource-names.txt | 54 +
Documentation/dma-buf-sharing.txt | 4 +
Documentation/dvb/get_dvb_firmware | 42 +-
Documentation/fb/api.txt | 306 ++
Documentation/feature-removal-schedule.txt | 35 -
Documentation/filesystems/ceph.txt | 18 +-
Documentation/filesystems/nfs/00-INDEX | 2 +
Documentation/filesystems/nfs/fault_injection.txt | 69 +
Documentation/filesystems/proc.txt | 3 +
Documentation/filesystems/squashfs.txt | 6 +-
Documentation/kernel-parameters.txt | 8 +
Documentation/kmemleak.txt | 3 +
Documentation/mmc/mmc-dev-attrs.txt | 10 +
Documentation/mmc/mmc-dev-parts.txt | 13 +
Documentation/sysctl/kernel.txt | 8 +
Documentation/video4linux/CARDLIST.au0828 | 2 +-
Documentation/video4linux/CARDLIST.bttv | 3 +-
Documentation/video4linux/CARDLIST.cx23885 | 3 +
Documentation/video4linux/CARDLIST.cx88 | 2 +
Documentation/video4linux/CARDLIST.em28xx | 10 +-
Documentation/video4linux/CARDLIST.saa7134 | 1 +
Documentation/video4linux/CARDLIST.saa7164 | 2 +
Documentation/video4linux/gspca.txt | 2 +
Documentation/video4linux/v4l2-framework.txt | 11 +
Documentation/vm/slub.txt | 5 +-
MAINTAINERS | 19 +-
arch/Kconfig | 14 +
arch/arm/include/asm/hwcap.h | 4 +-
arch/arm/include/asm/swab.h | 7 +-
arch/arm/include/asm/unistd.h | 4 +-
arch/arm/mach-omap2/board-4430sdp.c | 23 +-
arch/arm/mach-omap2/board-omap4panda.c | 25 +-
arch/arm/mach-omap2/display.c | 39 +
arch/arm/mach-realview/realview_eb.c | 3 -
arch/arm/mach-realview/realview_pb1176.c | 3 -
arch/arm/mach-realview/realview_pb11mp.c | 3 -
arch/arm/mach-realview/realview_pba8.c | 3 -
arch/arm/mach-realview/realview_pbx.c | 3 -
arch/arm/mach-sa1100/assabet.c | 12 +
arch/arm/mach-sa1100/cerf.c | 11 +
arch/arm/mach-sa1100/collie.c | 18 +-
arch/arm/mach-sa1100/generic.c | 7 +-
arch/arm/mach-sa1100/include/mach/gpio.h | 3 -
arch/arm/mach-sa1100/include/mach/mcp.h | 2 +
arch/arm/mach-sa1100/lart.c | 10 +
arch/arm/mach-sa1100/shannon.c | 11 +
arch/arm/mach-sa1100/simpad.c | 18 +-
arch/arm/mach-shmobile/board-ag5evm.c | 43 +-
arch/arm/mach-shmobile/board-ap4evb.c | 32 +-
arch/arm/mach-shmobile/board-mackerel.c | 4 +-
arch/arm/mach-shmobile/clock-sh7372.c | 4 +-
arch/arm/mach-shmobile/clock-sh73a0.c | 4 +-
arch/arm/mach-ux500/board-mop500.c | 4 +-
arch/arm/mach-ux500/board-u5500.c | 2 +-
.../mach-ux500/include/mach/irqs-board-mop500.h | 2 +-
arch/arm/plat-samsung/include/plat/sdhci.h | 1 +
arch/arm/plat-samsung/platformdata.c | 2 +
arch/avr32/include/asm/system.h | 2 +-
arch/avr32/kernel/traps.c | 2 +-
arch/frv/include/asm/param.h | 16 +-
arch/ia64/hp/common/aml_nfw.c | 2 +-
arch/ia64/include/asm/intrinsics.h | 21 +-
arch/ia64/include/asm/processor.h | 1 -
arch/ia64/include/asm/unistd.h | 3 +-
arch/ia64/kernel/entry.S | 1 +
arch/ia64/kernel/machine_kexec.c | 4 +-
arch/m32r/include/asm/param.h | 18 +-
arch/m68k/amiga/config.c | 3 +-
arch/mips/Kconfig | 84 +-
arch/mips/Makefile | 1 +
arch/mips/alchemy/Kconfig | 60 +-
arch/mips/alchemy/Makefile | 3 +
arch/mips/alchemy/Platform | 58 +-
arch/mips/alchemy/{gpr/platform.c => board-gpr.c} | 81 +-
.../alchemy/{mtx-1/platform.c => board-mtx1.c} | 93 +-
arch/mips/alchemy/board-xxs1500.c | 154 +
arch/mips/alchemy/common/Makefile | 4 +-
arch/mips/alchemy/common/dbdma.c | 49 +-
arch/mips/alchemy/common/gpiolib.c | 42 +
arch/mips/alchemy/common/irq.c | 875 +++-
arch/mips/alchemy/common/platform.c | 31 +-
arch/mips/alchemy/common/power.c | 3 +
arch/mips/alchemy/common/sleeper.S | 73 +
arch/mips/alchemy/common/time.c | 3 +-
arch/mips/alchemy/common/vss.c | 84 +
arch/mips/alchemy/devboards/Makefile | 19 +-
arch/mips/alchemy/devboards/bcsr.c | 11 +-
arch/mips/alchemy/devboards/db1000.c | 565 +++
.../devboards/{db1200/platform.c => db1200.c} | 401 ++-
arch/mips/alchemy/devboards/db1200/Makefile | 1 -
arch/mips/alchemy/devboards/db1200/setup.c | 81 -
arch/mips/alchemy/devboards/db1300.c | 785 +++
arch/mips/alchemy/devboards/db1550.c | 498 ++
arch/mips/alchemy/devboards/db1x00/Makefile | 8 -
arch/mips/alchemy/devboards/db1x00/board_setup.c | 229 -
arch/mips/alchemy/devboards/db1x00/platform.c | 316 --
arch/mips/alchemy/devboards/pb1000/Makefile | 8 -
arch/mips/alchemy/devboards/pb1000/board_setup.c | 209 -
.../devboards/{pb1100/board_setup.c => pb1100.c} | 92 +-
arch/mips/alchemy/devboards/pb1100/Makefile | 8 -
arch/mips/alchemy/devboards/pb1100/platform.c | 77 -
arch/mips/alchemy/devboards/pb1200/Makefile | 5 -
arch/mips/alchemy/devboards/pb1200/board_setup.c | 174 -
arch/mips/alchemy/devboards/pb1200/platform.c | 339 --
.../devboards/{pb1500/board_setup.c => pb1500.c} | 113 +-
arch/mips/alchemy/devboards/pb1500/Makefile | 8 -
arch/mips/alchemy/devboards/pb1500/platform.c | 94 -
.../devboards/{pb1550/platform.c => pb1550.c} | 112 +-
arch/mips/alchemy/devboards/pb1550/Makefile | 8 -
arch/mips/alchemy/devboards/pb1550/board_setup.c | 80 -
arch/mips/alchemy/devboards/platform.c | 13 +-
arch/mips/alchemy/devboards/prom.c | 11 +-
arch/mips/alchemy/gpr/Makefile | 8 -
arch/mips/alchemy/gpr/board_setup.c | 75 -
arch/mips/alchemy/gpr/init.c | 63 -
arch/mips/alchemy/mtx-1/Makefile | 9 -
arch/mips/alchemy/mtx-1/board_setup.c | 94 -
arch/mips/alchemy/mtx-1/init.c | 66 -
arch/mips/alchemy/xxs1500/Makefile | 8 -
arch/mips/alchemy/xxs1500/board_setup.c | 93 -
arch/mips/alchemy/xxs1500/init.c | 63 -
arch/mips/alchemy/xxs1500/platform.c | 63 -
arch/mips/ar7/gpio.c | 2 +-
arch/mips/ar7/platform.c | 39 +-
arch/mips/ar7/prom.c | 4 +-
arch/mips/ar7/setup.c | 2 +-
arch/mips/ath79/Kconfig | 38 +-
arch/mips/ath79/Makefile | 5 +-
arch/mips/ath79/clock.c | 55 +
arch/mips/ath79/common.c | 5 +
arch/mips/ath79/dev-ar913x-wmac.c | 60 -
arch/mips/ath79/dev-common.c | 38 +-
arch/mips/ath79/dev-usb.c | 197 +
arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} | 10 +-
arch/mips/ath79/dev-wmac.c | 109 +
arch/mips/ath79/dev-wmac.h | 17 +
arch/mips/ath79/early_printk.c | 76 +-
arch/mips/ath79/gpio.c | 2 +
arch/mips/ath79/irq.c | 17 +-
arch/mips/ath79/mach-ap121.c | 92 +
arch/mips/ath79/mach-ap81.c | 6 +-
arch/mips/ath79/mach-pb44.c | 2 +
arch/mips/ath79/mach-ubnt-xm.c | 119 +
arch/mips/ath79/machtypes.h | 2 +
arch/mips/ath79/setup.c | 22 +-
arch/mips/bcm47xx/setup.c | 4 +-
arch/mips/bcm63xx/Kconfig | 4 +
arch/mips/bcm63xx/boards/board_bcm963xx.c | 46 +-
arch/mips/bcm63xx/clk.c | 70 +-
arch/mips/bcm63xx/cpu.c | 261 +-
arch/mips/bcm63xx/dev-uart.c | 2 +-
arch/mips/bcm63xx/gpio.c | 41 +-
arch/mips/bcm63xx/irq.c | 403 ++-
arch/mips/bcm63xx/prom.c | 7 +-
arch/mips/bcm63xx/setup.c | 32 +-
arch/mips/boot/compressed/uart-alchemy.c | 5 +-
arch/mips/cavium-octeon/Kconfig | 4 -
arch/mips/cavium-octeon/dma-octeon.c | 23 +-
arch/mips/cavium-octeon/executive/Makefile | 7 +-
.../mips/cavium-octeon/executive}/cvmx-cmd-queue.c | 8 +-
.../mips/cavium-octeon/executive}/cvmx-fpa.c | 0
.../cavium-octeon/executive}/cvmx-helper-board.c | 38 +-
.../cavium-octeon/executive}/cvmx-helper-fpa.c | 0
.../cavium-octeon/executive}/cvmx-helper-loop.c | 6 +-
.../cavium-octeon/executive}/cvmx-helper-npi.c | 6 +-
.../cavium-octeon/executive}/cvmx-helper-rgmii.c | 17 +-
.../cavium-octeon/executive}/cvmx-helper-sgmii.c | 18 +-
.../cavium-octeon/executive}/cvmx-helper-spi.c | 20 +-
.../cavium-octeon/executive}/cvmx-helper-util.c | 16 +-
.../cavium-octeon/executive}/cvmx-helper-xaui.c | 32 +-
.../mips/cavium-octeon/executive}/cvmx-helper.c | 120 +-
.../executive}/cvmx-interrupt-decodes.c | 10 +-
.../cavium-octeon/executive}/cvmx-interrupt-rsl.c | 4 +-
.../mips/cavium-octeon/executive}/cvmx-pko.c | 8 +-
.../mips/cavium-octeon/executive}/cvmx-spi.c | 12 +-
arch/mips/cavium-octeon/executive/octeon-model.c | 119 +-
arch/mips/cavium-octeon/setup.c | 14 +-
arch/mips/cavium-octeon/smp.c | 2 +-
arch/mips/configs/db1000_defconfig | 369 ++-
arch/mips/configs/db1100_defconfig | 122 -
arch/mips/configs/db1300_defconfig | 391 ++
arch/mips/configs/db1500_defconfig | 128 -
arch/mips/configs/db1550_defconfig | 288 +-
arch/mips/configs/nlm_xlp_defconfig | 570 +++
arch/mips/configs/nlm_xlr_defconfig | 16 +-
arch/mips/configs/pb1200_defconfig | 170 -
arch/mips/dec/setup.c | 1 -
arch/mips/include/asm/Kbuild | 4 +-
arch/mips/include/asm/bmips.h | 110 +
arch/mips/include/asm/bootinfo.h | 1 +
arch/mips/include/asm/branch.h | 5 +
arch/mips/include/asm/cpu.h | 6 +-
arch/mips/include/asm/gio_device.h | 56 +
arch/mips/include/asm/hazards.h | 7 +-
arch/mips/include/asm/hugetlb.h | 2 +-
arch/mips/include/asm/kprobes.h | 5 +
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 81 +-
arch/mips/include/asm/mach-ath79/ar933x_uart.h | 67 +
.../include/asm/mach-ath79/ar933x_uart_platform.h | 18 +
arch/mips/include/asm/mach-ath79/ath79.h | 11 +-
arch/mips/include/asm/mach-ath79/irq.h | 8 +-
arch/mips/include/asm/mach-ath79/pci-ath724x.h | 21 +
arch/mips/include/asm/mach-au1x00/au1000.h | 273 +-
arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 +
arch/mips/include/asm/mach-au1x00/au1200fb.h | 14 +
arch/mips/include/asm/mach-au1x00/au1550nd.h | 16 +
arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 31 +
.../asm/mach-au1x00/cpu-feature-overrides.h | 3 +
arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 241 +
arch/mips/include/asm/mach-au1x00/gpio.h | 3 +
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 597 ++-
arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 +
arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 +
arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h | 12 +-
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 231 +-
arch/mips/include/asm/mach-bcm63xx/ioremap.h | 42 +
arch/mips/include/asm/mach-bcm63xx/irq.h | 7 +
arch/mips/include/asm/mach-db1x00/bcsr.h | 36 +-
arch/mips/include/asm/mach-db1x00/db1200.h | 11 +-
arch/mips/include/asm/mach-db1x00/db1300.h | 40 +
arch/mips/include/asm/mach-db1x00/db1x00.h | 79 -
arch/mips/include/asm/mach-db1x00/irq.h | 23 +
arch/mips/include/asm/mach-generic/floppy.h | 2 +-
arch/mips/include/asm/mach-jazz/floppy.h | 2 +-
.../asm/mach-netlogic/cpu-feature-overrides.h | 23 +-
arch/mips/include/asm/mach-pb1x00/mc146818rtc.h | 34 -
arch/mips/include/asm/mach-pb1x00/pb1000.h | 87 -
arch/mips/include/asm/mach-pb1x00/pb1200.h | 139 -
arch/mips/include/asm/mach-pb1x00/pb1550.h | 73 -
arch/mips/include/asm/mipsregs.h | 9 +-
arch/mips/include/asm/module.h | 6 +-
arch/mips/include/asm/netlogic/common.h | 76 +
arch/mips/include/asm/netlogic/haldefs.h | 163 +
arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 187 +
.../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 83 +
arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 153 +
arch/mips/include/asm/netlogic/xlp-hal/pic.h | 411 ++
arch/mips/include/asm/netlogic/xlp-hal/sys.h | 129 +
arch/mips/include/asm/netlogic/xlp-hal/uart.h | 191 +
.../asm/netlogic/xlp-hal/xlp.h} | 25 +-
arch/mips/include/asm/netlogic/xlr/iomap.h | 22 -
arch/mips/include/asm/netlogic/xlr/msidef.h | 84 +
arch/mips/include/asm/netlogic/xlr/pic.h | 69 +-
arch/mips/include/asm/netlogic/xlr/xlr.h | 13 +-
.../mips/include/asm}/octeon/cvmx-address.h | 0
.../mips/include/asm}/octeon/cvmx-asxx-defs.h | 0
arch/mips/include/asm/octeon/cvmx-bootinfo.h | 82 +-
.../mips/include/asm}/octeon/cvmx-cmd-queue.h | 0
.../mips/include/asm}/octeon/cvmx-config.h | 1 -
.../mips/include/asm}/octeon/cvmx-dbg-defs.h | 0
arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 643 +++
.../mips/include/asm}/octeon/cvmx-fau.h | 0
.../mips/include/asm}/octeon/cvmx-fpa-defs.h | 0
.../mips/include/asm}/octeon/cvmx-fpa.h | 0
.../mips/include/asm}/octeon/cvmx-gmxx-defs.h | 0
.../mips/include/asm}/octeon/cvmx-helper-board.h | 6 +
.../mips/include/asm}/octeon/cvmx-helper-fpa.h | 0
.../mips/include/asm}/octeon/cvmx-helper-loop.h | 1 +
.../mips/include/asm}/octeon/cvmx-helper-npi.h | 1 +
.../mips/include/asm}/octeon/cvmx-helper-rgmii.h | 1 +
.../mips/include/asm}/octeon/cvmx-helper-sgmii.h | 1 +
.../mips/include/asm}/octeon/cvmx-helper-spi.h | 1 +
.../mips/include/asm}/octeon/cvmx-helper-util.h | 0
.../mips/include/asm}/octeon/cvmx-helper-xaui.h | 1 +
.../mips/include/asm}/octeon/cvmx-helper.h | 1 +
.../mips/include/asm}/octeon/cvmx-ipd.h | 0
.../mips/include/asm}/octeon/cvmx-mdio.h | 0
arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1033 ++++-
arch/mips/include/asm/octeon/cvmx-npei-defs.h | 4 +-
arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 609 +++-
.../mips/include/asm}/octeon/cvmx-pcsx-defs.h | 0
.../mips/include/asm}/octeon/cvmx-pcsxx-defs.h | 0
arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 509 ++
arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 19 +-
.../mips/include/asm}/octeon/cvmx-pip-defs.h | 0
.../mips/include/asm}/octeon/cvmx-pip.h | 0
.../mips/include/asm}/octeon/cvmx-pko-defs.h | 0
.../mips/include/asm}/octeon/cvmx-pko.h | 0
.../mips/include/asm}/octeon/cvmx-pow.h | 0
.../mips/include/asm}/octeon/cvmx-scratch.h | 0
arch/mips/include/asm/octeon/cvmx-sli-defs.h | 2172 +++++++++
.../mips/include/asm}/octeon/cvmx-spi.h | 0
.../mips/include/asm}/octeon/cvmx-spxx-defs.h | 0
arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 1036 ++++
.../mips/include/asm}/octeon/cvmx-srxx-defs.h | 0
.../mips/include/asm}/octeon/cvmx-stxx-defs.h | 0
.../mips/include/asm}/octeon/cvmx-wqe.h | 0
arch/mips/include/asm/octeon/cvmx.h | 42 +-
arch/mips/include/asm/octeon/octeon-feature.h | 114 +-
arch/mips/include/asm/octeon/octeon-model.h | 215 +-
arch/mips/include/asm/octeon/pci-octeon.h | 3 +-
arch/mips/include/asm/page.h | 8 +
arch/mips/include/asm/pgtable-32.h | 18 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/include/asm/tlbmisc.h | 10 +
arch/mips/include/asm/traps.h | 13 +
arch/mips/include/asm/types.h | 10 +-
arch/mips/jazz/irq.c | 3 +-
arch/mips/jazz/setup.c | 1 +
arch/mips/jz4740/board-qi_lb60.c | 2 +-
arch/mips/kernel/Makefile | 2 +
arch/mips/kernel/bmips_vec.S | 255 +
arch/mips/kernel/branch.c | 128 +-
arch/mips/kernel/cevt-bcm1480.c | 2 +-
arch/mips/kernel/cevt-ds1287.c | 2 +-
arch/mips/kernel/cevt-gt641xx.c | 2 +-
arch/mips/kernel/cevt-r4k.c | 2 +-
arch/mips/kernel/cevt-sb1250.c | 2 +-
arch/mips/kernel/cevt-txx9.c | 2 +-
arch/mips/kernel/cpu-probe.c | 28 +-
arch/mips/kernel/i8253.c | 2 +-
arch/mips/kernel/kprobes.c | 177 +-
arch/mips/kernel/perf_event_mipsxx.c | 72 +-
arch/mips/kernel/rtlx.c | 1 -
arch/mips/kernel/setup.c | 43 +-
arch/mips/kernel/smp-bmips.c | 458 ++
arch/mips/kernel/smtc.c | 6 +-
arch/mips/kernel/traps.c | 18 +-
arch/mips/lantiq/clk.c | 4 +-
arch/mips/lantiq/irq.c | 13 +-
arch/mips/lantiq/xway/dma.c | 6 +-
arch/mips/lantiq/xway/ebu.c | 6 +-
arch/mips/lantiq/xway/pmu.c | 8 +-
arch/mips/lantiq/xway/reset.c | 6 +-
arch/mips/lib/Makefile | 1 +
arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 2 +-
arch/mips/math-emu/cp1emu.c | 2 +-
arch/mips/mm/Makefile | 5 +-
arch/mips/mm/c-octeon.c | 2 +-
arch/mips/mm/c-r4k.c | 3 +
arch/mips/mm/gup.c | 315 ++
arch/mips/mm/init.c | 9 +-
arch/mips/mm/tlb-r3k.c | 1 +
arch/mips/mm/tlb-r4k.c | 68 +-
arch/mips/mti-malta/malta-int.c | 4 +-
arch/mips/netlogic/Kconfig | 3 -
arch/mips/netlogic/Makefile | 3 +
arch/mips/netlogic/Platform | 13 +-
arch/mips/netlogic/common/Makefile | 3 +
arch/mips/netlogic/common/earlycons.c | 60 +
arch/mips/netlogic/common/irq.c | 238 +
arch/mips/netlogic/{xlr => common}/smp.c | 152 +-
arch/mips/netlogic/common/smpboot.S | 272 ++
arch/mips/netlogic/{xlr => common}/time.c | 6 +-
arch/mips/netlogic/xlp/Makefile | 2 +
arch/mips/netlogic/xlp/nlm_hal.c | 111 +
arch/mips/netlogic/xlp/platform.c | 108 +
arch/mips/netlogic/xlp/setup.c | 105 +
arch/mips/netlogic/xlp/wakeup.c | 102 +
arch/mips/netlogic/xlr/Makefile | 7 +-
arch/mips/netlogic/xlr/irq.c | 300 --
arch/mips/netlogic/xlr/platform.c | 31 +-
arch/mips/netlogic/xlr/setup.c | 31 +-
arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} | 80 +-
arch/mips/pci/Makefile | 3 +-
arch/mips/pci/msi-octeon.c | 2 +-
arch/mips/pci/ops-pmcmsp.c | 2 +-
arch/mips/pci/ops-tx3927.c | 2 +-
arch/mips/pci/pci-alchemy.c | 138 +-
arch/mips/pci/pci-ath724x.c | 174 +
arch/mips/pci/pci-bcm63xx.c | 4 +-
arch/mips/pci/pci-octeon.c | 16 +-
arch/mips/pci/pci-tx4927.c | 2 +-
arch/mips/pci/pci-tx4938.c | 2 +-
arch/mips/pci/pci-tx4939.c | 2 +-
arch/mips/pci/pci-xlr.c | 128 +-
arch/mips/pci/pci.c | 29 +-
arch/mips/pci/pcie-octeon.c | 1349 ++++--
arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 +-
arch/mips/pmc-sierra/msp71xx/msp_setup.c | 2 +-
arch/mips/pmc-sierra/msp71xx/msp_smp.c | 4 +-
arch/mips/pnx8550/common/int.c | 4 +-
arch/mips/pnx8550/common/time.c | 4 +-
arch/mips/sgi-ip22/Makefile | 2 +-
arch/mips/sgi-ip22/ip22-gio.c | 428 ++
arch/mips/sgi-ip22/ip22-int.c | 10 +-
arch/mips/sgi-ip22/ip22-mc.c | 10 +-
arch/mips/sgi-ip22/ip22-setup.c | 21 -
arch/mips/sgi-ip27/ip27-irq.c | 6 +-
arch/mips/sgi-ip27/ip27-timer.c | 2 +-
arch/mips/sgi-ip32/ip32-irq.c | 2 -
arch/mips/sni/irq.c | 2 +-
arch/mips/sni/time.c | 2 +-
arch/mips/txx9/generic/pci.c | 2 +-
arch/mn10300/include/asm/exceptions.h | 2 +-
arch/mn10300/include/asm/param.h | 18 +-
arch/parisc/include/asm/processor.h | 2 -
arch/parisc/kernel/process.c | 1 -
arch/powerpc/kernel/idle.c | 12 +-
arch/powerpc/kernel/machine_kexec_32.c | 4 +-
arch/powerpc/kernel/machine_kexec_64.c | 6 +-
arch/powerpc/mm/numa.c | 2 +-
arch/powerpc/platforms/pseries/hvCall.S | 3 +-
arch/powerpc/platforms/pseries/lpar.c | 14 +-
arch/powerpc/platforms/pseries/nvram.c | 1 -
arch/s390/include/asm/chpid.h | 2 +-
arch/s390/include/asm/itcw.h | 2 +-
arch/s390/include/asm/mman.h | 4 +-
arch/s390/include/asm/processor.h | 2 +-
arch/s390/kernel/nmi.c | 2 +-
arch/sh/boards/mach-ap325rxa/setup.c | 2 +-
arch/sh/boards/mach-ecovec24/setup.c | 2 +-
arch/sh/boards/mach-kfr2r09/setup.c | 2 +-
arch/sh/boards/mach-migor/setup.c | 4 +-
arch/sh/boards/mach-se/7724/setup.c | 2 +-
arch/sh/kernel/process_32.c | 2 +-
arch/sh/kernel/process_64.c | 2 +-
arch/sparc/include/asm/siginfo.h | 2 -
arch/tile/include/asm/signal.h | 4 +-
arch/tile/kernel/machine_kexec.c | 6 +-
arch/x86/Kconfig | 3 +
arch/x86/Kconfig.cpu | 6 -
arch/x86/include/asm/atomic64_32.h | 2 +-
arch/x86/include/asm/debugreg.h | 22 +
arch/x86/include/asm/desc.h | 12 +
arch/x86/kernel/apic/x2apic_uv_x.c | 7 +-
arch/x86/kernel/apm_32.c | 16 +-
arch/x86/kernel/cpu/common.c | 24 +
arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
arch/x86/kernel/entry_64.S | 218 +-
arch/x86/kernel/head_64.S | 4 +
arch/x86/kernel/nmi.c | 102 +
arch/x86/kernel/traps.c | 20 +
arch/x86/kvm/mmu.c | 2 +-
arch/x86/kvm/vmx.c | 18 +-
arch/x86/kvm/x86.c | 4 +-
arch/x86/mm/mmio-mod.c | 4 +-
arch/x86/mm/numa.c | 2 +-
arch/x86/platform/geode/alix.c | 2 +-
arch/x86/platform/iris/iris.c | 2 +-
arch/x86/um/Kconfig | 8 -
block/blk-cgroup.c | 11 +-
block/blk-core.c | 203 +-
block/blk-exec.c | 8 +-
block/blk-ioc.c | 485 ++-
block/blk-settings.c | 32 +-
block/blk-sysfs.c | 12 +-
block/blk-throttle.c | 4 +-
block/blk.h | 58 +-
block/bsg.c | 4 +-
block/cfq-iosched.c | 619 +--
block/compat_ioctl.c | 3 +
block/deadline-iosched.c | 4 +-
block/elevator.c | 217 +-
block/genhd.c | 2 +-
block/ioctl.c | 2 +
block/noop-iosched.c | 4 +-
block/scsi_ioctl.c | 52 +
crypto/crypto_user.c | 2 +-
drivers/Makefile | 2 +-
drivers/accessibility/braille/braille_console.c | 2 +-
drivers/acpi/acpica/acglobal.h | 2 +-
drivers/acpi/apei/ghes.c | 2 +-
drivers/acpi/apei/hest.c | 2 +-
drivers/acpi/dock.c | 2 +-
drivers/acpi/pci_slot.c | 2 +-
drivers/acpi/video.c | 6 +-
drivers/ata/sata_nv.c | 6 +-
drivers/ata/sata_sil24.c | 2 +-
drivers/atm/he.c | 6 +-
drivers/base/Kconfig | 2 +-
drivers/base/memory.c | 17 +-
drivers/block/Kconfig | 2 +
drivers/block/Makefile | 1 +
drivers/block/cciss.c | 6 +-
drivers/block/drbd/drbd_int.h | 4 +-
drivers/block/drbd/drbd_main.c | 4 +-
drivers/block/mtip32xx/Kconfig | 9 +
drivers/block/mtip32xx/Makefile | 5 +
drivers/block/mtip32xx/mtip32xx.c | 3651 ++++++++++++++
drivers/block/mtip32xx/mtip32xx.h | 423 ++
drivers/block/paride/bpck6.c | 5 +-
drivers/block/paride/pcd.c | 2 +-
drivers/block/paride/pd.c | 3 +-
drivers/block/paride/pf.c | 4 +-
drivers/block/paride/pg.c | 3 +-
drivers/block/paride/pt.c | 4 +-
drivers/block/rbd.c | 2 +
drivers/block/sx8.c | 12 +-
drivers/block/ub.c | 3 +-
drivers/block/virtio_blk.c | 4 +-
drivers/block/xd.c | 2 +-
drivers/block/xen-blkback/blkback.c | 84 +-
drivers/block/xen-blkback/common.h | 67 +-
drivers/block/xen-blkback/xenbus.c | 12 +
drivers/block/xen-blkfront.c | 79 +-
drivers/bluetooth/btusb.c | 12 +-
drivers/bluetooth/hci_bcsp.c | 4 +-
drivers/bluetooth/hci_ldisc.c | 2 +-
drivers/cdrom/cdrom.c | 15 +-
drivers/char/agp/amd64-agp.c | 2 +-
drivers/char/agp/sis-agp.c | 2 +-
drivers/char/i8k.c | 8 +-
drivers/char/ipmi/ipmi_si_intf.c | 2 +-
drivers/char/lp.c | 2 +-
drivers/char/nwflash.c | 2 +-
drivers/char/pcmcia/synclink_cs.c | 2 +-
drivers/char/ramoops.c | 24 +-
drivers/char/random.c | 2 +-
drivers/char/tpm/tpm_tis.c | 6 +-
drivers/edac/r82600_edac.c | 2 +-
drivers/firewire/sbp2.c | 2 +-
drivers/gpio/Kconfig | 1 +
drivers/gpio/Makefile | 2 +-
drivers/gpio/devres.c | 90 +
drivers/gpio/gpio-pl061.c | 200 +-
drivers/gpio/gpio-sa1100.c | 6 +
drivers/gpio/gpio-stmpe.c | 25 +-
drivers/gpio/gpio-tegra.c | 9 +-
drivers/gpu/drm/gma500/cdv_intel_crt.c | 6 +
drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 14 +-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 6 +
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 +
drivers/gpu/drm/nouveau/nouveau_acpi.c | 79 +-
drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +
drivers/gpu/drm/nouveau/nouveau_state.c | 1 +
drivers/gpu/drm/radeon/evergreen_cs.c | 3 +-
drivers/gpu/drm/radeon/r100.c | 4 +-
drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
drivers/gpu/drm/radeon/rs600.c | 13 +-
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 5 +-
drivers/hid/hid-prodikeys.c | 2 +-
drivers/hwmon/abituguru.c | 2 +-
drivers/hwmon/abituguru3.c | 4 +-
drivers/hwmon/acpi_power_meter.c | 2 +-
drivers/hwmon/adm1021.c | 2 +-
drivers/hwmon/ads7828.c | 4 +-
drivers/hwmon/dme1737.c | 4 +-
drivers/hwmon/emc2103.c | 2 +-
drivers/hwmon/it87.c | 4 +-
drivers/hwmon/lm93.c | 4 +-
drivers/hwmon/max1668.c | 2 +-
drivers/hwmon/w83627hf.c | 2 +-
drivers/hwmon/w83781d.c | 4 +-
drivers/hwmon/w83791d.c | 4 +-
drivers/hwmon/w83792d.c | 2 +-
drivers/hwmon/w83793.c | 2 +-
drivers/hwmon/w83795.c | 2 +-
drivers/hwmon/w83l786ng.c | 2 +-
drivers/i2c/busses/Kconfig | 4 +-
drivers/i2c/busses/i2c-ali1535.c | 38 +-
drivers/i2c/busses/i2c-ali1563.c | 2 +-
drivers/i2c/busses/i2c-ali15x3.c | 2 +-
drivers/i2c/busses/i2c-amd756.c | 2 +-
drivers/i2c/busses/i2c-amd8111.c | 2 +-
drivers/i2c/busses/i2c-at91.c | 17 +-
drivers/i2c/busses/i2c-au1550.c | 13 +-
drivers/i2c/busses/i2c-cpm.c | 13 +-
drivers/i2c/busses/i2c-designware-pcidrv.c | 2 +-
drivers/i2c/busses/i2c-eg20t.c | 2 +-
drivers/i2c/busses/i2c-highlander.c | 15 +-
drivers/i2c/busses/i2c-hydra.c | 2 +-
drivers/i2c/busses/i2c-i801.c | 2 +-
drivers/i2c/busses/i2c-ibm_iic.c | 17 +-
drivers/i2c/busses/i2c-intel-mid.c | 2 +-
drivers/i2c/busses/i2c-iop3xx.c | 16 +-
drivers/i2c/busses/i2c-isch.c | 13 +-
drivers/i2c/busses/i2c-ixp2000.c | 13 +-
drivers/i2c/busses/i2c-mpc.c | 13 +-
drivers/i2c/busses/i2c-mv64xxx.c | 15 +-
drivers/i2c/busses/i2c-nforce2.c | 4 +-
drivers/i2c/busses/i2c-ocores.c | 17 +-
drivers/i2c/busses/i2c-octeon.c | 16 +-
drivers/i2c/busses/i2c-pasemi.c | 2 +-
drivers/i2c/busses/i2c-pca-platform.c | 14 +-
drivers/i2c/busses/i2c-piix4.c | 2 +-
drivers/i2c/busses/i2c-pmcmsp.c | 17 +-
drivers/i2c/busses/i2c-powermac.c | 19 +-
drivers/i2c/busses/i2c-pxa-pci.c | 2 +-
drivers/i2c/busses/i2c-sh7760.c | 13 +-
drivers/i2c/busses/i2c-simtec.c | 18 +-
drivers/i2c/busses/i2c-sis5595.c | 6 +-
drivers/i2c/busses/i2c-sis630.c | 12 +-
drivers/i2c/busses/i2c-sis96x.c | 2 +-
drivers/i2c/busses/i2c-via.c | 2 +-
drivers/i2c/busses/i2c-viapro.c | 11 +-
drivers/i2c/busses/i2c-xiic.c | 18 +-
drivers/i2c/busses/scx200_acb.c | 2 +-
drivers/i2c/i2c-dev.c | 13 +-
drivers/i2c/muxes/gpio-i2cmux.c | 13 +-
drivers/ide/ali14xx.c | 2 +-
drivers/ide/cmd640.c | 2 +-
drivers/ide/dtc2278.c | 2 +-
drivers/ide/gayle.c | 2 +-
drivers/ide/ht6560b.c | 2 +-
drivers/ide/ide-4drives.c | 2 +-
drivers/ide/ide-acpi.c | 6 +-
drivers/ide/ide-floppy_ioctl.c | 3 +-
drivers/ide/ide-pci-generic.c | 2 +-
drivers/ide/qd65xx.c | 2 +-
drivers/ide/umc8672.c | 2 +-
drivers/infiniband/hw/ehca/ehca_classes.h | 4 +-
drivers/infiniband/hw/ehca/ehca_main.c | 10 +-
drivers/infiniband/hw/nes/nes.c | 2 +-
drivers/input/joystick/xpad.c | 6 +-
drivers/input/misc/ab8500-ponkey.c | 2 +-
drivers/input/misc/wistron_btns.c | 2 +-
drivers/input/mouse/psmouse-base.c | 2 +-
drivers/input/mouse/synaptics_i2c.c | 6 +-
drivers/input/serio/hp_sdc.c | 2 +-
drivers/input/touchscreen/eeti_ts.c | 4 +-
drivers/input/touchscreen/htcpen.c | 4 +-
drivers/input/touchscreen/ucb1400_ts.c | 2 +-
drivers/input/touchscreen/usbtouchscreen.c | 4 +-
drivers/isdn/hardware/avm/b1dma.c | 2 +-
drivers/isdn/hardware/avm/c4.c | 2 +-
drivers/isdn/i4l/Kconfig | 2 +-
drivers/isdn/sc/init.c | 2 +-
drivers/leds/Kconfig | 7 +
drivers/leds/Makefile | 1 +
drivers/leds/leds-clevo-mail.c | 2 +-
drivers/leds/leds-max8997.c | 372 ++
drivers/leds/leds-ss4200.c | 2 +-
drivers/macintosh/ams/ams-core.c | 2 +-
drivers/macintosh/ams/ams-input.c | 4 +-
drivers/macintosh/therm_adt746x.c | 2 +-
drivers/md/dm-flakey.c | 11 +-
drivers/md/dm-linear.c | 12 +-
drivers/md/dm-mpath.c | 6 +
drivers/md/dm-table.c | 6 +-
drivers/md/md.c | 1 +
drivers/media/common/tuners/Kconfig | 9 +-
drivers/media/common/tuners/Makefile | 1 +
drivers/media/common/tuners/max2165.c | 39 +-
drivers/media/common/tuners/mc44s803.c | 10 +-
drivers/media/common/tuners/mt2060.c | 13 +-
drivers/media/common/tuners/mt2060_priv.h | 1 -
drivers/media/common/tuners/mt2063.c | 2307 +++++++++
drivers/media/common/tuners/mt2063.h | 36 +
drivers/media/common/tuners/mt2131.c | 20 +-
drivers/media/common/tuners/mt2131_priv.h | 1 -
drivers/media/common/tuners/mt2266.c | 25 +-
drivers/media/common/tuners/mxl5005s.c | 69 +-
drivers/media/common/tuners/mxl5007t.c | 98 +-
drivers/media/common/tuners/qt1010.c | 21 +-
drivers/media/common/tuners/qt1010_priv.h | 1 -
drivers/media/common/tuners/tda18212.c | 72 +-
drivers/media/common/tuners/tda18212.h | 4 +
drivers/media/common/tuners/tda18218.c | 34 +-
drivers/media/common/tuners/tda18218_priv.h | 2 +
drivers/media/common/tuners/tda18271-fe.c | 83 +-
drivers/media/common/tuners/tda18271-maps.c | 4 +
drivers/media/common/tuners/tda18271-priv.h | 2 +
drivers/media/common/tuners/tda18271.h | 1 +
drivers/media/common/tuners/tda827x.c | 52 +-
drivers/media/common/tuners/tuner-simple.c | 68 +-
drivers/media/common/tuners/tuner-xc2028.c | 116 +-
drivers/media/common/tuners/xc4000.c | 105 +-
drivers/media/common/tuners/xc5000.c | 147 +-
drivers/media/dvb/b2c2/flexcop.c | 29 +-
drivers/media/dvb/bt8xx/dst.c | 72 +-
drivers/media/dvb/bt8xx/dst_common.h | 2 +-
drivers/media/dvb/bt8xx/dvb-bt8xx.c | 205 +-
drivers/media/dvb/ddbridge/ddbridge-core.c | 2 +-
drivers/media/dvb/dm1105/dm1105.c | 7 +-
drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 4 +
drivers/media/dvb/dvb-core/dvb_frontend.c | 885 +++--
drivers/media/dvb/dvb-core/dvb_frontend.h | 27 +-
drivers/media/dvb/dvb-core/dvb_net.c | 4 +-
drivers/media/dvb/dvb-usb/Kconfig | 5 +-
drivers/media/dvb/dvb-usb/af9005-fe.c | 105 +-
drivers/media/dvb/dvb-usb/af9005.c | 25 +-
drivers/media/dvb/dvb-usb/af9005.h | 2 +-
drivers/media/dvb/dvb-usb/af9015.c | 492 ++-
drivers/media/dvb/dvb-usb/af9015.h | 6 +
drivers/media/dvb/dvb-usb/anysee.c | 411 ++-
drivers/media/dvb/dvb-usb/anysee.h | 6 +
drivers/media/dvb/dvb-usb/cinergyT2-fe.c | 33 +-
drivers/media/dvb/dvb-usb/cxusb.c | 11 +-
drivers/media/dvb/dvb-usb/dib0700_devices.c | 717 +++-
drivers/media/dvb/dvb-usb/digitv.c | 4 +-
drivers/media/dvb/dvb-usb/dtt200u-fe.c | 33 +-
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 8 +-
drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 +
drivers/media/dvb/dvb-usb/dw2102.c | 93 +-
drivers/media/dvb/dvb-usb/friio-fe.c | 29 +-
drivers/media/dvb/dvb-usb/gp8psk-fe.c | 24 +-
drivers/media/dvb/dvb-usb/it913x.c | 336 +-
drivers/media/dvb/dvb-usb/lmedm04.c | 8 +-
drivers/media/dvb/dvb-usb/mxl111sf-demod.c | 42 +-
drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | 102 +-
drivers/media/dvb/dvb-usb/mxl111sf.c | 16 +-
drivers/media/dvb/dvb-usb/ttusb2.c | 19 +-
drivers/media/dvb/dvb-usb/vp702x-fe.c | 20 +-
drivers/media/dvb/dvb-usb/vp7045-fe.c | 32 +-
drivers/media/dvb/firewire/firedtv-avc.c | 98 +-
drivers/media/dvb/firewire/firedtv-dvb.c | 5 +-
drivers/media/dvb/firewire/firedtv-fe.c | 35 +-
drivers/media/dvb/firewire/firedtv.h | 4 +-
drivers/media/dvb/frontends/Kconfig | 7 +
drivers/media/dvb/frontends/Makefile | 1 +
drivers/media/dvb/frontends/af9013.c | 1783 ++++----
drivers/media/dvb/frontends/af9013.h | 113 +-
drivers/media/dvb/frontends/af9013_priv.h | 93 +-
drivers/media/dvb/frontends/atbm8830.c | 27 +-
drivers/media/dvb/frontends/au8522_dig.c | 58 +-
drivers/media/dvb/frontends/bcm3510.c | 18 +-
drivers/media/dvb/frontends/bsbe1.h | 7 +-
drivers/media/dvb/frontends/bsru6.h | 9 +-
drivers/media/dvb/frontends/cx22700.c | 51 +-
drivers/media/dvb/frontends/cx22702.c | 69 +-
drivers/media/dvb/frontends/cx24110.c | 20 +-
drivers/media/dvb/frontends/cx24113.c | 10 +-
drivers/media/dvb/frontends/cx24116.c | 36 +-
drivers/media/dvb/frontends/cx24123.c | 56 +-
drivers/media/dvb/frontends/cxd2820r.h | 13 -
drivers/media/dvb/frontends/cxd2820r_c.c | 25 +-
drivers/media/dvb/frontends/cxd2820r_core.c | 641 +--
drivers/media/dvb/frontends/cxd2820r_priv.h | 23 +-
drivers/media/dvb/frontends/cxd2820r_t.c | 63 +-
drivers/media/dvb/frontends/cxd2820r_t2.c | 70 +-
drivers/media/dvb/frontends/dib0070.c | 10 +-
drivers/media/dvb/frontends/dib0090.c | 165 +-
drivers/media/dvb/frontends/dib0090.h | 54 +-
drivers/media/dvb/frontends/dib3000mb.c | 113 +-
drivers/media/dvb/frontends/dib3000mb_priv.h | 2 +-
drivers/media/dvb/frontends/dib3000mc.c | 132 +-
drivers/media/dvb/frontends/dib7000m.c | 136 +-
drivers/media/dvb/frontends/dib7000p.c | 456 +-
drivers/media/dvb/frontends/dib7000p.h | 16 +-
drivers/media/dvb/frontends/dib8000.c | 1073 ++++-
drivers/media/dvb/frontends/dib8000.h | 42 +-
drivers/media/dvb/frontends/dib9000.c | 36 +-
drivers/media/dvb/frontends/dibx000_common.h | 17 +-
drivers/media/dvb/frontends/drxd.h | 2 -
drivers/media/dvb/frontends/drxd_hard.c | 62 +-
drivers/media/dvb/frontends/drxk.h | 11 +-
drivers/media/dvb/frontends/drxk_hard.c | 314 +-
drivers/media/dvb/frontends/drxk_hard.h | 8 +-
drivers/media/dvb/frontends/ds3000.c | 36 +-
drivers/media/dvb/frontends/dvb-pll.c | 65 +-
drivers/media/dvb/frontends/dvb_dummy_fe.c | 18 +-
drivers/media/dvb/frontends/ec100.c | 20 +-
drivers/media/dvb/frontends/hd29l2.c | 861 ++++
drivers/media/dvb/frontends/hd29l2.h | 66 +
drivers/media/dvb/frontends/hd29l2_priv.h | 314 ++
drivers/media/dvb/frontends/it913x-fe-priv.h | 806 +++-
drivers/media/dvb/frontends/it913x-fe.c | 289 +-
drivers/media/dvb/frontends/it913x-fe.h | 43 +-
drivers/media/dvb/frontends/itd1000.c | 7 +-
drivers/media/dvb/frontends/ix2505v.c | 8 +-
drivers/media/dvb/frontends/l64781.c | 117 +-
drivers/media/dvb/frontends/lgdt3305.c | 98 +-
drivers/media/dvb/frontends/lgdt330x.c | 37 +-
drivers/media/dvb/frontends/lgs8gl5.c | 29 +-
drivers/media/dvb/frontends/lgs8gxx.c | 26 +-
drivers/media/dvb/frontends/mb86a16.c | 8 +-
drivers/media/dvb/frontends/mb86a20s.c | 546 ++-
drivers/media/dvb/frontends/mt312.c | 37 +-
drivers/media/dvb/frontends/mt352.c | 65 +-
drivers/media/dvb/frontends/nxt200x.c | 17 +-
drivers/media/dvb/frontends/nxt6000.c | 32 +-
drivers/media/dvb/frontends/or51132.c | 52 +-
drivers/media/dvb/frontends/or51211.c | 13 +-
drivers/media/dvb/frontends/s5h1409.c | 48 +-
drivers/media/dvb/frontends/s5h1411.c | 48 +-
drivers/media/dvb/frontends/s5h1420.c | 71 +-
drivers/media/dvb/frontends/s5h1432.c | 36 +-
drivers/media/dvb/frontends/s921.c | 23 +-
drivers/media/dvb/frontends/si21xx.c | 20 +-
drivers/media/dvb/frontends/sp8870.c | 29 +-
drivers/media/dvb/frontends/sp887x.c | 50 +-
drivers/media/dvb/frontends/stb0899_drv.c | 37 +-
drivers/media/dvb/frontends/stb6000.c | 8 +-
drivers/media/dvb/frontends/stb6100.c | 6 +-
drivers/media/dvb/frontends/stv0288.c | 17 +-
drivers/media/dvb/frontends/stv0297.c | 37 +-
drivers/media/dvb/frontends/stv0299.c | 32 +-
drivers/media/dvb/frontends/stv0367.c | 156 +-
drivers/media/dvb/frontends/stv0900_core.c | 37 +-
drivers/media/dvb/frontends/stv090x.c | 13 +-
drivers/media/dvb/frontends/stv6110.c | 3 +-
drivers/media/dvb/frontends/tda10021.c | 111 +-
drivers/media/dvb/frontends/tda10023.c | 103 +-
drivers/media/dvb/frontends/tda10048.c | 83 +-
drivers/media/dvb/frontends/tda1004x.c | 111 +-
drivers/media/dvb/frontends/tda10071.c | 8 +-
drivers/media/dvb/frontends/tda10086.c | 62 +-
drivers/media/dvb/frontends/tda18271c2dd.c | 52 +-
drivers/media/dvb/frontends/tda8083.c | 19 +-
drivers/media/dvb/frontends/tda826x.c | 7 +-
drivers/media/dvb/frontends/tdhd1.h | 11 +-
drivers/media/dvb/frontends/tua6100.c | 31 +-
drivers/media/dvb/frontends/ves1820.c | 23 +-
drivers/media/dvb/frontends/ves1x93.c | 23 +-
drivers/media/dvb/frontends/zl10036.c | 10 +-
drivers/media/dvb/frontends/zl10039.c | 10 +-
drivers/media/dvb/frontends/zl10353.c | 116 +-
drivers/media/dvb/mantis/mantis_vp1033.c | 8 +-
drivers/media/dvb/mantis/mantis_vp2033.c | 9 +-
drivers/media/dvb/mantis/mantis_vp2040.c | 9 +-
drivers/media/dvb/ngene/ngene-cards.c | 2 +-
drivers/media/dvb/pluto2/pluto2.c | 6 +-
drivers/media/dvb/pt1/va1j5jf8007s.c | 6 +-
drivers/media/dvb/pt1/va1j5jf8007t.c | 6 +-
drivers/media/dvb/siano/smsdvb.c | 33 +-
drivers/media/dvb/ttpci/av7110.c | 102 +-
drivers/media/dvb/ttpci/av7110.h | 3 +-
drivers/media/dvb/ttpci/budget-av.c | 50 +-
drivers/media/dvb/ttpci/budget-ci.c | 51 +-
drivers/media/dvb/ttpci/budget-patch.c | 27 +-
drivers/media/dvb/ttpci/budget.c | 68 +-
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 102 +-
drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 14 +-
drivers/media/media-device.c | 3 +-
drivers/media/radio/Kconfig | 297 +-
drivers/media/radio/radio-gemtek.c | 10 +-
drivers/media/radio/radio-miropcm20.c | 2 +-
drivers/media/radio/radio-si4713.c | 15 +-
drivers/media/radio/radio-timb.c | 15 +-
drivers/media/radio/radio-wl1273.c | 17 +-
drivers/media/radio/tef6862.c | 8 +-
drivers/media/radio/wl128x/Kconfig | 2 +-
drivers/media/radio/wl128x/fmdrv_common.c | 58 +-
drivers/media/radio/wl128x/fmdrv_common.h | 28 +-
drivers/media/radio/wl128x/fmdrv_rx.c | 84 +-
drivers/media/radio/wl128x/fmdrv_rx.h | 50 +-
drivers/media/radio/wl128x/fmdrv_tx.c | 61 +-
drivers/media/radio/wl128x/fmdrv_tx.h | 20 +-
drivers/media/radio/wl128x/fmdrv_v4l2.c | 1 +
drivers/media/rc/Kconfig | 10 +
drivers/media/rc/Makefile | 1 +
drivers/media/rc/ir-nec-decoder.c | 4 +-
drivers/media/rc/ir-raw.c | 1 +
drivers/media/rc/ir-rc6-decoder.c | 67 +-
drivers/media/rc/ir-sanyo-decoder.c | 205 +
drivers/media/rc/keymaps/rc-hauppauge.c | 51 +
drivers/media/rc/keymaps/rc-videomate-m1f.c | 24 +-
drivers/media/rc/lirc_dev.c | 2 +-
drivers/media/rc/mceusb.c | 4 +-
drivers/media/rc/rc-core-priv.h | 12 +
drivers/media/rc/rc-main.c | 1 +
drivers/media/rc/redrat3.c | 52 +-
drivers/media/rc/streamzap.c | 4 +-
drivers/media/rc/winbond-cir.c | 4 +-
drivers/media/video/Kconfig | 427 +-
drivers/media/video/Makefile | 4 +
drivers/media/video/adv7170.c | 62 +
drivers/media/video/as3645a.c | 904 ++++
drivers/media/video/atmel-isi.c | 35 +-
drivers/media/video/au0828/Kconfig | 1 +
drivers/media/video/au0828/au0828-i2c.c | 2 +-
drivers/media/video/bt8xx/bt848.h | 5 +-
drivers/media/video/bt8xx/bttv-cards.c | 58 +-
drivers/media/video/bt8xx/bttv-driver.c | 1 +
drivers/media/video/bt8xx/bttv-i2c.c | 2 +-
drivers/media/video/bt8xx/bttv.h | 3 +-
drivers/media/video/c-qcam.c | 2 +-
drivers/media/video/cs5345.c | 2 +-
drivers/media/video/cs53l32a.c | 2 +-
drivers/media/video/cx18/cx18-driver.c | 2 +-
drivers/media/video/cx18/cx18-i2c.c | 2 +-
drivers/media/video/cx18/cx18-i2c.h | 2 +-
drivers/media/video/cx231xx/Kconfig | 6 +-
drivers/media/video/cx231xx/cx231xx-audio.c | 24 +-
drivers/media/video/cx231xx/cx231xx-cards.c | 86 +-
drivers/media/video/cx231xx/cx231xx-core.c | 7 +-
drivers/media/video/cx231xx/cx231xx-dvb.c | 4 +-
drivers/media/video/cx231xx/cx231xx-input.c | 11 +-
drivers/media/video/cx231xx/cx231xx-vbi.c | 4 +-
drivers/media/video/cx231xx/cx231xx-video.c | 14 +-
drivers/media/video/cx231xx/cx231xx.h | 2 +-
drivers/media/video/cx23885/cx23885-417.c | 141 +-
drivers/media/video/cx23885/cx23885-cards.c | 75 +-
drivers/media/video/cx23885/cx23885-core.c | 24 +-
drivers/media/video/cx23885/cx23885-dvb.c | 108 +-
drivers/media/video/cx23885/cx23885-i2c.c | 2 +-
drivers/media/video/cx23885/cx23885-video.c | 175 +-
drivers/media/video/cx23885/cx23885.h | 14 +
drivers/media/video/cx25821/cx25821-alsa.c | 75 +-
.../media/video/cx25821/cx25821-audio-upstream.c | 113 +-
drivers/media/video/cx25821/cx25821-audio.h | 39 +-
drivers/media/video/cx25821/cx25821-cards.c | 2 +-
drivers/media/video/cx25821/cx25821-core.c | 57 +-
drivers/media/video/cx25821/cx25821-i2c.c | 12 +-
.../media/video/cx25821/cx25821-medusa-defines.h | 6 +-
drivers/media/video/cx25821/cx25821-medusa-reg.h | 518 +-
drivers/media/video/cx25821/cx25821-medusa-video.c | 410 +-
.../video/cx25821/cx25821-video-upstream-ch2.c | 138 +-
.../media/video/cx25821/cx25821-video-upstream.c | 156 +-
drivers/media/video/cx25821/cx25821-video.c | 145 +-
drivers/media/video/cx25821/cx25821.h | 4 +-
drivers/media/video/cx25840/cx25840-audio.c | 10 +-
drivers/media/video/cx25840/cx25840-core.c | 3241 +++++++++++++-
drivers/media/video/cx88/Kconfig | 10 +-
drivers/media/video/cx88/cx88-alsa.c | 2 +-
drivers/media/video/cx88/cx88-cards.c | 94 +-
drivers/media/video/cx88/cx88-dvb.c | 30 +-
drivers/media/video/cx88/cx88-i2c.c | 2 +-
drivers/media/video/cx88/cx88-input.c | 4 +
drivers/media/video/cx88/cx88.h | 2 +
drivers/media/video/davinci/dm355_ccdc.c | 13 +-
drivers/media/video/davinci/dm644x_ccdc.c | 13 +-
drivers/media/video/davinci/isif.c | 13 +-
drivers/media/video/davinci/vpbe.c | 76 +-
drivers/media/video/davinci/vpbe_display.c | 43 +-
drivers/media/video/davinci/vpbe_osd.c | 491 ++-
drivers/media/video/davinci/vpbe_venc.c | 223 +-
drivers/media/video/davinci/vpfe_capture.c | 18 +-
drivers/media/video/davinci/vpif_capture.c | 14 +-
drivers/media/video/em28xx/em28xx-audio.c | 2 +-
drivers/media/video/em28xx/em28xx-cards.c | 256 +-
drivers/media/video/em28xx/em28xx-core.c | 61 +-
drivers/media/video/em28xx/em28xx-dvb.c | 190 +-
drivers/media/video/em28xx/em28xx-input.c | 7 +-
drivers/media/video/em28xx/em28xx-reg.h | 5 +
drivers/media/video/em28xx/em28xx-video.c | 14 +-
drivers/media/video/em28xx/em28xx.h | 8 +-
drivers/media/video/et61x251/et61x251_core.c | 4 +-
drivers/media/video/fsl-viu.c | 13 +-
drivers/media/video/gspca/Kconfig | 10 +
drivers/media/video/gspca/Makefile | 2 +
drivers/media/video/gspca/benq.c | 7 +-
drivers/media/video/gspca/gl860/gl860.c | 1 -
drivers/media/video/gspca/gspca.c | 73 +-
drivers/media/video/gspca/gspca.h | 5 +-
drivers/media/video/gspca/jl2005bcd.c | 554 +++
drivers/media/video/gspca/konica.c | 3 -
drivers/media/video/gspca/m5602/m5602_core.c | 4 +-
drivers/media/video/gspca/m5602/m5602_mt9m111.h | 2 +-
drivers/media/video/gspca/m5602/m5602_ov7660.h | 2 +-
drivers/media/video/gspca/m5602/m5602_ov9650.h | 2 +-
drivers/media/video/gspca/m5602/m5602_po1030.h | 2 +-
drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 2 +-
drivers/media/video/gspca/m5602/m5602_s5k83a.h | 2 +-
drivers/media/video/gspca/mars.c | 1 -
drivers/media/video/gspca/nw80x.c | 2 +-
drivers/media/video/gspca/ov519.c | 5 +-
drivers/media/video/gspca/ov534_9.c | 141 +-
drivers/media/video/gspca/pac207.c | 10 +-
drivers/media/video/gspca/pac7302.c | 1 +
drivers/media/video/gspca/se401.c | 10 +-
drivers/media/video/gspca/sn9c20x.c | 38 +
drivers/media/video/gspca/sonixb.c | 15 +-
drivers/media/video/gspca/sonixj.c | 18 +-
drivers/media/video/gspca/spca561.c | 2 +-
drivers/media/video/gspca/stv06xx/stv06xx.c | 8 +-
drivers/media/video/gspca/t613.c | 25 +
drivers/media/video/gspca/topro.c | 2 +-
drivers/media/video/gspca/vicam.c | 3 +-
drivers/media/video/gspca/xirlink_cit.c | 6 +-
drivers/media/video/gspca/zc3xx.c | 117 +-
drivers/media/video/hdpvr/hdpvr-core.c | 2 +-
drivers/media/video/ir-kbd-i2c.c | 25 +-
drivers/media/video/ivtv/ivtv-driver.c | 2 +-
drivers/media/video/ivtv/ivtv-i2c.h | 2 +-
drivers/media/video/ivtv/ivtvfb.c | 2 +-
drivers/media/video/m5mols/m5mols.h | 46 +-
drivers/media/video/m5mols/m5mols_capture.c | 83 +-
drivers/media/video/m5mols/m5mols_core.c | 288 +-
drivers/media/video/m5mols/m5mols_reg.h | 247 +-
drivers/media/video/marvell-ccic/mcam-core.c | 42 +-
drivers/media/video/marvell-ccic/mmp-driver.c | 35 +
drivers/media/video/msp3400-driver.c | 6 +-
drivers/media/video/msp3400-driver.h | 6 +-
drivers/media/video/mt9m001.c | 5 +-
drivers/media/video/mt9m111.c | 380 +-
drivers/media/video/mt9p031.c | 5 +-
drivers/media/video/mt9t001.c | 5 +-
drivers/media/video/mt9t031.c | 5 +-
drivers/media/video/mt9v022.c | 5 +-
drivers/media/video/mt9v032.c | 8 +-
drivers/media/video/mx1_camera.c | 2 +-
drivers/media/video/mx2_camera.c | 299 +-
drivers/media/video/mx3_camera.c | 17 +-
drivers/media/video/omap/omap_vout.c | 226 +-
drivers/media/video/omap/omap_vout_vrfb.c | 2 +-
drivers/media/video/omap/omap_voutdef.h | 2 +-
drivers/media/video/omap1_camera.c | 16 +-
drivers/media/video/omap24xxcam.c | 19 +-
drivers/media/video/omap3isp/isp.c | 72 +-
drivers/media/video/omap3isp/ispccdc.c | 14 +-
drivers/media/video/omap3isp/ispccdc.h | 2 -
drivers/media/video/omap3isp/ispccp2.c | 22 +-
drivers/media/video/omap3isp/ispccp2.h | 3 +-
drivers/media/video/omap3isp/ispcsi2.c | 18 +-
drivers/media/video/omap3isp/ispcsi2.h | 2 +-
drivers/media/video/omap3isp/isppreview.c | 25 +-
drivers/media/video/omap3isp/isppreview.h | 2 -
drivers/media/video/omap3isp/ispresizer.c | 7 +-
drivers/media/video/omap3isp/ispresizer.h | 1 -
drivers/media/video/omap3isp/ispvideo.c | 27 +-
drivers/media/video/omap3isp/ispvideo.h | 8 +-
drivers/media/video/ov7670.c | 2 +-
drivers/media/video/pvrusb2/pvrusb2-hdw.c | 5 +-
drivers/media/video/pwc/pwc-ctrl.c | 726 +---
drivers/media/video/pwc/pwc-dec23.c | 288 +-
drivers/media/video/pwc/pwc-dec23.h | 5 +-
drivers/media/video/pwc/pwc-if.c | 297 +-
drivers/media/video/pwc/pwc-kiara.h | 2 +-
drivers/media/video/pwc/pwc-misc.c | 87 +-
drivers/media/video/pwc/pwc-timon.h | 2 +-
drivers/media/video/pwc/pwc-uncompress.c | 46 +-
drivers/media/video/pwc/pwc-v4l.c | 258 +-
drivers/media/video/pwc/pwc.h | 66 +-
drivers/media/video/pxa_camera.c | 17 +-
drivers/media/video/s5p-fimc/fimc-capture.c | 11 +
drivers/media/video/s5p-fimc/fimc-core.c | 134 +-
drivers/media/video/s5p-fimc/fimc-core.h | 30 +-
drivers/media/video/s5p-fimc/fimc-reg.c | 53 +-
drivers/media/video/s5p-fimc/mipi-csis.c | 22 +
drivers/media/video/s5p-fimc/mipi-csis.h | 3 +
drivers/media/video/s5p-fimc/regs-fimc.h | 5 +
drivers/media/video/s5p-g2d/Makefile | 3 +
drivers/media/video/s5p-g2d/g2d-hw.c | 104 +
drivers/media/video/s5p-g2d/g2d-regs.h | 115 +
drivers/media/video/s5p-g2d/g2d.c | 810 ++++
drivers/media/video/s5p-g2d/g2d.h | 83 +
drivers/media/video/s5p-jpeg/Makefile | 2 +
drivers/media/video/s5p-jpeg/jpeg-core.c | 1481 ++++++
drivers/media/video/s5p-jpeg/jpeg-core.h | 143 +
drivers/media/video/s5p-jpeg/jpeg-hw.h | 353 ++
drivers/media/video/s5p-jpeg/jpeg-regs.h | 170 +
drivers/media/video/s5p-mfc/s5p_mfc.c | 22 +-
drivers/media/video/s5p-tv/hdmi_drv.c | 30 +-
drivers/media/video/s5p-tv/mixer.h | 14 +-
drivers/media/video/s5p-tv/mixer_grp_layer.c | 157 +-
drivers/media/video/s5p-tv/mixer_video.c | 342 +-
drivers/media/video/s5p-tv/mixer_vp_layer.c | 108 +-
drivers/media/video/s5p-tv/sdo_drv.c | 22 +-
drivers/media/video/saa7115.c | 2 +-
drivers/media/video/saa7134/saa7134-cards.c | 33 +
drivers/media/video/saa7134/saa7134-core.c | 1 -
drivers/media/video/saa7134/saa7134-dvb.c | 33 +-
drivers/media/video/saa7134/saa7134-input.c | 23 +-
drivers/media/video/saa7134/saa7134-tvaudio.c | 65 +-
drivers/media/video/saa7134/saa7134-video.c | 2 +
drivers/media/video/saa7134/saa7134.h | 2 +
drivers/media/video/saa7164/saa7164-bus.c | 4 +-
drivers/media/video/sh_mobile_ceu_camera.c | 11 +-
drivers/media/video/sh_mobile_csi2.c | 13 +-
drivers/media/video/sn9c102/sn9c102_core.c | 4 +-
drivers/media/video/soc_camera.c | 4 +-
drivers/media/video/soc_camera_platform.c | 13 +-
drivers/media/video/stk-webcam.c | 8 +-
drivers/media/video/timblogiw.c | 15 +-
drivers/media/video/tlg2300/pd-common.h | 2 +-
drivers/media/video/tlg2300/pd-dvb.c | 22 +-
drivers/media/video/tm6000/Kconfig | 6 +-
drivers/media/video/tm6000/tm6000-alsa.c | 23 +-
drivers/media/video/tm6000/tm6000-cards.c | 35 +
drivers/media/video/tm6000/tm6000-core.c | 86 +-
drivers/media/video/tm6000/tm6000-dvb.c | 21 +-
drivers/media/video/tm6000/tm6000-i2c.c | 8 +-
drivers/media/video/tm6000/tm6000-input.c | 407 +-
drivers/media/video/tm6000/tm6000-regs.h | 14 +-
drivers/media/video/tm6000/tm6000-stds.c | 89 +-
drivers/media/video/tm6000/tm6000-video.c | 21 +-
drivers/media/video/tm6000/tm6000.h | 3 +
drivers/media/video/tuner-core.c | 1 +
drivers/media/video/tvp514x.c | 2 +-
drivers/media/video/tvp5150.c | 81 +-
drivers/media/video/tvp7002.c | 2 +-
drivers/media/video/upd64083.c | 2 +-
drivers/media/video/usbvision/usbvision-i2c.c | 46 +-
drivers/media/video/uvc/Kconfig | 1 +
drivers/media/video/uvc/Makefile | 2 +-
drivers/media/video/uvc/uvc_ctrl.c | 19 +-
drivers/media/video/uvc/uvc_debugfs.c | 136 +
drivers/media/video/uvc/uvc_driver.c | 30 +-
drivers/media/video/uvc/uvc_isight.c | 10 +-
drivers/media/video/uvc/uvc_queue.c | 564 +--
drivers/media/video/uvc/uvc_v4l2.c | 29 +-
drivers/media/video/uvc/uvc_video.c | 625 +++-
drivers/media/video/uvc/uvcvideo.h | 128 +-
drivers/media/video/v4l2-compat-ioctl32.c | 2 +
drivers/media/video/v4l2-ctrls.c | 5 +-
drivers/media/video/v4l2-dev.c | 14 +-
drivers/media/video/v4l2-device.c | 4 +-
drivers/media/video/v4l2-ioctl.c | 120 +-
drivers/media/video/v4l2-subdev.c | 4 +
drivers/media/video/via-camera.c | 26 +-
drivers/media/video/videobuf-dvb.c | 7 +-
drivers/media/video/videobuf2-core.c | 118 +-
drivers/media/video/videobuf2-dma-sg.c | 3 +-
drivers/media/video/videobuf2-memops.c | 28 +-
drivers/media/video/videobuf2-vmalloc.c | 90 +-
drivers/media/video/vino.c | 2 +-
drivers/media/video/zoran/zoran_device.c | 2 +-
drivers/media/video/zoran/zr36060.c | 2 +-
drivers/memstick/host/jmb38x_ms.c | 2 +-
drivers/memstick/host/r592.c | 2 +-
drivers/memstick/host/tifm_ms.c | 2 +-
drivers/mfd/88pm860x-i2c.c | 241 +-
drivers/mfd/Kconfig | 35 +-
drivers/mfd/Makefile | 3 +
drivers/mfd/aat2870-core.c | 25 +-
drivers/mfd/ab5500-core.c | 2 +-
drivers/mfd/ab5500-debugfs.c | 2 +-
drivers/mfd/ab8500-core.c | 2 +-
drivers/mfd/ab8500-debugfs.c | 2 +-
drivers/mfd/ab8500-gpadc.c | 4 +-
drivers/mfd/ab8500-i2c.c | 2 +-
drivers/mfd/ab8500-sysctrl.c | 4 +-
drivers/mfd/cs5535-mfd.c | 8 +-
drivers/mfd/dm355evm_msp.c | 3 +-
drivers/mfd/intel_msic.c | 12 +-
drivers/mfd/janz-cmodio.c | 2 +-
drivers/mfd/jz4740-adc.c | 14 +-
drivers/mfd/lpc_sch.c | 2 +-
drivers/mfd/max8925-i2c.c | 27 +
drivers/mfd/max8997.c | 3 +-
drivers/mfd/max8998.c | 6 +-
drivers/mfd/mc13xxx-core.c | 111 +-
drivers/mfd/mcp-core.c | 44 +-
drivers/mfd/mcp-sa11x0.c | 182 +-
drivers/mfd/omap-usb-host.c | 18 +-
drivers/mfd/pcf50633-adc.c | 12 +-
drivers/mfd/s5m-core.c | 176 +
drivers/mfd/s5m-irq.c | 487 ++
drivers/mfd/sm501.c | 2 +-
drivers/mfd/stmpe-i2c.c | 109 +
drivers/mfd/stmpe-spi.c | 150 +
drivers/mfd/stmpe.c | 277 +-
drivers/mfd/stmpe.h | 53 +
drivers/mfd/t7l66xb.c | 16 +-
drivers/mfd/tc6387xb.c | 14 +-
drivers/mfd/ti-ssp.c | 12 +-
drivers/mfd/timberdale.c | 2 +-
drivers/mfd/tps65910-irq.c | 3 +-
drivers/mfd/tps65910.c | 7 +-
drivers/mfd/tps65912-spi.c | 1 -
drivers/mfd/twl-core.c | 51 +-
drivers/mfd/twl4030-audio.c | 12 +-
drivers/mfd/twl4030-irq.c | 3 +-
drivers/mfd/twl4030-madc.c | 14 +-
drivers/mfd/twl4030-power.c | 42 +-
drivers/mfd/twl6040-core.c | 20 +-
drivers/mfd/ucb1x00-core.c | 48 +-
drivers/mfd/ucb1x00-ts.c | 2 +-
drivers/mfd/vx855.c | 2 +-
drivers/mfd/wm831x-core.c | 4 +-
drivers/mfd/wm831x-i2c.c | 3 +-
drivers/mfd/wm831x-irq.c | 8 +-
drivers/mfd/wm831x-spi.c | 4 +-
drivers/mfd/wm8350-core.c | 2 +
drivers/mfd/wm8350-i2c.c | 4 +-
drivers/mfd/wm8400-core.c | 7 +-
drivers/misc/Kconfig | 8 +
drivers/misc/Makefile | 1 +
drivers/misc/ab8500-pwm.c | 2 +-
drivers/misc/iwmc3200top/main.c | 12 +-
drivers/misc/lis3lv02d/lis3lv02d.c | 2 +
drivers/misc/max8997-muic.c | 505 ++
drivers/mmc/Makefile | 3 +-
drivers/mmc/card/block.c | 247 +-
drivers/mmc/card/mmc_test.c | 1 +
drivers/mmc/card/queue.c | 5 +
drivers/mmc/core/Makefile | 2 +-
drivers/mmc/core/bus.c | 5 +-
drivers/mmc/core/cd-gpio.c | 74 +
drivers/mmc/core/core.c | 101 +-
drivers/mmc/core/core.h | 5 +-
drivers/mmc/core/debugfs.c | 5 +
drivers/mmc/core/host.c | 53 +-
drivers/mmc/core/mmc.c | 203 +-
drivers/mmc/core/sd.c | 21 +-
drivers/mmc/core/sdio.c | 342 ++-
drivers/mmc/core/sdio_io.c | 8 +-
drivers/mmc/core/sdio_ops.c | 14 +-
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/at91_mci.c | 8 +-
drivers/mmc/host/au1xmmc.c | 45 +-
drivers/mmc/host/bfin_sdh.c | 12 +-
drivers/mmc/host/cb710-mmc.c | 13 +-
drivers/mmc/host/dw_mmc.c | 71 +-
drivers/mmc/host/dw_mmc.h | 2 +-
drivers/mmc/host/jz4740_mmc.c | 12 +-
drivers/mmc/host/mmc_spi.c | 1 -
drivers/mmc/host/mmci.c | 1 +
drivers/mmc/host/msm_sdcc.c | 19 +-
drivers/mmc/host/mxcmmc.c | 13 +-
drivers/mmc/host/mxs-mmc.c | 13 +-
drivers/mmc/host/omap_hsmmc.c | 43 +-
drivers/mmc/host/pxamci.c | 13 +-
drivers/mmc/host/s3cmci.c | 13 +-
drivers/mmc/host/sdhci-cns3xxx.c | 12 +-
drivers/mmc/host/sdhci-dove.c | 12 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 12 +-
drivers/mmc/host/sdhci-esdhc.h | 2 +-
drivers/mmc/host/sdhci-of-esdhc.c | 12 +-
drivers/mmc/host/sdhci-of-hlwd.c | 12 +-
drivers/mmc/host/sdhci-pci-data.c | 5 +
drivers/mmc/host/sdhci-pci.c | 181 +-
drivers/mmc/host/sdhci-pxav2.c | 12 +-
drivers/mmc/host/sdhci-pxav3.c | 12 +-
drivers/mmc/host/sdhci-s3c.c | 18 +-
drivers/mmc/host/sdhci-spear.c | 51 +-
drivers/mmc/host/sdhci-tegra.c | 12 +-
drivers/mmc/host/sdhci.c | 150 +-
drivers/mmc/host/sdhci.h | 1 +
drivers/mmc/host/sh_mmcif.c | 726 ++-
drivers/mmc/host/sh_mobile_sdhi.c | 13 +-
drivers/mmc/host/tifm_sd.c | 20 +-
drivers/mmc/host/tmio_mmc.c | 14 +-
drivers/mmc/host/tmio_mmc.h | 4 +-
drivers/mmc/host/tmio_mmc_pio.c | 30 +-
drivers/mmc/host/vub300.c | 10 +-
drivers/mtd/mtdoops.c | 3 +-
drivers/mtd/nand/au1550nd.c | 298 +-
drivers/mtd/nand/pxa3xx_nand.c | 2 +-
drivers/mtd/nand/r852.c | 2 +-
drivers/mtd/ubi/cdev.c | 3 +
drivers/mtd/ubi/debug.h | 5 +-
drivers/mtd/ubi/vtbl.c | 6 +-
drivers/net/bonding/bond_alb.c | 112 +-
drivers/net/ethernet/8390/ax88796.c | 3 +-
drivers/net/ethernet/adi/bfin_mac.c | 3 +-
drivers/net/ethernet/amd/au1000_eth.c | 3 +-
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +-
drivers/net/ethernet/broadcom/sb1250-mac.c | 3 +-
drivers/net/ethernet/cadence/macb.c | 3 +-
drivers/net/ethernet/dnet.c | 3 +-
drivers/net/ethernet/freescale/fec.c | 12 +-
drivers/net/ethernet/freescale/fec.h | 4 +
drivers/net/ethernet/freescale/gianfar.c | 34 +-
drivers/net/ethernet/freescale/gianfar.h | 3 +
drivers/net/ethernet/lantiq_etop.c | 5 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +-
drivers/net/ethernet/marvell/pxa168_eth.c | 3 +-
drivers/net/ethernet/micrel/ksz884x.c | 2 +-
drivers/net/ethernet/renesas/sh_eth.c | 3 +-
drivers/net/ethernet/s6gmac.c | 2 +-
drivers/net/ethernet/smsc/smsc911x.c | 3 +-
drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 1 +
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 +-
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +-
drivers/net/ethernet/ti/cpmac.c | 2 +-
drivers/net/ethernet/ti/davinci_mdio.c | 3 +-
drivers/net/ethernet/tundra/tsi108_eth.c | 6 +-
drivers/net/ethernet/via/via-rhine.c | 668 ++--
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
drivers/net/irda/Kconfig | 6 +-
drivers/net/irda/au1000_ircc.h | 125 -
drivers/net/irda/au1k_ir.c | 1229 +++---
drivers/net/phy/dp83640.c | 2 +-
drivers/net/phy/fixed.c | 2 +-
drivers/net/phy/mdio-gpio.c | 2 +-
drivers/net/phy/mdio-octeon.c | 3 +-
drivers/net/phy/mdio_bus.c | 24 +-
drivers/net/ppp/pptp.c | 4 +-
drivers/net/usb/asix.c | 15 +
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +-
drivers/net/wireless/ath/ath9k/ath9k.h | 1 -
drivers/net/wireless/ath/ath9k/calib.c | 1 +
drivers/net/wireless/ath/ath9k/calib.h | 1 -
drivers/net/wireless/ath/ath9k/main.c | 8 +-
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +-
drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 4 +
drivers/of/address.c | 16 +-
drivers/of/irq.c | 11 +-
drivers/parport/parport_ip32.c | 2 +-
drivers/parport/parport_pc.c | 4 +-
drivers/pci/hotplug/acpi_pcihp.c | 2 +-
drivers/pci/hotplug/acpiphp_core.c | 2 +-
drivers/pci/hotplug/acpiphp_ibm.c | 2 +-
drivers/pci/hotplug/cpcihp_zt5550.c | 4 +-
drivers/pci/hotplug/cpqphp_core.c | 4 +-
drivers/pci/hotplug/ibmphp_core.c | 2 +-
drivers/pci/hotplug/pci_hotplug_core.c | 2 +-
drivers/pci/hotplug/pciehp.h | 6 +-
drivers/pci/hotplug/pciehp_core.c | 6 +-
drivers/pci/hotplug/pcihp_skeleton.c | 2 +-
drivers/pci/hotplug/rpaphp.h | 2 +-
drivers/pci/hotplug/rpaphp_core.c | 2 +-
drivers/pci/hotplug/shpchp.h | 4 +-
drivers/pci/hotplug/shpchp_core.c | 4 +-
drivers/pci/pci-sysfs.c | 2 +-
drivers/pci/pcie/aer/aer_inject.c | 2 +-
drivers/pci/pcie/aer/aerdrv_core.c | 4 +-
drivers/pcmcia/Kconfig | 8 +-
drivers/pcmcia/Makefile | 4 -
drivers/pcmcia/au1000_generic.c | 545 ---
drivers/pcmcia/au1000_generic.h | 135 -
drivers/pcmcia/au1000_pb1x00.c | 294 --
drivers/pcmcia/db1xxx_ss.c | 26 +-
drivers/pcmcia/yenta_socket.c | 6 +-
drivers/platform/x86/compal-laptop.c | 2 +-
drivers/platform/x86/intel_oaktrail.c | 2 +-
drivers/platform/x86/msi-laptop.c | 2 +-
drivers/platform/x86/samsung-laptop.c | 4 +-
drivers/platform/x86/thinkpad_acpi.c | 16 +-
drivers/platform/x86/wmi.c | 4 +-
drivers/power/ds2760_battery.c | 2 +-
drivers/regulator/ab8500.c | 2 +-
drivers/rtc/rtc-ab8500.c | 2 +-
drivers/rtc/rtc-max8925.c | 26 +
drivers/s390/char/raw3270.c | 2 +-
drivers/s390/char/vmwatchdog.c | 4 +-
drivers/s390/cio/cmf.c | 2 +-
drivers/scsi/aha1542.c | 2 +-
drivers/scsi/dc395x.c | 2 +-
drivers/scsi/nsp32.c | 4 +-
drivers/scsi/pcmcia/nsp_cs.c | 2 +-
drivers/scsi/scsi_netlink.c | 2 +-
drivers/scsi/scsi_scan.c | 2 +-
drivers/scsi/sd.c | 13 +-
drivers/spi/Kconfig | 7 +-
drivers/staging/comedi/comedi_fops.c | 2 +-
drivers/staging/comedi/comedi_fops.h | 3 +-
drivers/staging/media/as102/Kconfig | 1 +
drivers/staging/media/as102/Makefile | 2 +-
drivers/staging/media/as102/as102_drv.c | 126 +-
drivers/staging/media/as102/as102_drv.h | 59 +-
drivers/staging/media/as102/as102_fe.c | 81 +-
drivers/staging/media/as102/as102_fw.c | 44 +-
drivers/staging/media/as102/as102_fw.h | 10 +-
drivers/staging/media/as102/as102_usb_drv.c | 48 +-
drivers/staging/media/as102/as102_usb_drv.h | 6 +-
drivers/staging/media/as102/as10x_cmd.c | 143 +-
drivers/staging/media/as102/as10x_cmd.h | 895 ++--
drivers/staging/media/as102/as10x_cmd_cfg.c | 66 +-
drivers/staging/media/as102/as10x_cmd_stream.c | 56 +-
drivers/staging/media/as102/as10x_handle.h | 26 +-
drivers/staging/media/as102/as10x_types.h | 250 +-
drivers/staging/media/dt3155v4l/dt3155v4l.c | 17 +-
drivers/staging/media/easycap/easycap.h | 93 +-
drivers/staging/media/easycap/easycap_ioctl.c | 60 +-
drivers/staging/media/easycap/easycap_low.c | 273 +-
drivers/staging/media/easycap/easycap_main.c | 379 +-
drivers/staging/media/easycap/easycap_settings.c | 2 +-
drivers/staging/media/easycap/easycap_sound.c | 340 +-
drivers/staging/media/go7007/go7007-usb.c | 8 +-
drivers/staging/media/go7007/snd-go7007.c | 2 +-
drivers/staging/media/lirc/lirc_bt829.c | 2 +-
drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
drivers/staging/media/lirc/lirc_imon.c | 4 +-
drivers/staging/media/lirc/lirc_parallel.c | 6 +-
drivers/staging/media/lirc/lirc_serial.c | 123 +-
drivers/staging/media/lirc/lirc_sir.c | 2 +-
drivers/staging/media/lirc/lirc_zilog.c | 4 +-
drivers/staging/media/solo6x10/Makefile | 2 +-
.../media/solo6x10/{jpeg.h => solo6x10-jpeg.h} | 0
drivers/staging/media/solo6x10/v4l2-enc.c | 2 +-
drivers/staging/octeon/Makefile | 5 -
drivers/staging/octeon/cvmx-packet.h | 65 -
drivers/staging/octeon/cvmx-smix-defs.h | 178 -
drivers/staging/octeon/ethernet-defines.h | 2 +-
drivers/staging/octeon/ethernet-mdio.c | 4 +-
drivers/staging/octeon/ethernet-mem.c | 2 +-
drivers/staging/octeon/ethernet-rgmii.c | 4 +-
drivers/staging/octeon/ethernet-rx.c | 16 +-
drivers/staging/octeon/ethernet-rx.h | 2 +-
drivers/staging/octeon/ethernet-sgmii.c | 4 +-
drivers/staging/octeon/ethernet-spi.c | 6 +-
drivers/staging/octeon/ethernet-tx.c | 12 +-
drivers/staging/octeon/ethernet-xaui.c | 4 +-
drivers/staging/octeon/ethernet.c | 16 +-
drivers/staging/quatech_usb2/quatech_usb2.c | 2 +-
drivers/staging/serqt_usb2/serqt_usb2.c | 2 +-
drivers/staging/speakup/speakup.h | 2 +-
drivers/staging/speakup/synth.c | 2 +-
drivers/staging/vme/bridges/vme_tsi148.c | 2 +-
drivers/tty/rocket.c | 2 +-
drivers/tty/serial/Kconfig | 23 +
drivers/tty/serial/Makefile | 1 +
drivers/tty/serial/ar933x_uart.c | 688 +++
drivers/tty/synclink.c | 2 +-
drivers/tty/synclinkmp.c | 2 +-
drivers/usb/atm/speedtch.c | 6 +-
drivers/usb/atm/ueagle-atm.c | 2 +-
drivers/usb/core/devio.c | 2 +-
drivers/usb/core/hub.c | 8 +-
drivers/usb/core/usb.c | 2 +-
drivers/usb/gadget/amd5536udc.c | 8 +-
drivers/usb/gadget/ether.c | 4 +-
drivers/usb/gadget/file_storage.c | 10 +-
drivers/usb/gadget/net2272.c | 2 +-
drivers/usb/gadget/net2280.c | 6 +-
drivers/usb/gadget/omap_udc.c | 2 +-
drivers/usb/gadget/pch_udc.c | 2 +-
drivers/usb/gadget/serial.c | 4 +-
drivers/usb/gadget/zero.c | 2 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/alchemy-common.c | 277 ++
drivers/usb/host/ehci-ath79.c | 4 +
drivers/usb/host/ehci-hcd.c | 2 +-
drivers/usb/host/ohci-au1xxx.c | 13 +-
drivers/usb/host/ohci-hcd.c | 4 +-
drivers/usb/host/oxu210hp-hcd.c | 2 +-
drivers/usb/host/u132-hcd.c | 2 +-
drivers/usb/host/uhci-hcd.c | 2 +-
drivers/usb/misc/ftdi-elan.c | 2 +-
drivers/usb/misc/iowarrior.c | 2 +-
drivers/usb/musb/cppi_dma.c | 2 +-
drivers/usb/musb/musb_core.c | 2 +-
drivers/usb/otg/ab8500-usb.c | 2 +-
drivers/usb/serial/aircable.c | 2 +-
drivers/usb/serial/ark3116.c | 2 +-
drivers/usb/serial/belkin_sa.c | 2 +-
drivers/usb/serial/ch341.c | 2 +-
drivers/usb/serial/cp210x.c | 2 +-
drivers/usb/serial/cyberjack.c | 2 +-
drivers/usb/serial/cypress_m8.c | 6 +-
drivers/usb/serial/digi_acceleport.c | 2 +-
drivers/usb/serial/empeg.c | 2 +-
drivers/usb/serial/ftdi_sio.c | 2 +-
drivers/usb/serial/funsoft.c | 2 +-
drivers/usb/serial/garmin_gps.c | 2 +-
drivers/usb/serial/io_edgeport.c | 2 +-
drivers/usb/serial/io_ti.c | 4 +-
drivers/usb/serial/ipaq.c | 2 +-
drivers/usb/serial/ipw.c | 2 +-
drivers/usb/serial/ir-usb.c | 2 +-
drivers/usb/serial/iuu_phoenix.c | 6 +-
drivers/usb/serial/keyspan.c | 2 +-
drivers/usb/serial/keyspan_pda.c | 2 +-
drivers/usb/serial/kl5kusb105.c | 2 +-
drivers/usb/serial/mct_u232.c | 2 +-
drivers/usb/serial/mos7720.c | 2 +-
drivers/usb/serial/mos7840.c | 2 +-
drivers/usb/serial/navman.c | 2 +-
drivers/usb/serial/omninet.c | 2 +-
drivers/usb/serial/opticon.c | 2 +-
drivers/usb/serial/option.c | 2 +-
drivers/usb/serial/oti6858.c | 2 +-
drivers/usb/serial/pl2303.c | 2 +-
drivers/usb/serial/qcserial.c | 2 +-
drivers/usb/serial/safe_serial.c | 6 +-
drivers/usb/serial/sierra.c | 4 +-
drivers/usb/serial/spcp8x5.c | 2 +-
drivers/usb/serial/ssu100.c | 2 +-
drivers/usb/serial/symbolserial.c | 2 +-
drivers/usb/serial/ti_usb_3410_5052.c | 2 +-
drivers/usb/serial/usb-serial.c | 2 +-
drivers/usb/serial/usb_wwan.c | 2 +-
drivers/usb/serial/visor.c | 2 +-
drivers/usb/serial/whiteheat.c | 2 +-
drivers/video/Kconfig | 9 +-
drivers/video/Makefile | 2 +-
drivers/video/amifb.c | 5012 ++++++++++----------
drivers/video/atmel_lcdfb.c | 37 +-
drivers/video/aty/atyfb_base.c | 4 +-
drivers/video/aty/radeon_base.c | 18 +-
drivers/video/au1100fb.c | 12 -
drivers/video/au1200fb.c | 273 +-
drivers/video/cirrusfb.c | 270 +-
drivers/video/console/newport_con.c | 63 +-
drivers/video/controlfb.c | 2 +-
drivers/video/display/Kconfig | 24 -
drivers/video/display/Makefile | 6 -
drivers/video/display/display-sysfs.c | 219 -
drivers/video/fbmem.c | 14 +
drivers/video/fsl-diu-fb.c | 587 ++--
drivers/video/grvga.c | 4 +-
drivers/video/hgafb.c | 2 +-
drivers/video/i810/i810_main.c | 16 +-
drivers/video/intelfb/intelfbdrv.c | 18 +-
drivers/video/logo/logo.c | 2 +-
drivers/video/matrox/matroxfb_base.c | 1 -
drivers/video/matrox/matroxfb_crtc2.c | 1 -
drivers/video/mbx/mbxfb.c | 13 +-
drivers/video/mxsfb.c | 13 +-
drivers/video/neofb.c | 10 +-
drivers/video/nuc900fb.c | 13 +-
drivers/video/nvidia/nvidia.c | 6 +-
drivers/video/omap/lcd_ams_delta.c | 15 +-
drivers/video/omap/lcd_h3.c | 16 +-
drivers/video/omap/lcd_htcherald.c | 16 +-
drivers/video/omap/lcd_inn1510.c | 16 +-
drivers/video/omap/lcd_inn1610.c | 16 +-
drivers/video/omap/lcd_mipid.c | 1 -
drivers/video/omap/lcd_osk.c | 16 +-
drivers/video/omap/lcd_palmte.c | 16 +-
drivers/video/omap/lcd_palmtt.c | 15 +-
drivers/video/omap/lcd_palmz71.c | 15 +-
drivers/video/omap/omapfb_main.c | 4 +-
drivers/video/omap2/displays/Kconfig | 2 +-
drivers/video/omap2/displays/panel-acx565akm.c | 1 -
drivers/video/omap2/displays/panel-generic-dpi.c | 66 +
drivers/video/omap2/displays/panel-n8x0.c | 1 -
.../omap2/displays/panel-nec-nl8048hl11-01b.c | 62 +-
drivers/video/omap2/displays/panel-taal.c | 38 +-
.../video/omap2/displays/panel-tpo-td043mtea1.c | 1 -
drivers/video/omap2/dss/Makefile | 3 +-
drivers/video/omap2/dss/apply.c | 1324 ++++++
drivers/video/omap2/dss/core.c | 4 +-
drivers/video/omap2/dss/dispc.c | 407 +-
drivers/video/omap2/dss/dispc.h | 11 +
drivers/video/omap2/dss/dispc_coefs.c | 326 ++
drivers/video/omap2/dss/dpi.c | 7 +-
drivers/video/omap2/dss/dsi.c | 616 ++--
drivers/video/omap2/dss/dss.h | 76 +-
drivers/video/omap2/dss/dss_features.c | 11 +
drivers/video/omap2/dss/dss_features.h | 1 +
drivers/video/omap2/dss/hdmi.c | 59 +-
drivers/video/omap2/dss/manager.c | 1221 +-----
drivers/video/omap2/dss/overlay.c | 435 +--
drivers/video/omap2/dss/rfbi.c | 1 -
drivers/video/omap2/dss/sdi.c | 8 +-
drivers/video/omap2/dss/ti_hdmi.h | 10 +-
drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 37 +-
drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h | 3 -
drivers/video/omap2/dss/venc.c | 28 +-
drivers/video/omap2/omapfb/omapfb-ioctl.c | 42 +-
drivers/video/omap2/omapfb/omapfb-main.c | 22 +-
drivers/video/omap2/omapfb/omapfb-sysfs.c | 4 +-
drivers/video/omap2/omapfb/omapfb.h | 13 +-
drivers/video/pm2fb.c | 8 +-
drivers/video/pm3fb.c | 4 +-
drivers/video/pnx4008/pnxrgbfb.c | 13 +-
drivers/video/pnx4008/sdum.c | 13 +-
drivers/video/pxa168fb.c | 12 +-
drivers/video/pxa3xx-gcu.c | 15 +-
drivers/video/riva/fbdev.c | 6 +-
drivers/video/s3c-fb.c | 202 +-
drivers/video/s3c2410fb.c | 29 +-
drivers/video/s3fb.c | 30 +-
drivers/video/sbuslib.c | 2 +-
drivers/video/sh7760fb.c | 13 +-
drivers/video/sh_mipi_dsi.c | 218 +-
drivers/video/sh_mobile_lcdcfb.c | 375 +-
drivers/video/sh_mobile_meram.c | 13 +-
drivers/video/sm501fb.c | 13 +-
drivers/video/smscufx.c | 4 +-
drivers/video/sstfb.c | 6 +-
drivers/video/tdfxfb.c | 2 +-
drivers/video/udlfb.c | 6 +-
drivers/video/uvesafb.c | 6 +-
drivers/video/vfb.c | 2 +-
drivers/video/vt8500lcdfb.c | 13 +-
drivers/video/w100fb.c | 13 +-
drivers/video/wm8505fb.c | 13 +-
drivers/video/wmt_ge_rops.c | 13 +-
drivers/video/xilinxfb.c | 20 +-
drivers/watchdog/f71808e_wdt.c | 2 +-
drivers/watchdog/mpc8xxx_wdt.c | 2 +-
drivers/xen/xen-pciback/conf_space.c | 2 +-
drivers/xen/xen-pciback/xenbus.c | 2 +-
fs/aio.c | 11 +-
fs/autofs4/waitq.c | 2 +-
fs/block_dev.c | 3 +
fs/btrfs/disk-io.c | 5 +-
fs/ceph/dir.c | 76 +-
fs/ceph/export.c | 6 +-
fs/ceph/inode.c | 3 +-
fs/ceph/mds_client.c | 4 +-
fs/ceph/super.c | 16 +-
fs/ceph/super.h | 1 +
fs/ceph/xattr.c | 22 +
fs/compat_ioctl.c | 1 +
fs/dcache.c | 11 +-
fs/direct-io.c | 57 +-
fs/eventpoll.c | 234 +-
fs/gfs2/glock.c | 2 +-
fs/gfs2/glock.h | 7 +-
fs/gfs2/incore.h | 60 +-
fs/gfs2/inode.c | 4 +-
fs/gfs2/lock_dlm.c | 993 ++++-
fs/gfs2/main.c | 10 +
fs/gfs2/ops_fstype.c | 31 +-
fs/gfs2/recovery.c | 11 +-
fs/gfs2/rgrp.c | 2 +-
fs/gfs2/sys.c | 33 +-
fs/gfs2/sys.h | 2 +
fs/hugetlbfs/inode.c | 3 +-
fs/ioprio.c | 24 +-
fs/lockd/mon.c | 2 +-
fs/mpage.c | 4 -
fs/nfs/client.c | 2 +-
fs/nfs/inode.c | 2 +-
fs/nfs/internal.h | 2 +-
fs/nfs/write.c | 4 +-
fs/nfsd/Kconfig | 10 +
fs/nfsd/Makefile | 1 +
fs/nfsd/export.c | 12 +-
fs/nfsd/fault_inject.c | 91 +
fs/nfsd/fault_inject.h | 28 +
fs/nfsd/nfs4idmap.c | 11 +-
fs/nfsd/nfs4proc.c | 7 +-
fs/nfsd/nfs4recover.c | 22 +-
fs/nfsd/nfs4state.c | 328 +-
fs/nfsd/nfs4xdr.c | 3 +-
fs/nfsd/nfsctl.c | 10 +-
fs/nfsd/nfsd.h | 20 +-
fs/nfsd/state.h | 3 +-
fs/nfsd/vfs.c | 17 +-
fs/notify/mark.c | 8 +-
fs/ntfs/super.c | 2 +-
fs/pipe.c | 2 +-
fs/proc/array.c | 9 +-
fs/proc/base.c | 2 +
fs/squashfs/cache.c | 30 +-
fs/squashfs/inode.c | 4 +-
fs/squashfs/squashfs_fs_sb.h | 1 +
fs/squashfs/super.c | 2 +-
fs/ubifs/debug.c | 90 +-
fs/ubifs/debug.h | 75 +-
fs/ubifs/journal.c | 7 +-
fs/ubifs/replay.c | 8 +-
fs/ubifs/tnc.c | 55 +-
fs/ubifs/tnc_misc.c | 10 +-
include/acpi/acpixf.h | 2 +-
include/acpi/apei.h | 4 +-
include/asm-generic/gpio.h | 4 +
include/asm-generic/param.h | 13 +-
include/asm-generic/tlb.h | 14 +
include/drm/drm_crtc.h | 2 +-
include/linux/acct.h | 3 +
include/linux/amba/mmci.h | 2 +
include/linux/amba/pl061.h | 2 +-
include/linux/bio.h | 66 +-
include/linux/blkdev.h | 104 +-
include/linux/capability.h | 4 +-
include/linux/compiler-gcc.h | 5 +
include/linux/console.h | 2 +-
include/linux/crash_dump.h | 1 +
include/linux/cred.h | 6 +-
include/linux/cuda.h | 5 +
include/linux/dcache.h | 1 +
include/linux/display.h | 61 -
include/linux/dvb/frontend.h | 19 +-
include/linux/dvb/version.h | 2 +-
include/linux/elevator.h | 41 +-
include/linux/elf.h | 18 +-
include/linux/eventpoll.h | 1 +
include/linux/fb.h | 14 +-
include/linux/fs.h | 15 +-
include/linux/ftrace.h | 77 +-
include/linux/gfs2_ondisk.h | 2 +
include/linux/huge_mm.h | 2 +-
include/linux/i2c/twl.h | 2 +
include/linux/inet_diag.h | 14 +-
include/linux/init.h | 3 +-
include/linux/iocontext.h | 136 +-
include/linux/isdn_divertif.h | 4 +
include/linux/kernel.h | 13 +-
include/linux/kmemleak.h | 8 +
include/linux/kmsg_dump.h | 1 -
include/linux/linkage.h | 4 -
include/linux/lockd/lockd.h | 2 +-
include/linux/memcontrol.h | 105 +-
include/linux/mfd/88pm860x.h | 3 +-
include/linux/mfd/{ab5500 => abx500}/ab5500.h | 0
.../mfd/{ab8500/gpadc.h => abx500/ab8500-gpadc.h} | 0
.../mfd/{ab8500/gpio.h => abx500/ab8500-gpio.h} | 0
.../{ab8500/sysctrl.h => abx500/ab8500-sysctrl.h} | 0
include/linux/mfd/{ => abx500}/ab8500.h | 0
include/linux/mfd/max8925.h | 2 +
include/linux/mfd/max8997.h | 83 +-
include/linux/mfd/mc13xxx.h | 8 +
include/linux/mfd/mcp.h | 7 +-
include/linux/mfd/s5m87xx/s5m-core.h | 373 ++
include/linux/mfd/s5m87xx/s5m-pmic.h | 100 +
include/linux/mfd/s5m87xx/s5m-rtc.h | 84 +
include/linux/mfd/stmpe.h | 16 +-
include/linux/mfd/ucb1x00.h | 5 +-
include/linux/migrate.h | 23 +-
include/linux/mm_inline.h | 44 +-
include/linux/mm_types.h | 9 +-
include/linux/mmc/card.h | 23 +-
include/linux/mmc/cd-gpio.h | 19 +
include/linux/mmc/core.h | 2 +
include/linux/mmc/dw_mmc.h | 1 +
include/linux/mmc/host.h | 27 +-
include/linux/mmc/mmc.h | 72 +-
include/linux/mmc/sdhci-pci-data.h | 18 +
include/linux/mmc/sdhci.h | 3 +-
include/linux/mmc/sdio.h | 29 +-
include/linux/mmzone.h | 28 +-
include/linux/mod_devicetable.h | 11 +
include/linux/module.h | 21 +-
include/linux/moduleparam.h | 17 +-
include/linux/mroute6.h | 4 +-
include/linux/oom.h | 2 +-
include/linux/page_cgroup.h | 46 +-
include/linux/pagevec.h | 12 +-
include/linux/patchkey.h | 4 +-
include/linux/phy.h | 7 +-
include/linux/pkt_sched.h | 20 +
include/linux/pmu.h | 4 +
include/linux/prctl.h | 12 +
include/linux/ptrace.h | 5 +-
include/linux/radix-tree.h | 3 -
include/linux/rmap.h | 4 +-
include/linux/sched.h | 2 +-
include/linux/security.h | 60 +-
include/linux/serial_core.h | 4 +
include/linux/sound.h | 4 +
include/linux/soundcard.h | 4 +-
include/linux/sunrpc/svc_xprt.h | 3 +-
include/linux/sunrpc/svcsock.h | 2 +-
include/linux/videodev2.h | 58 +-
include/linux/zorro_ids.h | 4 +-
include/media/as3645a.h | 71 +
include/media/atmel-isi.h | 4 +-
include/media/cx25840.h | 1 +
include/media/davinci/vpbe.h | 16 +
include/media/davinci/vpbe_venc.h | 4 +
include/media/media-entity.h | 2 +-
include/media/omap3isp.h | 2 +-
include/media/pwc-ioctl.h | 323 --
include/media/rc-map.h | 10 +-
include/media/soc_camera.h | 2 +-
include/media/v4l2-ioctl.h | 4 +
include/net/bluetooth/hci_core.h | 4 +-
include/net/red.h | 3 +-
include/trace/events/vmscan.h | 22 +-
include/video/edid.h | 6 +-
include/video/omapdss.h | 58 +-
include/video/sh_mipi_dsi.h | 21 +-
include/video/sh_mobile_lcdc.h | 4 +-
include/xen/interface/io/blkif.h | 40 +-
init/Kconfig | 11 +
init/main.c | 2 +-
kernel/async.c | 2 -
kernel/audit.c | 4 +-
kernel/capability.c | 80 +-
kernel/debug/kdb/kdb_main.c | 2 +-
kernel/exit.c | 6 +-
kernel/fork.c | 8 +-
kernel/irq/internals.h | 2 +-
kernel/irq/spurious.c | 2 +-
kernel/kexec.c | 25 +-
kernel/kprobes.c | 2 +-
kernel/module.c | 205 +-
kernel/panic.c | 26 +-
kernel/params.c | 38 +-
kernel/pid.c | 4 +-
kernel/pid_namespace.c | 31 +
kernel/printk.c | 10 +-
kernel/ptrace.c | 14 +-
kernel/sched/core.c | 2 +-
kernel/sys.c | 121 +
kernel/trace/ftrace.c | 715 ++-
kernel/trace/trace_events_filter.c | 283 +-
kernel/trace/trace_stack.c | 30 +-
lib/Kconfig.debug | 2 +-
lib/decompress_unlzo.c | 2 +-
lib/radix-tree.c | 154 +-
mm/compaction.c | 5 +-
mm/filemap.c | 18 +-
mm/huge_memory.c | 93 +-
mm/kmemleak.c | 158 +-
mm/ksm.c | 11 +
mm/memcontrol.c | 1102 ++---
mm/memory-failure.c | 2 +-
mm/memory.c | 4 +-
mm/memory_hotplug.c | 2 +-
mm/mempolicy.c | 2 +-
mm/migrate.c | 173 +-
mm/oom_kill.c | 42 +-
mm/page_alloc.c | 55 +-
mm/page_cgroup.c | 164 +-
mm/percpu.c | 12 +-
mm/rmap.c | 20 +-
mm/slub.c | 9 +-
mm/swap.c | 79 +-
mm/swap_state.c | 10 +
mm/swapfile.c | 9 +-
mm/vmalloc.c | 9 +-
mm/vmscan.c | 680 ++-
mm/vmstat.c | 2 +-
net/bluetooth/af_bluetooth.c | 8 +-
net/bluetooth/hci_event.c | 22 +-
net/bluetooth/hci_sock.c | 2 -
net/bluetooth/l2cap_core.c | 26 +-
net/bluetooth/l2cap_sock.c | 2 +
net/bluetooth/mgmt.c | 4 +-
net/bluetooth/rfcomm/sock.c | 12 +-
net/bluetooth/rfcomm/tty.c | 22 +-
net/bluetooth/sco.c | 8 +-
net/ceph/crush/mapper.c | 11 +-
net/ceph/crypto.c | 3 +-
net/ceph/osd_client.c | 21 +-
net/core/net-sysfs.c | 6 +-
net/core/netpoll.c | 2 +-
net/core/rtnetlink.c | 2 +-
net/dccp/diag.c | 4 +-
net/decnet/dn_dev.c | 4 +-
net/decnet/netfilter/dn_rtmsg.c | 2 +-
net/ipv4/devinet.c | 2 +-
net/ipv4/fib_trie.c | 10 +-
net/ipv4/igmp.c | 8 +-
net/ipv4/inet_diag.c | 42 +-
net/ipv4/ipip.c | 8 +-
net/ipv4/ipmr.c | 2 +-
net/ipv4/netfilter/ip_queue.c | 2 +-
net/ipv4/tcp_diag.c | 4 +-
net/ipv4/tcp_memcontrol.c | 2 +-
net/ipv4/udp_diag.c | 14 +-
net/ipv6/addrconf.c | 2 +-
net/ipv6/ip6_tunnel.c | 8 +-
net/ipv6/netfilter/ip6_queue.c | 2 +-
net/ipv6/raw.c | 2 +-
net/ipv6/sit.c | 10 +-
net/mac80211/agg-rx.c | 2 +-
net/mac80211/cfg.c | 4 +-
net/mac80211/ibss.c | 2 +-
net/mac80211/sta_info.c | 6 +-
net/mac80211/wpa.c | 2 +-
net/netfilter/nf_conntrack_core.c | 2 +-
net/netfilter/nf_conntrack_ecache.c | 4 +-
net/netfilter/nf_conntrack_extend.c | 2 +-
net/netfilter/nf_conntrack_helper.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 2 +-
net/netfilter/nf_log.c | 6 +-
net/netfilter/nf_queue.c | 2 +-
net/netfilter/nfnetlink.c | 6 +-
net/netlabel/netlabel_domainhash.c | 4 +-
net/netlabel/netlabel_unlabeled.c | 6 +-
net/netlink/genetlink.c | 2 +-
net/phonet/af_phonet.c | 2 +-
net/phonet/pn_dev.c | 2 +-
net/phonet/socket.c | 2 +-
net/rds/iw_rdma.c | 15 +-
net/sched/sch_sfq.c | 146 +-
net/socket.c | 2 +-
net/sunrpc/auth_gss/auth_gss.c | 2 +-
net/sunrpc/cache.c | 2 +
net/sunrpc/svc.c | 25 +-
net/sunrpc/svc_xprt.c | 62 +-
net/sunrpc/svcsock.c | 8 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
net/wireless/nl80211.c | 34 +-
net/xfrm/xfrm_user.c | 4 +-
scripts/kconfig/streamline_config.pl | 52 +-
scripts/mod/file2alias.c | 222 +-
scripts/recordmcount.h | 2 +-
security/apparmor/include/apparmor.h | 10 +-
security/apparmor/lsm.c | 20 +-
security/capability.c | 1 -
security/commoncap.c | 24 +-
security/security.c | 35 +-
security/selinux/hooks.c | 44 +-
sound/pci/intel8x0.c | 4 +-
sound/soc/au1x/Kconfig | 14 +-
sound/soc/au1x/db1200.c | 73 +-
tools/nfsd/inject_fault.sh | 49 +
tools/perf/Documentation/perf-list.txt | 2 +
tools/perf/MANIFEST | 1 +
tools/perf/builtin-annotate.c | 7 +-
tools/perf/builtin-kmem.c | 3 +
tools/perf/builtin-kvm.c | 6 +-
tools/perf/builtin-script.c | 4 +
tools/perf/builtin-test.c | 2 +-
tools/perf/builtin-top.c | 5 +-
tools/perf/util/evlist.c | 5 +-
tools/perf/util/hist.c | 131 +-
tools/perf/util/hist.h | 7 +-
tools/perf/util/parse-events.c | 15 +-
tools/perf/util/trace-event-info.c | 1 -
tools/perf/util/util.c | 15 +
tools/perf/util/util.h | 4 +
tools/testing/selftests/Makefile | 11 +
tools/testing/selftests/breakpoints/Makefile | 20 +
.../selftests/breakpoints/breakpoint_test.c | 394 ++
tools/testing/selftests/run_tests | 8 +
virt/kvm/iommu.c | 2 +-
1932 files changed, 81128 insertions(+), 36060 deletions(-)
create mode 100644 Documentation/DocBook/media/constraints.png.b64
create mode 100644 Documentation/DocBook/media/selection.png.b64
create mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv24.xml
create mode 100644 Documentation/DocBook/media/v4l/selection-api.xml
create mode 100644 Documentation/DocBook/media/v4l/vidioc-g-selection.xml
create mode 100644 Documentation/devicetree/bindings/mfd/mc13xxx.txt
create mode 100644 Documentation/devicetree/bindings/mfd/twl-familly.txt
create mode 100644 Documentation/devicetree/bindings/resource-names.txt
create mode 100644 Documentation/fb/api.txt
create mode 100644 Documentation/filesystems/nfs/fault_injection.txt
create mode 100644 arch/mips/alchemy/Makefile
rename arch/mips/alchemy/{gpr/platform.c => board-gpr.c} (75%)
rename arch/mips/alchemy/{mtx-1/platform.c => board-mtx1.c} (71%)
create mode 100644 arch/mips/alchemy/board-xxs1500.c
create mode 100644 arch/mips/alchemy/common/vss.c
create mode 100644 arch/mips/alchemy/devboards/db1000.c
rename arch/mips/alchemy/devboards/{db1200/platform.c => db1200.c} (62%)
delete mode 100644 arch/mips/alchemy/devboards/db1200/Makefile
delete mode 100644 arch/mips/alchemy/devboards/db1200/setup.c
create mode 100644 arch/mips/alchemy/devboards/db1300.c
create mode 100644 arch/mips/alchemy/devboards/db1550.c
delete mode 100644 arch/mips/alchemy/devboards/db1x00/Makefile
delete mode 100644 arch/mips/alchemy/devboards/db1x00/board_setup.c
delete mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c
delete mode 100644 arch/mips/alchemy/devboards/pb1000/Makefile
delete mode 100644 arch/mips/alchemy/devboards/pb1000/board_setup.c
rename arch/mips/alchemy/devboards/{pb1100/board_setup.c => pb1100.c} (55%)
delete mode 100644 arch/mips/alchemy/devboards/pb1100/Makefile
delete mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c
delete mode 100644 arch/mips/alchemy/devboards/pb1200/Makefile
delete mode 100644 arch/mips/alchemy/devboards/pb1200/board_setup.c
delete mode 100644 arch/mips/alchemy/devboards/pb1200/platform.c
rename arch/mips/alchemy/devboards/{pb1500/board_setup.c => pb1500.c} (51%)
delete mode 100644 arch/mips/alchemy/devboards/pb1500/Makefile
delete mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c
rename arch/mips/alchemy/devboards/{pb1550/platform.c => pb1550.c} (61%)
delete mode 100644 arch/mips/alchemy/devboards/pb1550/Makefile
delete mode 100644 arch/mips/alchemy/devboards/pb1550/board_setup.c
delete mode 100644 arch/mips/alchemy/gpr/Makefile
delete mode 100644 arch/mips/alchemy/gpr/board_setup.c
delete mode 100644 arch/mips/alchemy/gpr/init.c
delete mode 100644 arch/mips/alchemy/mtx-1/Makefile
delete mode 100644 arch/mips/alchemy/mtx-1/board_setup.c
delete mode 100644 arch/mips/alchemy/mtx-1/init.c
delete mode 100644 arch/mips/alchemy/xxs1500/Makefile
delete mode 100644 arch/mips/alchemy/xxs1500/board_setup.c
delete mode 100644 arch/mips/alchemy/xxs1500/init.c
delete mode 100644 arch/mips/alchemy/xxs1500/platform.c
delete mode 100644 arch/mips/ath79/dev-ar913x-wmac.c
create mode 100644 arch/mips/ath79/dev-usb.c
rename arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} (61%)
create mode 100644 arch/mips/ath79/dev-wmac.c
create mode 100644 arch/mips/ath79/dev-wmac.h
create mode 100644 arch/mips/ath79/mach-ap121.c
create mode 100644 arch/mips/ath79/mach-ubnt-xm.c
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-cmd-queue.c (98%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-fpa.c (100%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-board.c (96%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-fpa.c (100%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-loop.c (95%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-npi.c (96%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-rgmii.c (97%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-sgmii.c (98%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-spi.c (94%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-util.c (97%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-xaui.c (97%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper.c (93%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-decodes.c (98%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-rsl.c (97%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-pko.c (98%)
rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-spi.c (99%)
delete mode 100644 arch/mips/configs/db1100_defconfig
create mode 100644 arch/mips/configs/db1300_defconfig
delete mode 100644 arch/mips/configs/db1500_defconfig
create mode 100644 arch/mips/configs/nlm_xlp_defconfig
delete mode 100644 arch/mips/configs/pb1200_defconfig
create mode 100644 arch/mips/include/asm/bmips.h
create mode 100644 arch/mips/include/asm/gio_device.h
create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart.h
create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
create mode 100644 arch/mips/include/asm/mach-ath79/pci-ath724x.h
create mode 100644 arch/mips/include/asm/mach-au1x00/au1200fb.h
create mode 100644 arch/mips/include/asm/mach-au1x00/au1550nd.h
create mode 100644 arch/mips/include/asm/mach-au1x00/gpio-au1300.h
create mode 100644 arch/mips/include/asm/mach-bcm63xx/ioremap.h
create mode 100644 arch/mips/include/asm/mach-bcm63xx/irq.h
create mode 100644 arch/mips/include/asm/mach-db1x00/db1300.h
delete mode 100644 arch/mips/include/asm/mach-db1x00/db1x00.h
create mode 100644 arch/mips/include/asm/mach-db1x00/irq.h
delete mode 100644 arch/mips/include/asm/mach-pb1x00/mc146818rtc.h
delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1000.h
delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1200.h
delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1550.h
create mode 100644 arch/mips/include/asm/netlogic/common.h
create mode 100644 arch/mips/include/asm/netlogic/haldefs.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/bridge.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/iomap.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pic.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/sys.h
create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/uart.h
rename arch/mips/{netlogic/xlr/xlr_console.c => include/asm/netlogic/xlp-hal/xlp.h} (82%)
create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-address.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-asxx-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-cmd-queue.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-config.h (99%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-dbg-defs.h (100%)
create mode 100644 arch/mips/include/asm/octeon/cvmx-dpi-defs.h
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fau.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-gmxx-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-board.h (96%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-fpa.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-loop.h (96%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-npi.h (96%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-rgmii.h (98%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-sgmii.h (98%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-spi.h (98%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-util.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-xaui.h (98%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper.h (99%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-ipd.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-mdio.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsx-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsxx-defs.h (100%)
create mode 100644 arch/mips/include/asm/octeon/cvmx-pemx-defs.h
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pow.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-scratch.h (100%)
create mode 100644 arch/mips/include/asm/octeon/cvmx-sli-defs.h
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spi.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spxx-defs.h (100%)
create mode 100644 arch/mips/include/asm/octeon/cvmx-sriox-defs.h
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-srxx-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-stxx-defs.h (100%)
rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-wqe.h (100%)
create mode 100644 arch/mips/include/asm/tlbmisc.h
create mode 100644 arch/mips/kernel/bmips_vec.S
create mode 100644 arch/mips/kernel/smp-bmips.c
create mode 100644 arch/mips/mm/gup.c
create mode 100644 arch/mips/netlogic/Makefile
create mode 100644 arch/mips/netlogic/common/Makefile
create mode 100644 arch/mips/netlogic/common/earlycons.c
create mode 100644 arch/mips/netlogic/common/irq.c
rename arch/mips/netlogic/{xlr => common}/smp.c (65%)
create mode 100644 arch/mips/netlogic/common/smpboot.S
rename arch/mips/netlogic/{xlr => common}/time.c (93%)
create mode 100644 arch/mips/netlogic/xlp/Makefile
create mode 100644 arch/mips/netlogic/xlp/nlm_hal.c
create mode 100644 arch/mips/netlogic/xlp/platform.c
create mode 100644 arch/mips/netlogic/xlp/setup.c
create mode 100644 arch/mips/netlogic/xlp/wakeup.c
delete mode 100644 arch/mips/netlogic/xlr/irq.c
rename arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} (60%)
create mode 100644 arch/mips/pci/pci-ath724x.c
create mode 100644 arch/mips/sgi-ip22/ip22-gio.c
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
create mode 100644 drivers/gpio/devres.c
create mode 100644 drivers/leds/leds-max8997.c
create mode 100644 drivers/media/common/tuners/mt2063.c
create mode 100644 drivers/media/common/tuners/mt2063.h
create mode 100644 drivers/media/dvb/frontends/hd29l2.c
create mode 100644 drivers/media/dvb/frontends/hd29l2.h
create mode 100644 drivers/media/dvb/frontends/hd29l2_priv.h
create mode 100644 drivers/media/rc/ir-sanyo-decoder.c
create mode 100644 drivers/media/video/as3645a.c
create mode 100644 drivers/media/video/gspca/jl2005bcd.c
create mode 100644 drivers/media/video/s5p-g2d/Makefile
create mode 100644 drivers/media/video/s5p-g2d/g2d-hw.c
create mode 100644 drivers/media/video/s5p-g2d/g2d-regs.h
create mode 100644 drivers/media/video/s5p-g2d/g2d.c
create mode 100644 drivers/media/video/s5p-g2d/g2d.h
create mode 100644 drivers/media/video/s5p-jpeg/Makefile
create mode 100644 drivers/media/video/s5p-jpeg/jpeg-core.c
create mode 100644 drivers/media/video/s5p-jpeg/jpeg-core.h
create mode 100644 drivers/media/video/s5p-jpeg/jpeg-hw.h
create mode 100644 drivers/media/video/s5p-jpeg/jpeg-regs.h
create mode 100644 drivers/media/video/uvc/uvc_debugfs.c
create mode 100644 drivers/mfd/s5m-core.c
create mode 100644 drivers/mfd/s5m-irq.c
create mode 100644 drivers/mfd/stmpe-i2c.c
create mode 100644 drivers/mfd/stmpe-spi.c
create mode 100644 drivers/misc/max8997-muic.c
create mode 100644 drivers/mmc/core/cd-gpio.c
create mode 100644 drivers/mmc/host/sdhci-pci-data.c
delete mode 100644 drivers/net/irda/au1000_ircc.h
delete mode 100644 drivers/pcmcia/au1000_generic.c
delete mode 100644 drivers/pcmcia/au1000_generic.h
delete mode 100644 drivers/pcmcia/au1000_pb1x00.c
rename drivers/staging/media/solo6x10/{jpeg.h => solo6x10-jpeg.h} (100%)
delete mode 100644 drivers/staging/octeon/cvmx-packet.h
delete mode 100644 drivers/staging/octeon/cvmx-smix-defs.h
create mode 100644 drivers/tty/serial/ar933x_uart.c
delete mode 100644 drivers/video/display/Kconfig
delete mode 100644 drivers/video/display/Makefile
delete mode 100644 drivers/video/display/display-sysfs.c
create mode 100644 drivers/video/omap2/dss/apply.c
create mode 100644 drivers/video/omap2/dss/dispc_coefs.c
create mode 100644 fs/nfsd/fault_inject.c
create mode 100644 fs/nfsd/fault_inject.h
delete mode 100644 include/linux/display.h
rename include/linux/mfd/{ab5500 => abx500}/ab5500.h (100%)
rename include/linux/mfd/{ab8500/gpadc.h => abx500/ab8500-gpadc.h} (100%)
rename include/linux/mfd/{ab8500/gpio.h => abx500/ab8500-gpio.h} (100%)
rename include/linux/mfd/{ab8500/sysctrl.h => abx500/ab8500-sysctrl.h} (100%)
rename include/linux/mfd/{ => abx500}/ab8500.h (100%)
create mode 100644 include/linux/mfd/s5m87xx/s5m-core.h
create mode 100644 include/linux/mfd/s5m87xx/s5m-pmic.h
create mode 100644 include/linux/mfd/s5m87xx/s5m-rtc.h
create mode 100644 include/linux/mmc/cd-gpio.h
create mode 100644 include/linux/mmc/sdhci-pci-data.h
create mode 100644 include/media/as3645a.h
delete mode 100644 include/media/pwc-ioctl.h
create mode 100755 tools/nfsd/inject_fault.sh
create mode 100644 tools/testing/selftests/Makefile
create mode 100644 tools/testing/selftests/breakpoints/Makefile
create mode 100644 tools/testing/selftests/breakpoints/breakpoint_test.c
create mode 100644 tools/testing/selftests/run_tests
Merging fixes/master (371de6e drm/i915: Disable RC6 on Sandybridge by default)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (fa0ad65 kconfig: adapt update-po-config to new UML layout)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arm-current/fixes (716a3dc ARM: Add arm_memblock_steal() to allocate memory away from the kernel)
$ git merge arm-current/fixes
Merge made by the 'recursive' strategy.
arch/arm/include/asm/gpio.h | 2 +-
arch/arm/include/asm/memblock.h | 2 ++
arch/arm/kernel/head.S | 8 ++++++++
arch/arm/mach-imx/mach-mx31_3ds.c | 5 ++---
arch/arm/mach-imx/mach-mx31moboard.c | 5 ++---
arch/arm/mach-imx/mach-pcm037.c | 5 ++---
arch/arm/mach-omap2/Kconfig | 4 ++--
arch/arm/mach-omap2/omap-secure.c | 13 ++-----------
arch/arm/mach-omap2/omap4-common.c | 10 +++-------
arch/arm/mach-w90x900/clksel.c | 2 +-
arch/arm/mach-w90x900/cpu.c | 2 +-
arch/arm/mach-w90x900/dev.c | 6 +++---
arch/arm/mach-w90x900/mfp.c | 2 +-
arch/arm/mm/init.c | 17 +++++++++++++++++
arch/arm/plat-omap/devices.c | 5 ++---
arch/arm/plat-s3c24xx/cpu.c | 2 --
sound/soc/nuc900/nuc900-ac97.c | 2 +-
17 files changed, 50 insertions(+), 42 deletions(-)
Merging m68k-current/for-linus (3bd9e50 m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging powerpc-merge/merge (ebb7f61 powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
$ git merge 52xx-and-virtex-current/powerpc/merge
Already up-to-date.
Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
arch/sparc/kernel/sun4m_irq.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Merging scsi-rc-fixes/master (6f6c2aa [SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority)
$ git merge scsi-rc-fixes/master
Already up-to-date.
Merging net/master (7c7c7f0 vhost-net: add module alias (v2.1))
$ git merge net/master
Merge made by the 'recursive' strategy.
Documentation/devices.txt | 3 +++
drivers/vhost/net.c | 8 +++++---
include/linux/miscdevice.h | 1 +
net/ipv6/route.c | 1 +
4 files changed, 10 insertions(+), 3 deletions(-)
Merging sound-current/for-linus (9e4ce16 Merge branch 'topic/hda' into for-linus)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (8b6a5af PCI: Add Thinkpad SL510 to pci=nocrs blacklist)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless/master (543d1b9 mac80211: fix no-op authorized transitions)
$ git merge wireless/master
Merge made by the 'recursive' strategy.
drivers/net/wireless/b43/main.c | 5 ++++-
drivers/net/wireless/ipw2x00/ipw2200.c | 4 ++--
drivers/net/wireless/rt2x00/rt2800pci.c | 28 ++++++++--------------------
net/mac80211/cfg.c | 2 +-
4 files changed, 15 insertions(+), 24 deletions(-)
Merging driver-core.current/driver-core-linus (c99516c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging staging.current/staging-linus (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge cpufreq-current/fixes
Already up-to-date.
Merging input-current/for-linus (52965cc Input: bcm5974 - set BUTTONPAD property)
$ git merge input-current/for-linus
Already up-to-date.
Merging md-current/for-linus (307729c md/raid1: perform bad-block tests for WriteMostly devices too.)
$ git merge md-current/for-linus
Already up-to-date.
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
$ git merge audit-current/for-linus
Already up-to-date.
Merging crypto-current/master (51fc6dc crypto: sha512 - reduce stack usage to safe number)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
crypto/sha512_generic.c | 62 +++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 28 deletions(-)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
$ git merge ide/master
Already up-to-date.
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
$ git merge dwmw2/master
Already up-to-date.
Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
$ git merge sh-current/sh-fixes-for-linus
Already up-to-date.
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
$ git merge rmobile-current/rmobile-fixes-for-linus
Already up-to-date.
Merging devicetree-current/devicetree/merge (c89810a ARM: prom.h: Fix build error by removing unneeded header file)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging spi-current/spi/merge (e583685 Merge branch 'spi/next' (early part) into spi/merge)
$ git merge spi-current/spi/merge
Already up-to-date.
Merging gpio-current/gpio/merge (87b9b0e gpio: Fix DA9052 GPIO build errors.)
$ git merge gpio-current/gpio/merge
Already up-to-date.
Merging arm/for-next (33710e3 Merge branches 'fixes' and 'restart' into for-next)
$ git merge arm/for-next
Merge made by the 'recursive' strategy.
arch/arm/mach-gemini/include/mach/system.h | 1 +
arch/arm/mach-shmobile/include/mach/system.h | 1 +
arch/arm/mach-vt8500/include/mach/system.h | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
Merging arm-soc/for-next (0db991d LOCAL: add back arch/arm/arm-soc-for-next-contents.txt)
$ git merge arm-soc/for-next
Resolved 'drivers/media/common/tuners/tda18218.c' using previous resolution.
Resolved 'drivers/media/video/omap3isp/ispccdc.c' using previous resolution.
Auto-merging sound/soc/txx9/txx9aclc.c
Auto-merging sound/soc/samsung/dma.c
Auto-merging sound/soc/mxs/mxs-pcm.c
Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c
Auto-merging sound/soc/ep93xx/ep93xx-pcm.c
Auto-merging drivers/usb/renesas_usbhs/fifo.c
Auto-merging drivers/usb/musb/ux500_dma.c
Auto-merging drivers/tty/serial/sh-sci.c
Auto-merging drivers/tty/serial/pch_uart.c
Auto-merging drivers/spi/spi-topcliff-pch.c
Auto-merging drivers/spi/spi-pl022.c
Auto-merging drivers/rtc/rtc-s3c.c
Auto-merging drivers/mmc/host/sh_mmcif.c
Auto-merging drivers/mmc/host/mxs-mmc.c
Auto-merging drivers/mmc/host/mxcmmc.c
Auto-merging drivers/mmc/host/mmci.c
Auto-merging drivers/media/video/timblogiw.c
Auto-merging drivers/media/video/omap3isp/ispccdc.c
CONFLICT (content): Merge conflict in drivers/media/video/omap3isp/ispccdc.c
Auto-merging drivers/media/video/mx3_camera.c
Auto-merging drivers/media/common/tuners/tda18218.c
CONFLICT (content): Merge conflict in drivers/media/common/tuners/tda18218.c
Auto-merging arch/arm/plat-samsung/devs.c
Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
Auto-merging arch/arm/mach-s3c64xx/Kconfig
Auto-merging arch/arm/mach-s3c2443/s3c2443.c
Auto-merging arch/arm/mach-s3c2416/s3c2416.c
Removing arch/arm/mach-mx5/pm-imx5.c
Removing arch/arm/mach-mx5/Makefile.boot
Removing arch/arm/mach-mx5/Makefile
Removing arch/arm/mach-mx5/Kconfig
Auto-merging arch/arm/mach-imx/pm-imx5.c
Auto-merging arch/arm/mach-imx/mach-mx53_smd.c
Auto-merging arch/arm/mach-imx/mach-mx53_loco.c
Auto-merging arch/arm/mach-imx/mach-mx53_evk.c
Auto-merging arch/arm/mach-imx/mach-mx53_ard.c
Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c
Auto-merging arch/arm/mach-exynos/common.c
Removing arch/arm/configs/mx3_defconfig
Auto-merging arch/arm/configs/imx_v6_v7_defconfig
Removing arch/arm/common/pl330.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a134863] Merge remote-tracking branch 'arm-soc/for-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/dma/atmel-dma.txt | 14 +
Documentation/dmaengine.txt | 8 +
MAINTAINERS | 1 +
arch/arm/Makefile | 1 -
arch/arm/arm-soc-for-next-contents.txt | 115 ++
arch/arm/common/Kconfig | 3 -
arch/arm/common/Makefile | 1 -
arch/arm/common/pl330.c | 1959 -------------------
.../configs/{mx5_defconfig => imx_v6_v7_defconfig} | 61 +-
arch/arm/configs/mx3_defconfig | 144 --
arch/arm/include/asm/hardware/pl330.h | 338 ++--
arch/arm/mach-at91/at91sam9263_devices.c | 13 +-
arch/arm/mach-at91/at91sam9g45_devices.c | 113 +-
arch/arm/mach-at91/at91sam9rl_devices.c | 8 +-
arch/arm/mach-at91/board-sam9m10g45ek.c | 80 +-
arch/arm/mach-at91/include/mach/board.h | 6 +-
arch/arm/mach-ep93xx/include/mach/dma.h | 6 +-
arch/arm/mach-exynos/Kconfig | 3 +
arch/arm/mach-exynos/clock.c | 9 +
arch/arm/mach-exynos/common.c | 7 +-
arch/arm/mach-exynos/dma.c | 130 ++-
arch/arm/mach-exynos/include/mach/irqs.h | 2 +
arch/arm/mach-exynos/include/mach/map.h | 7 +-
arch/arm/mach-exynos/include/mach/regs-clock.h | 42 +
arch/arm/mach-exynos/mach-nuri.c | 12 +-
arch/arm/mach-exynos/mach-origen.c | 38 +-
arch/arm/mach-exynos/mach-universal_c210.c | 1 +
arch/arm/mach-imx/Kconfig | 239 +++
arch/arm/mach-imx/Makefile | 22 +
arch/arm/mach-imx/Makefile.boot | 12 +
arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c | 2 +-
arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} | 0
arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c | 0
arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h | 0
.../crm_regs.h => mach-imx/crm-regs-imx5.h} | 0
arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h | 0
arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h | 0
arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h | 0
arch/arm/{mach-mx5 => mach-imx}/efika.h | 0
arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} | 0
.../eukrea_mbimx51-baseboard.c | 0
.../eukrea_mbimxsd-baseboard.c | 0
arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c | 0
arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c | 0
.../board-cpuimx51.c => mach-imx/mach-cpuimx51.c} | 0
.../mach-cpuimx51sd.c} | 0
.../board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} | 0
.../board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} | 0
.../mach-mx51_babbage.c} | 0
.../mach-mx51_efikamx.c} | 0
.../mach-mx51_efikasb.c} | 0
.../board-mx53_ard.c => mach-imx/mach-mx53_ard.c} | 1 -
.../board-mx53_evk.c => mach-imx/mach-mx53_evk.c} | 1 -
.../mach-mx53_loco.c} | 1 -
.../board-mx53_smd.c => mach-imx/mach-mx53_smd.c} | 1 -
arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} | 0
arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c | 0
arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} | 89 +-
arch/arm/mach-mx5/Kconfig | 244 ---
arch/arm/mach-mx5/Makefile | 26 -
arch/arm/mach-mx5/Makefile.boot | 9 -
arch/arm/mach-mx5/pm-imx5.c | 83 -
arch/arm/mach-s3c2416/s3c2416.c | 2 +
arch/arm/mach-s3c2443/s3c2443.c | 2 +
arch/arm/mach-s3c64xx/Kconfig | 1 +
arch/arm/mach-s3c64xx/Makefile | 1 +
arch/arm/mach-s3c64xx/clock.c | 20 +-
arch/arm/mach-s3c64xx/cpuidle.c | 91 +
arch/arm/mach-s3c64xx/include/mach/crag6410.h | 1 +
arch/arm/mach-s3c64xx/mach-crag6410.c | 68 +-
arch/arm/plat-mxc/Kconfig | 15 +-
arch/arm/plat-mxc/include/mach/mx3fb.h | 15 +
arch/arm/plat-nomadik/include/plat/ste_dma40.h | 11 +-
arch/arm/plat-s5p/Kconfig | 5 +
arch/arm/plat-samsung/dev-backlight.c | 2 +
arch/arm/plat-samsung/devs.c | 28 +
arch/arm/plat-samsung/dma-ops.c | 4 +-
arch/arm/plat-samsung/include/plat/devs.h | 1 +
arch/arm/plat-samsung/include/plat/dma-ops.h | 5 +-
arch/arm/plat-samsung/include/plat/dma-pl330.h | 16 +
arch/arm/plat-samsung/include/plat/dma.h | 6 +-
arch/arm/plat-samsung/include/plat/regs-rtc.h | 81 +-
arch/arm/plat-samsung/include/plat/rtc-core.h | 27 +
arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 +
drivers/dma/Kconfig | 28 +-
drivers/dma/Makefile | 1 +
drivers/dma/amba-pl08x.c | 41 +-
drivers/dma/at_hdmac.c | 103 +-
drivers/dma/at_hdmac_regs.h | 1 +
drivers/dma/coh901318.c | 12 +-
drivers/dma/coh901318_lli.c | 23 +-
drivers/dma/coh901318_lli.h | 4 +-
drivers/dma/dmaengine.c | 4 +-
drivers/dma/dw_dmac.c | 83 +-
drivers/dma/dw_dmac_regs.h | 1 +
drivers/dma/ep93xx_dma.c | 90 +-
drivers/dma/fsldma.c | 4 +-
drivers/dma/imx-dma.c | 10 +-
drivers/dma/imx-sdma.c | 22 +-
drivers/dma/intel_mid_dma.c | 39 +-
drivers/dma/intel_mid_dma_regs.h | 4 +-
drivers/dma/iop-adma.c | 16 +-
drivers/dma/ipu/ipu_idmac.c | 29 +-
drivers/dma/mpc512x_dma.c | 12 +-
drivers/dma/mxs-dma.c | 53 +-
drivers/dma/pch_dma.c | 20 +-
drivers/dma/pl330.c | 2025 +++++++++++++++++++-
drivers/dma/shdma.c | 25 +-
drivers/dma/sirf-dma.c | 707 +++++++
drivers/dma/ste_dma40.c | 441 ++++-
drivers/dma/ste_dma40_ll.h | 11 +
drivers/dma/timb_dma.c | 30 +-
drivers/dma/txx9dmac.c | 12 +-
drivers/media/video/mx3_camera.c | 2 +-
drivers/media/video/omap3isp/ispccdc.c | 2 +-
drivers/media/video/timblogiw.c | 2 +-
drivers/misc/carma/carma-fpga-program.c | 2 +-
drivers/mmc/host/atmel-mci.c | 10 +-
drivers/mmc/host/mmci.c | 11 +-
drivers/mmc/host/mxcmmc.c | 10 +-
drivers/mmc/host/mxs-mmc.c | 10 +-
drivers/mmc/host/sh_mmcif.c | 4 +-
drivers/mmc/host/tmio_mmc_dma.c | 4 +-
drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 22 +-
drivers/net/ethernet/micrel/ks8842.c | 4 +-
drivers/rtc/rtc-s3c.c | 71 +-
drivers/spi/spi-dw-mid.c | 8 +-
drivers/spi/spi-ep93xx.c | 9 +-
drivers/spi/spi-pl022.c | 8 +-
drivers/spi/spi-topcliff-pch.c | 4 +-
drivers/tty/serial/amba-pl011.c | 8 +-
drivers/tty/serial/pch_uart.c | 4 +-
drivers/tty/serial/sh-sci.c | 4 +-
drivers/usb/musb/ux500_dma.c | 4 +-
drivers/usb/renesas_usbhs/fifo.c | 4 +-
drivers/video/mx3fb.c | 65 +-
include/linux/amba/pl08x.h | 4 +-
include/linux/dmaengine.h | 99 +-
include/linux/dw_dmac.h | 2 +-
include/linux/mtd/gpmi-nand.h | 68 +
include/linux/sh_dma.h | 2 +-
include/linux/sirfsoc_dma.h | 6 +
sound/atmel/abdac.c | 2 +-
sound/atmel/ac97c.c | 10 +-
sound/soc/ep93xx/ep93xx-pcm.c | 4 +-
sound/soc/imx/imx-pcm-dma-mx2.c | 6 +-
sound/soc/mxs/mxs-pcm.c | 2 +-
sound/soc/samsung/dma.c | 4 +-
sound/soc/sh/siu_pcm.c | 4 +-
sound/soc/txx9/txx9aclc.c | 2 +-
150 files changed, 5229 insertions(+), 3365 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
delete mode 100644 arch/arm/common/pl330.c
rename arch/arm/configs/{mx5_defconfig => imx_v6_v7_defconfig} (80%)
delete mode 100644 arch/arm/configs/mx3_defconfig
rename arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c (99%)
rename arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} (100%)
rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c (100%)
rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h (100%)
rename arch/arm/{mach-mx5/crm_regs.h => mach-imx/crm-regs-imx5.h} (100%)
rename arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h (100%)
rename arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h (100%)
rename arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h (100%)
rename arch/arm/{mach-mx5 => mach-imx}/efika.h (100%)
rename arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} (100%)
rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimx51-baseboard.c (100%)
rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimxsd-baseboard.c (100%)
rename arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c (100%)
rename arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c (100%)
rename arch/arm/{mach-mx5/board-cpuimx51.c => mach-imx/mach-cpuimx51.c} (100%)
rename arch/arm/{mach-mx5/board-cpuimx51sd.c => mach-imx/mach-cpuimx51sd.c} (100%)
rename arch/arm/{mach-mx5/board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} (100%)
rename arch/arm/{mach-mx5/board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} (100%)
rename arch/arm/{mach-mx5/board-mx51_babbage.c => mach-imx/mach-mx51_babbage.c} (100%)
rename arch/arm/{mach-mx5/board-mx51_efikamx.c => mach-imx/mach-mx51_efikamx.c} (100%)
rename arch/arm/{mach-mx5/board-mx51_efikasb.c => mach-imx/mach-mx51_efikasb.c} (100%)
rename arch/arm/{mach-mx5/board-mx53_ard.c => mach-imx/mach-mx53_ard.c} (99%)
rename arch/arm/{mach-mx5/board-mx53_evk.c => mach-imx/mach-mx53_evk.c} (99%)
rename arch/arm/{mach-mx5/board-mx53_loco.c => mach-imx/mach-mx53_loco.c} (99%)
rename arch/arm/{mach-mx5/board-mx53_smd.c => mach-imx/mach-mx53_smd.c} (99%)
rename arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} (100%)
rename arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c (100%)
rename arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} (58%)
delete mode 100644 arch/arm/mach-mx5/Kconfig
delete mode 100644 arch/arm/mach-mx5/Makefile
delete mode 100644 arch/arm/mach-mx5/Makefile.boot
delete mode 100644 arch/arm/mach-mx5/pm-imx5.c
create mode 100644 arch/arm/mach-s3c64xx/cpuidle.c
create mode 100644 arch/arm/plat-samsung/include/plat/rtc-core.h
create mode 100644 drivers/dma/sirf-dma.c
create mode 100644 include/linux/mtd/gpmi-nand.h
create mode 100644 include/linux/sirfsoc_dma.h
Merging arm-perf/for-next/perf (7e9523f ARM: perf: remove unused armpmu_get_max_events)
$ git merge arm-perf/for-next/perf
Merge made by the 'recursive' strategy.
Merging at91/at91-next (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
$ git merge at91/at91-next
Already up-to-date.
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
$ git merge davinci/davinci-next
Already up-to-date.
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
$ git merge linux-spec/for-next
Already up-to-date.
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
$ git merge omap/for-next
Already up-to-date.
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
$ git merge pxa/for-next
Already up-to-date.
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
$ git merge samsung/next-samsung
Already up-to-date.
Merging s5p/for-next (e914815 Merge branches 'next-samsung-cleanup2' and 'next-samsung-devel2' into for-next)
$ git merge s5p/for-next
Merge made by the 'recursive' strategy.
Merging tegra/for-next (bdd01cc Merge branch 'for-3.3/dt' into for-next)
$ git merge tegra/for-next
Merge made by the 'recursive' strategy.
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
$ git merge xilinx/arm-next
Already up-to-date.
Merging blackfin/for-linus (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (166c0ea C6X: replace tick_nohz_stop/restart_sched_tick calls)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (ea78f5b CRIS: Update documentation)
$ git merge cris/for-next
Auto-merging drivers/net/cris/eth_v10.c
Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
Merge made by the 'recursive' strategy.
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 (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
$ git merge quilt/hexagon
Resolved 'arch/hexagon/Kconfig' using previous resolution.
Auto-merging arch/hexagon/Kconfig
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 61ec0f4] Merge branch 'quilt/hexagon'
$ git diff -M --stat --summary HEAD^..
arch/hexagon/Kconfig | 23 ++++-------------------
arch/hexagon/Makefile | 4 ----
arch/hexagon/include/asm/spinlock_types.h | 2 --
arch/hexagon/kernel/dma.c | 1 +
arch/hexagon/kernel/ptrace.c | 1 +
arch/hexagon/kernel/time.c | 7 +++----
arch/hexagon/kernel/vdso.c | 1 +
7 files changed, 10 insertions(+), 29 deletions(-)
Merging ia64/next (65cc21b ia64: Add accept4() syscall)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (3bd9e50 m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac)
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (1f7034b m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled)
$ git merge m68knommu/for-next
Already up-to-date.
Merging microblaze/next (d761f0c microblaze: Add topology init)
$ git merge microblaze/next
Merge made by the 'recursive' strategy.
arch/microblaze/kernel/setup.c | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
Merging mips/mips-for-linux-next (c49c41a Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security)
$ git merge mips/mips-for-linux-next
Already up-to-date.
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
$ git merge openrisc/for-upstream
Already up-to-date.
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
$ git merge parisc/for-next
Merge made by the 'recursive' strategy.
arch/parisc/include/asm/futex.h | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
Merging powerpc/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
$ git merge powerpc/next
Already up-to-date.
Merging 4xx/next (e4f387d powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit)
$ git merge 4xx/next
Already up-to-date.
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
$ git merge 52xx-and-virtex/powerpc/next
Merge made by the 'recursive' strategy.
Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
$ git merge galak/next
Already up-to-date.
Merging s390/features (f018e7a [patch 1/1] [PATCH] cleanup entry point definition)
$ git merge s390/features
Merge made by the 'recursive' strategy.
arch/s390/Makefile | 1 -
arch/s390/kernel/vmlinux.lds.S | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
$ git merge sh/sh-latest
Already up-to-date.
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
$ git merge rmobile/rmobile-latest
Already up-to-date.
Merging sparc-next/master (e4e1118 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines)
$ git merge tile/master
Already up-to-date.
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
$ git merge xtensa/master
Merge made by the 'recursive' strategy.
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 (83eb26a ceph: ensure prealloc_blob is in place when removing xattr)
$ git merge ceph/for-next
Already up-to-date.
Merging cifs/master (7250170 cifs: integer overflow in parse_dacl())
$ git merge cifs/master
Merge made by the 'recursive' strategy.
fs/cifs/cifsacl.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
$ git merge configfs/linux-next
Already up-to-date.
Merging ecryptfs/next (7e6aad6 eCryptfs: Improve statfs reporting)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/super.c
Merge made by the 'recursive' strategy.
fs/ecryptfs/crypto.c | 68 ++++++++++++++++++++++++++++++++++++----
fs/ecryptfs/ecryptfs_kernel.h | 5 +++
fs/ecryptfs/keystore.c | 9 ++---
fs/ecryptfs/super.c | 14 ++++++++-
4 files changed, 82 insertions(+), 14 deletions(-)
Merging ext3/for_next (46fe44c quota: Pass information that quota is stored in system file to userspace)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
fs/ext2/ioctl.c | 22 ++++++++++++++++------
fs/jbd/checkpoint.c | 27 ++++++++++++++++++++++-----
fs/jbd/recovery.c | 4 ++++
fs/quota/dquot.c | 8 +++++---
include/linux/quota.h | 6 +++++-
5 files changed, 52 insertions(+), 15 deletions(-)
Merging ext4/dev (d50f2ab ext4: fix undefined behavior in ext4_fill_flex_info())
$ git merge ext4/dev
Already up-to-date.
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
$ git merge fatfs/master
Already up-to-date.
Merging fuse/for-next (03c9693 cuse: implement memory mapping)
$ git merge fuse/for-next
Auto-merging fs/fuse/inode.c
Auto-merging fs/fuse/fuse_i.h
Merge made by the 'recursive' strategy.
fs/fuse/cuse.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++-
fs/fuse/dev.c | 155 ++-----------------
fs/fuse/fuse_i.h | 35 ++++-
fs/fuse/inode.c | 167 +++++++++++++++++++-
include/linux/fuse.h | 25 +++
5 files changed, 656 insertions(+), 152 deletions(-)
Merging gfs2/master (66ad863 GFS2: Fix nlink setting on inode creation)
$ git merge gfs2/master
Already up-to-date.
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
$ git merge hfsplus/for-next
Already up-to-date.
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
$ git merge jfs/next
Already up-to-date.
Merging logfs/master (21f3eb8 logfs: update page reference count for pined pages)
$ git merge logfs/master
Resolved 'fs/logfs/dev_mtd.c' using previous resolution.
Resolved 'fs/logfs/file.c' using previous resolution.
Auto-merging fs/logfs/super.c
Auto-merging fs/logfs/readwrite.c
Auto-merging fs/logfs/logfs.h
Auto-merging fs/logfs/inode.c
Auto-merging fs/logfs/file.c
CONFLICT (content): Merge conflict in fs/logfs/file.c
Auto-merging fs/logfs/dir.c
Auto-merging fs/logfs/dev_mtd.c
CONFLICT (content): Merge conflict in fs/logfs/dev_mtd.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4b2f210] Merge remote-tracking branch 'logfs/master'
$ git diff -M --stat --summary HEAD^..
MAINTAINERS | 1 +
fs/logfs/dev_mtd.c | 26 +++++++++++-------------
fs/logfs/dir.c | 2 +-
fs/logfs/file.c | 2 +
fs/logfs/gc.c | 2 +-
fs/logfs/inode.c | 4 ++-
fs/logfs/journal.c | 1 -
fs/logfs/logfs.h | 5 +++-
fs/logfs/readwrite.c | 51 +++++++++++++++++++++++++++++++++----------------
fs/logfs/segment.c | 51 ++++++++++++++++++++++++++++++++++++++-----------
fs/logfs/super.c | 3 +-
11 files changed, 99 insertions(+), 49 deletions(-)
Merging nfs/linux-next (7c5465d pnfsblock: alloc short extent before submit bio)
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
fs/nfs/blocklayout/blocklayout.c | 202 ++++++++++++++++++++++++-------------
fs/nfs/blocklayout/blocklayout.h | 12 ++-
fs/nfs/blocklayout/extents.c | 176 ++++++++++++++-------------------
fs/nfs/callback.h | 2 +-
fs/nfs/callback_xdr.c | 4 +
fs/nfs/nfs4filelayoutdev.c | 2 +-
fs/nfs/nfs4proc.c | 2 +-
7 files changed, 222 insertions(+), 178 deletions(-)
Merging nfsd/nfsd-next (7a6ef8c nfsd4: nfsd4_create_clid_dir return value is unused)
$ git merge nfsd/nfsd-next
Already up-to-date.
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
$ git merge nilfs2/for-next
Already up-to-date.
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
$ git merge ocfs2/linux-next
Already up-to-date.
Merging omfs/for-next (976d167 Linux 3.1-rc9)
$ git merge omfs/for-next
Already up-to-date.
Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (f766619 fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (1f4f434 UBI: use own macros for the layout volume)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/master (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
$ git merge xfs/master
Already up-to-date.
Merging vfs/for-next (f84a8bd btrfs: take allocation of ->tree_root into open_ctree())
$ git merge vfs/for-next
Auto-merging fs/btrfs/disk-io.c
Merge made by the 'recursive' strategy.
fs/btrfs/ctree.h | 2 +-
fs/btrfs/disk-io.c | 70 +++++++++++++------------
fs/btrfs/disk-io.h | 6 +-
fs/btrfs/export.c | 2 +-
fs/btrfs/ioctl.c | 7 +--
fs/btrfs/super.c | 143 +++++++++++++++++++++++-----------------------------
fs/btrfs/volumes.c | 5 +-
7 files changed, 110 insertions(+), 125 deletions(-)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
$ git merge vfs-scale/vfs-scale-working
Already up-to-date.
Merging pci/linux-next (76ccc29 x86/PCI: Expand the x86_msi_ops to have a restore MSIs.)
$ git merge pci/linux-next
Already up-to-date.
Merging hid/for-next (f62f619 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
$ git merge hid/for-next
Already up-to-date.
Merging quilt/i2c (c52f8ab MAINTAINERS: List i2c-omap and i2c-davinci drivers)
$ git merge quilt/i2c
Merge made by the 'recursive' strategy.
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
$ git merge bjdooks-i2c/next-i2c
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/i2c/omap-i2c.txt | 30 ++++++
drivers/i2c/busses/i2c-omap.c | 110 +++++++++++++-------
2 files changed, 100 insertions(+), 40 deletions(-)
create mode 100644 Documentation/devicetree/bindings/i2c/omap-i2c.txt
Merging quilt/jdelvare-hwmon (bdba5d4 hwmon: (sysfs-interface) Update tempX_type attribute to be more generic)
$ git merge quilt/jdelvare-hwmon
Auto-merging drivers/hwmon/it87.c
Merge made by the 'recursive' strategy.
Documentation/hwmon/it87 | 13 +-
Documentation/hwmon/lm63 | 21 +-
Documentation/hwmon/sysfs-interface | 2 +-
drivers/hwmon/Kconfig | 8 +-
drivers/hwmon/adm1031.c | 153 ++++++---
drivers/hwmon/coretemp.c | 26 +-
drivers/hwmon/it87.c | 61 +++-
drivers/hwmon/lm63.c | 592 +++++++++++++++++++++++++++++++----
drivers/hwmon/lm90.c | 2 +-
drivers/hwmon/max1111.c | 15 +-
10 files changed, 735 insertions(+), 158 deletions(-)
Merging hwmon-staging/hwmon-next (91c8eab max1111.c: fix checkpatch warning)
$ git merge hwmon-staging/hwmon-next
Already up-to-date.
Merging quilt/kernel-doc (5851bad The Japanese/Korean/Chinese versions still need updating.)
$ git merge quilt/kernel-doc
Auto-merging Documentation/sysctl/kernel.txt
Merge made by the 'recursive' strategy.
Documentation/sysctl/kernel.txt | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
$ git merge docs/docs-move
Already up-to-date.
Merging v4l-dvb/master (1264000 [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver)
$ git merge v4l-dvb/master
Already up-to-date.
Merging kbuild/for-next (6165951 Merge branch 'kbuild/misc' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging arch/powerpc/boot/Makefile
Auto-merging arch/arm/boot/Makefile
Auto-merging Makefile
Merge made by the 'recursive' strategy.
Documentation/coccinelle.txt | 10 ++-
Makefile | 2 +-
arch/arm/boot/Makefile | 6 +-
arch/microblaze/boot/Makefile | 2 +-
arch/openrisc/boot/Makefile | 4 +-
arch/powerpc/boot/Makefile | 4 +-
scripts/Makefile.lib | 8 +-
scripts/coccicheck | 19 +++-
.../coccinelle/api/devm_request_and_ioremap.cocci | 105 ++++++++++++++++++
scripts/coccinelle/api/kstrdup.cocci | 75 ++++++++++++-
scripts/coccinelle/api/memdup.cocci | 34 +++++-
scripts/coccinelle/api/memdup_user.cocci | 39 ++++++-
scripts/coccinelle/free/devm_free.cocci | 71 ++++++++++++
scripts/coccinelle/free/kfree.cocci | 14 ++-
scripts/coccinelle/iterators/fen.cocci | 73 +++++++++++-
scripts/coccinelle/iterators/itnull.cocci | 54 ++++++++--
scripts/coccinelle/locks/call_kern.cocci | 67 ++++++++---
scripts/coccinelle/locks/flags.cocci | 12 +-
scripts/coccinelle/locks/mini_lock.cocci | 15 ++-
scripts/coccinelle/misc/doubleinit.cocci | 8 +-
scripts/coccinelle/null/eno.cocci | 36 ++++++-
scripts/dtc/dtc.c | 21 ++++-
scripts/dtc/srcpos.c | 4 +
scripts/dtc/srcpos.h | 1 +
scripts/genksyms/Makefile | 1 +
scripts/kconfig/Makefile | 6 +-
scripts/kconfig/confdata.c | 4 +-
scripts/kconfig/expr.h | 1 +
scripts/kconfig/gconf.c | 11 +-
scripts/kconfig/lkc.h | 6 +-
scripts/kconfig/mconf.c | 1 +
scripts/kconfig/merge_config.sh | 117 ++++++++++++++++++++
scripts/tags.sh | 48 ++++++++-
33 files changed, 767 insertions(+), 112 deletions(-)
create mode 100644 scripts/coccinelle/api/devm_request_and_ioremap.cocci
create mode 100644 scripts/coccinelle/free/devm_free.cocci
create mode 100644 scripts/kconfig/merge_config.sh
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
$ git merge kconfig/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging libata/NEXT (318893e ahci: support the STA2X11 I/O Hub)
$ git merge libata/NEXT
Already up-to-date.
Merging infiniband/for-next (1583676 Merge branches 'cma', 'misc', 'mlx4', 'nes', 'qib' and 'uverbs' into for-next)
$ git merge infiniband/for-next
Already up-to-date.
Merging acpi/next (683c4ad Merge branch 'acpica' into next)
$ git merge acpi/next
Auto-merging include/acpi/acpixf.h
Auto-merging drivers/acpi/acpica/acglobal.h
Merge made by the 'recursive' strategy.
drivers/acpi/acpica/Makefile | 157 ++++++++++--
drivers/acpi/acpica/acconfig.h | 3 +-
drivers/acpi/acpica/acevents.h | 1 +
drivers/acpi/acpica/acglobal.h | 13 +-
drivers/acpi/acpica/acinterp.h | 2 +
drivers/acpi/acpica/aclocal.h | 15 +-
drivers/acpi/acpica/acobject.h | 6 +-
drivers/acpi/acpica/acopcode.h | 4 +
drivers/acpi/acpica/acpredef.h | 39 +++-
drivers/acpi/acpica/acresrc.h | 113 ++++++---
drivers/acpi/acpica/acutils.h | 1 +
drivers/acpi/acpica/amlcode.h | 27 ++-
drivers/acpi/acpica/amlresrc.h | 136 ++++++++++
drivers/acpi/acpica/dsargs.c | 2 +-
drivers/acpi/acpica/dsfield.c | 81 +++++-
drivers/acpi/acpica/evevent.c | 12 +
drivers/acpi/acpica/evglock.c | 6 +
drivers/acpi/acpica/evregion.c | 29 ++-
drivers/acpi/acpica/exconfig.c | 6 +-
drivers/acpi/acpica/excreate.c | 29 ++-
drivers/acpi/acpica/exdump.c | 7 +-
drivers/acpi/acpica/exfield.c | 28 ++-
drivers/acpi/acpica/exfldio.c | 36 ++-
drivers/acpi/acpica/exprep.c | 25 ++
drivers/acpi/acpica/exutils.c | 25 ++
drivers/acpi/acpica/hwvalid.c | 2 +
drivers/acpi/acpica/nspredef.c | 29 ++
drivers/acpi/acpica/nsrepair.c | 1 +
drivers/acpi/acpica/nsrepair2.c | 5 +-
drivers/acpi/acpica/psargs.c | 141 +++++++++-
drivers/acpi/acpica/psopcode.c | 13 +-
drivers/acpi/acpica/pstree.c | 6 +
drivers/acpi/acpica/rscalc.c | 87 ++++++-
drivers/acpi/acpica/rscreate.c | 67 +++++-
drivers/acpi/acpica/rsdump.c | 194 +++++++++++++-
drivers/acpi/acpica/rsinfo.c | 56 ++++-
drivers/acpi/acpica/rsirq.c | 31 +++
drivers/acpi/acpica/rslist.c | 75 +++++-
drivers/acpi/acpica/rsmisc.c | 267 +++++++++++++++++++-
drivers/acpi/acpica/rsserial.c | 441 +++++++++++++++++++++++++++++++
drivers/acpi/acpica/rsutils.c | 54 ++++
drivers/acpi/acpica/rsxface.c | 50 ++++-
drivers/acpi/acpica/tbfadt.c | 26 ++-
drivers/acpi/acpica/tbutils.c | 7 +
drivers/acpi/acpica/utdecode.c | 4 +-
drivers/acpi/acpica/utmutex.c | 9 +-
drivers/acpi/acpica/utresrc.c | 276 +++++++++++++++++---
drivers/acpi/acpica/utxfmutex.c | 187 +++++++++++++
include/acpi/acnames.h | 1 +
include/acpi/acpixf.h | 27 ++-
include/acpi/acrestyp.h | 207 ++++++++++++++-
include/acpi/actbl.h | 23 ++-
include/acpi/actbl1.h | 57 ++++-
include/acpi/actbl3.h | 552 +++++++++++++++++++++++++++++++++++++++
include/acpi/actypes.h | 12 +-
55 files changed, 3460 insertions(+), 250 deletions(-)
create mode 100644 drivers/acpi/acpica/rsserial.c
create mode 100644 drivers/acpi/acpica/utxfmutex.c
create mode 100644 include/acpi/actbl3.h
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
$ git merge cpupowerutils/master
Already up-to-date.
Merging ieee1394/for-next (2ca526b MAINTAINERS: firewire git URL update)
$ git merge ieee1394/for-next
Already up-to-date.
Merging ubi/linux-next (805a6af Linux 3.2)
$ git merge ubi/linux-next
Already up-to-date.
Merging dlm/next (60f98d1 dlm: add recovery callbacks)
$ git merge dlm/next
Already up-to-date.
Merging scsi/master (410f02d [SCSI] scsi_dh_alua: Retry the check-condition in case Mode Parameters Changed)
$ git merge scsi/master
Merge made by the 'recursive' strategy.
drivers/scsi/bfa/bfa_defs_svc.h | 7 +-
drivers/scsi/bfa/bfa_fc.h | 155 ----------
drivers/scsi/bfa/bfa_fcpim.c | 416 +---------------------------
drivers/scsi/bfa/bfa_fcpim.h | 7 -
drivers/scsi/bfa/bfa_svc.h | 5 -
drivers/scsi/bfa/bfad.c | 2 +
drivers/scsi/bfa/bfad_attr.c | 2 +-
drivers/scsi/bfa/bfad_bsg.c | 27 ++-
drivers/scsi/bfa/bfad_drv.h | 2 +
drivers/scsi/bfa/bfad_im.c | 56 ++++
drivers/scsi/bfa/bfad_im.h | 27 ++
drivers/scsi/cxgbi/libcxgbi.c | 5 +-
drivers/scsi/device_handler/scsi_dh_alua.c | 5 +
drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +
drivers/scsi/fcoe/fcoe.c | 3 +-
drivers/scsi/qla4xxx/ql4_os.c | 419 +++++++++++++++++-----------
drivers/scsi/qla4xxx/ql4_version.h | 2 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +
18 files changed, 385 insertions(+), 761 deletions(-)
Merging target-updates/for-next (895f302 target: Set additional sense length field in sense data)
$ git merge target-updates/for-next
Removing include/target/target_core_transport.h
Removing include/target/target_core_tpg.h
Removing include/target/target_core_tmr.h
Removing include/target/target_core_fabric_lib.h
Auto-merging include/target/target_core_fabric.h
Removing include/target/target_core_device.h
Removing drivers/target/target_core_stat.h
Removing drivers/target/target_core_hba.h
Removing drivers/target/target_core_cdb.h
Merge made by the 'recursive' strategy.
Documentation/target/tcm_mod_builder.py | 60 +---
drivers/target/iscsi/iscsi_target.c | 19 +-
drivers/target/iscsi/iscsi_target_auth.c | 36 ++-
drivers/target/iscsi/iscsi_target_configfs.c | 11 +-
drivers/target/iscsi/iscsi_target_device.c | 3 +-
drivers/target/iscsi/iscsi_target_erl0.c | 2 +-
drivers/target/iscsi/iscsi_target_erl1.c | 2 +-
drivers/target/iscsi/iscsi_target_erl2.c | 2 +-
drivers/target/iscsi/iscsi_target_login.c | 23 +-
drivers/target/iscsi/iscsi_target_nego.c | 4 +-
drivers/target/iscsi/iscsi_target_nodeattrib.c | 3 +-
drivers/target/iscsi/iscsi_target_stat.c | 17 +-
drivers/target/iscsi/iscsi_target_tmr.c | 2 +-
drivers/target/iscsi/iscsi_target_tpg.c | 6 +-
drivers/target/iscsi/iscsi_target_util.c | 8 +-
drivers/target/loopback/tcm_loop.c | 33 +--
drivers/target/loopback/tcm_loop.h | 11 +-
drivers/target/target_core_alua.c | 7 +-
drivers/target/target_core_cdb.c | 39 ++-
drivers/target/target_core_cdb.h | 14 -
drivers/target/target_core_configfs.c | 34 ++-
drivers/target/target_core_device.c | 15 +-
drivers/target/target_core_fabric_configfs.c | 8 +-
drivers/target/target_core_fabric_lib.c | 13 +-
drivers/target/target_core_file.c | 15 +-
drivers/target/target_core_hba.c | 7 +-
drivers/target/target_core_hba.h | 7 -
drivers/target/target_core_iblock.c | 7 +-
drivers/target/target_core_internal.h | 123 +++++++
drivers/target/target_core_pr.c | 24 +--
drivers/target/target_core_pr.h | 2 -
drivers/target/target_core_pscsi.c | 20 +-
drivers/target/target_core_rd.c | 6 +-
drivers/target/target_core_stat.c | 9 +-
drivers/target/target_core_stat.h | 8 -
drivers/target/target_core_tmr.c | 36 ++-
drivers/target/target_core_tpg.c | 9 +-
drivers/target/target_core_transport.c | 343 +++++++++++---------
drivers/target/target_core_ua.c | 6 +-
drivers/target/tcm_fc/tfc_cmd.c | 57 +---
drivers/target/tcm_fc/tfc_conf.c | 6 +-
drivers/target/tcm_fc/tfc_io.c | 5 +-
drivers/target/tcm_fc/tfc_sess.c | 5 +-
include/target/target_core_backend.h | 65 ++++
include/target/target_core_base.h | 169 ++++++++---
include/target/target_core_device.h | 63 ----
...rget_core_fabric_ops.h => target_core_fabric.h} | 94 +++++-
include/target/target_core_fabric_lib.h | 28 --
include/target/target_core_tmr.h | 35 --
include/target/target_core_tpg.h | 35 --
include/target/target_core_transport.h | 287 ----------------
51 files changed, 829 insertions(+), 1014 deletions(-)
delete mode 100644 drivers/target/target_core_cdb.h
delete mode 100644 drivers/target/target_core_hba.h
create mode 100644 drivers/target/target_core_internal.h
delete mode 100644 drivers/target/target_core_stat.h
create mode 100644 include/target/target_core_backend.h
delete mode 100644 include/target/target_core_device.h
rename include/target/{target_core_fabric_ops.h => target_core_fabric.h} (50%)
delete mode 100644 include/target/target_core_fabric_lib.h
delete mode 100644 include/target/target_core_tmr.h
delete mode 100644 include/target/target_core_tpg.h
delete mode 100644 include/target/target_core_transport.h
Merging target-merge/for-next-merge (a42d985 ib_srpt: Initial SRP Target merge for v3.3-rc1)
$ git merge target-merge/for-next-merge
Merge made by the 'recursive' strategy.
drivers/infiniband/Kconfig | 1 +
drivers/infiniband/Makefile | 1 +
drivers/infiniband/ulp/srpt/Kconfig | 12 +
drivers/infiniband/ulp/srpt/Makefile | 2 +
drivers/infiniband/ulp/srpt/ib_dm_mad.h | 139 ++
drivers/infiniband/ulp/srpt/ib_srpt.c | 4073 +++++++++++++++++++++++++++++++
drivers/infiniband/ulp/srpt/ib_srpt.h | 444 ++++
7 files changed, 4672 insertions(+), 0 deletions(-)
create mode 100644 drivers/infiniband/ulp/srpt/Kconfig
create mode 100644 drivers/infiniband/ulp/srpt/Makefile
create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h
create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c
create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
$ git merge ibft/linux-next
Already up-to-date.
Merging slave-dma/next (e08b881 ARM: mach-shmobile: specify CHCLR registers on SH7372)
$ git merge slave-dma/next
Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
Merge made by the 'recursive' strategy.
arch/arm/mach-shmobile/setup-sh7372.c | 15 ++++++++--
drivers/dma/imx-sdma.c | 5 ++-
drivers/dma/shdma.c | 47 +++++++++++++++++++++-----------
include/linux/sh_dma.h | 2 +
4 files changed, 48 insertions(+), 21 deletions(-)
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
$ git merge async_tx/next
Already up-to-date.
Merging net-next/master (356b954 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k)
$ git merge net-next/master
Already up-to-date.
Merging wireless-next/master (a8c1f65 igmp: Avoid zero delay when receiving odd mixture of IGMP queries)
$ git merge wireless-next/master
Already up-to-date.
Merging bluetooth/master (c5993de Bluetooth: Correct packet len calculation)
$ git merge bluetooth/master
Already up-to-date.
Merging mtd/master (f5eee48 mtd: cfi: AMD/Fujitsu compatibles: add panic write support)
$ git merge mtd/master
Auto-merging drivers/mtd/nand/gpmi-nand/gpmi-lib.c
Merge made by the 'recursive' strategy.
drivers/mtd/chips/cfi_cmdset_0002.c | 240 +++++++++++++++++++++++++++++++++
drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 18 ++-
drivers/mtd/nand/nand_base.c | 2 +-
fs/jffs2/erase.c | 2 +-
4 files changed, 256 insertions(+), 6 deletions(-)
Merging l2-mtd/master (dc5ba2c mtd: onenand: samsung: add missing iounmap)
$ git merge l2-mtd/master
Resolved 'drivers/mtd/nand/gpmi-nand/gpmi-lib.c' using previous resolution.
Auto-merging drivers/mtd/nand/gpmi-nand/gpmi-lib.c
CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-lib.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7b8f8d8] Merge remote-tracking branch 'l2-mtd/master'
$ git diff -M --stat --summary HEAD^..
drivers/mtd/devices/pmc551.c | 4 ++--
drivers/mtd/mtd_blkdevs.c | 1 +
drivers/mtd/mtdblock.c | 8 ++++++--
drivers/mtd/mtdcore.c | 2 +-
drivers/mtd/onenand/samsung.c | 4 ++--
include/linux/mtd/blktrans.h | 1 +
6 files changed, 13 insertions(+), 7 deletions(-)
Merging crypto/master (b85a088 crypto: sha512 - use standard ror64())
$ git merge crypto/master
Auto-merging crypto/sha512_generic.c
Merge made by the 'recursive' strategy.
arch/arm/mach-tegra/fuse.c | 2 +
arch/x86/crypto/blowfish_glue.c | 30 +
arch/x86/crypto/serpent-sse2-i586-asm_32.S | 29 +-
arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 29 +-
arch/x86/crypto/twofish_glue_3way.c | 47 ++
crypto/sha512_generic.c | 13 +-
drivers/char/hw_random/tx4939-rng.c | 5 +-
drivers/crypto/Kconfig | 11 +
drivers/crypto/Makefile | 1 +
drivers/crypto/caam/caamalg.c | 126 +++-
drivers/crypto/geode-aes.c | 6 +-
drivers/crypto/hifn_795x.c | 3 +-
drivers/crypto/ixp4xx_crypto.c | 4 +-
drivers/crypto/mv_cesa.c | 12 +-
drivers/crypto/n2_core.c | 7 +-
drivers/crypto/omap-aes.c | 8 +-
drivers/crypto/omap-sham.c | 4 +
drivers/crypto/picoxcell_crypto.c | 46 +-
drivers/crypto/s5p-sss.c | 6 +-
drivers/crypto/talitos.c | 1 +
drivers/crypto/tegra-aes.c | 1096 ++++++++++++++++++++++++++
drivers/crypto/tegra-aes.h | 103 +++
include/linux/bitops.h | 20 +
include/linux/crypto.h | 5 +
24 files changed, 1539 insertions(+), 75 deletions(-)
create mode 100644 drivers/crypto/tegra-aes.c
create mode 100644 drivers/crypto/tegra-aes.h
Merging sound/for-next (7a67923 Merge branch 'fix/misc' into for-next)
$ git merge sound/for-next
Auto-merging sound/core/Kconfig
Merge made by the 'recursive' strategy.
sound/core/Kconfig | 13 +++----------
sound/pci/hda/hda_intel.c | 1 +
2 files changed, 4 insertions(+), 10 deletions(-)
Merging sound-asoc/for-next (40432fc Merge branch 'for-3.3' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c
Merge made by the 'recursive' strategy.
sound/soc/imx/imx-pcm-dma-mx2.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
Merging cpufreq/next (6c523c6 [CPUFREQ] EXYNOS: Removed useless headers and codes)
$ git merge cpufreq/next
Already up-to-date.
Merging quilt/rr (35c861e intelfbdrv.c: bailearly is an int module_param)
$ git merge quilt/rr
Recorded preimage for 'drivers/input/touchscreen/ucb1400_ts.c'
Recorded preimage for 'fs/nfs/client.c'
Recorded preimage for 'scripts/mod/file2alias.c'
Resolved 'arch/x86/kvm/mmu.c' using previous resolution.
Auto-merging scripts/mod/file2alias.c
CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
Auto-merging fs/nfs/client.c
CONFLICT (content): Merge conflict in fs/nfs/client.c
Auto-merging drivers/input/touchscreen/ucb1400_ts.c
CONFLICT (content): Merge conflict in drivers/input/touchscreen/ucb1400_ts.c
Auto-merging arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/input/touchscreen/ucb1400_ts.c'.
Recorded resolution for 'fs/nfs/client.c'.
Recorded resolution for 'scripts/mod/file2alias.c'.
[master 11909e3] Merge branch 'quilt/rr'
$ git diff -M --stat --summary HEAD^..
Merging input/next (dab78d7 Input: tc3589x-keypad - add missing kerneldoc)
$ git merge input/next
Already up-to-date.
Merging input-mt/next (02f8c6a Linux 3.0)
$ git merge input-mt/next
Already up-to-date.
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
$ git merge lsm/for-next
Already up-to-date.
Merging block/for-next (b3021da Merge branch 'for-3.3/core' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
Merging quilt/device-mapper (ecefc36 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge quilt/device-mapper
Already up-to-date.
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
$ git merge embedded/master
Already up-to-date.
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
$ git merge firmware/master
Already up-to-date.
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
$ git merge pcmcia/master
Already up-to-date.
Merging battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent)
$ git merge battery/master
Already up-to-date.
Merging mmc/mmc-next (0ac9f78 mmc: MMC-4.5 Data Tag Support)
$ git merge mmc/mmc-next
Merge made by the 'recursive' strategy.
drivers/mmc/card/block.c | 21 ++++++++++++++++-----
drivers/mmc/core/mmc.c | 14 ++++++++++++++
include/linux/mmc/card.h | 2 ++
include/linux/mmc/mmc.h | 3 +++
4 files changed, 35 insertions(+), 5 deletions(-)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
Merging slab/for-next (a1450d6 Merge branch 'slab/urgent' into for-next)
$ git merge slab/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next (307729c md/raid1: perform bad-block tests for WriteMostly devices too.)
$ git merge md/for-next
Already up-to-date.
Merging mfd/for-next (74d836c rtc: max8925: Add function to work as wakeup source)
$ git merge mfd/for-next
Already up-to-date.
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
$ git merge hdlc/hdlc-next
Already up-to-date.
Merging drm/drm-next (095f979 drm/nouveau/pm: fix build with HWMON off)
$ git merge drm/drm-next
Already up-to-date.
Merging fbdev/fbdev-next (f787f32 module_param: make bool parameters really bool (drivers/video/i810))
$ git merge fbdev/fbdev-next
Already up-to-date.
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
$ git merge viafb/viafb-next
Already up-to-date.
Merging omap_dss2/for-next (9a90168 OMAPDSS: HDMI: Disable DDC internal pull up)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (0c437c4 regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config)
$ git merge regulator/for-next
Already up-to-date.
Merging security/next (7b7e591 ima: fix invalid memory reference)
$ git merge security/next
Already up-to-date.
Merging selinux/master (f423e5b capabilities: remove __cap_full_set definition)
$ git merge selinux/master
Already up-to-date.
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
$ git merge lblnet/master
Already up-to-date.
Merging watchdog/linux-next (e2bf7c4 watchdog: omap_wdt.c: fix the WDIOC_GETBOOTSTATUS ioctl if not implemented.)
$ git merge watchdog/linux-next
Already up-to-date.
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
$ git merge bdev/master
Already up-to-date.
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging iommu/next (f93ea73 Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next)
$ git merge iommu/next
Already up-to-date.
Merging osd/linux-next (724577c ore: Must support none-PAGE-aligned IO)
$ git merge osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
$ git merge jc_docs/docs-next
Already up-to-date.
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
$ git merge nommu/master
Already up-to-date.
Merging trivial/for-next (9879326 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
$ git merge trivial/for-next
Already up-to-date.
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
$ git merge audit/for-next
Already up-to-date.
Merging pm/linux-next (ee34a37 PM / Hibernate: Drop the check of swap space size for compressed image)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
arch/arm/mach-shmobile/pm-sh7372.c | 2 +-
drivers/base/power/domain.c | 15 +++++++++++++++
drivers/base/power/domain_governor.c | 24 +++++++++++++++++++-----
kernel/Makefile | 3 +--
kernel/power/swap.c | 13 +++++++------
5 files changed, 43 insertions(+), 14 deletions(-)
Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
$ git merge apm/for-next
Already up-to-date.
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
$ git merge fsnotify/for-next
Auto-merging include/linux/fsnotify_backend.h
Auto-merging fs/notify/mark.c
Auto-merging fs/notify/group.c
Auto-merging fs/notify/fanotify/fanotify_user.c
Auto-merging fs/nfsd/vfs.c
Auto-merging fs/cachefiles/namei.c
Merge made by the 'recursive' strategy.
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 (94d57c4 enic: Update MAINTAINERS)
$ git merge irda/for-next
Already up-to-date.
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next)
$ git merge edac-amd/for-next
Auto-merging drivers/edac/edac_mc_sysfs.c
Merge made by the 'recursive' strategy.
Documentation/edac.txt | 4 ++--
drivers/edac/amd64_edac.c | 32 ++++++++++++++++++++++++++++----
drivers/edac/edac_mc_sysfs.c | 4 ++--
3 files changed, 32 insertions(+), 8 deletions(-)
Merging devicetree/devicetree/next (661db79 of/irq: Add interrupts-names property to name an irq resource)
$ git merge devicetree/devicetree/next
Already up-to-date.
Merging spi/spi/next (14c173e spi/tegra: depend instead of select TEGRA_SYSTEM_DMA)
$ git merge spi/spi/next
Already up-to-date.
Merging gpio/gpio/next (f408c98 GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion)
$ git merge gpio/gpio/next
Already up-to-date.
Merging tip/auto-latest (cba67ca Merge branch 'x86/urgent' into auto-latest)
$ git merge tip/auto-latest
Auto-merging mm/mmap.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/mm.h
Removing arch/x86/um/sys_call_table_32.S
Removing arch/x86/kernel/syscall_table_32.S
Removing arch/x86/include/asm/unistd_64.h
Removing arch/x86/include/asm/unistd_32.h
Auto-merging Makefile
Merge made by the 'recursive' strategy.
Documentation/kbuild/makefiles.txt | 50 ++-
Makefile | 9 +-
arch/um/Makefile | 9 +-
arch/x86/Makefile | 6 +
arch/x86/ia32/Makefile | 1 +
arch/x86/ia32/ia32entry.S | 359 ------------------
arch/x86/ia32/nosyscall.c | 7 +
arch/x86/ia32/syscall_ia32.c | 25 ++
arch/x86/include/asm/Kbuild | 5 +-
arch/x86/include/asm/ia32_unistd.h | 13 +-
arch/x86/include/asm/syscall.h | 1 +
arch/x86/include/asm/unistd.h | 54 +++-
arch/x86/include/asm/unistd_32.h | 401 --------------------
arch/x86/include/asm/unistd_64.h | 732 ------------------------------------
arch/x86/kernel/Makefile | 3 +-
arch/x86/kernel/asm-offsets_32.c | 8 +
arch/x86/kernel/asm-offsets_64.c | 19 +-
arch/x86/kernel/entry_32.S | 37 +--
arch/x86/kernel/syscall_32.c | 25 ++
arch/x86/kernel/syscall_64.c | 20 +-
arch/x86/kernel/syscall_table_32.S | 350 -----------------
arch/x86/lib/copy_page_64.S | 12 +-
arch/x86/syscalls/Makefile | 43 +++
arch/x86/syscalls/syscall_32.tbl | 357 ++++++++++++++++++
arch/x86/syscalls/syscall_64.tbl | 320 ++++++++++++++++
arch/x86/syscalls/syscallhdr.sh | 27 ++
arch/x86/syscalls/syscalltbl.sh | 15 +
arch/x86/um/Makefile | 3 +-
arch/x86/um/sys_call_table_32.S | 26 --
arch/x86/um/sys_call_table_32.c | 55 +++
arch/x86/um/sys_call_table_64.c | 33 +-
arch/x86/um/user-offsets.c | 15 +
include/linux/mm.h | 1 +
include/linux/sched.h | 2 +-
kernel/rcutorture.c | 8 +-
kernel/time/tick-sched.c | 8 +
mm/mmap.c | 5 +
scripts/Makefile.headersinst | 10 +-
scripts/checksyscalls.sh | 15 +-
39 files changed, 1098 insertions(+), 1991 deletions(-)
create mode 100644 arch/x86/ia32/nosyscall.c
create mode 100644 arch/x86/ia32/syscall_ia32.c
delete mode 100644 arch/x86/include/asm/unistd_32.h
delete mode 100644 arch/x86/include/asm/unistd_64.h
create mode 100644 arch/x86/kernel/syscall_32.c
delete mode 100644 arch/x86/kernel/syscall_table_32.S
create mode 100644 arch/x86/syscalls/Makefile
create mode 100644 arch/x86/syscalls/syscall_32.tbl
create mode 100644 arch/x86/syscalls/syscall_64.tbl
create mode 100644 arch/x86/syscalls/syscallhdr.sh
create mode 100644 arch/x86/syscalls/syscalltbl.sh
delete mode 100644 arch/x86/um/sys_call_table_32.S
create mode 100644 arch/x86/um/sys_call_table_32.c
Merging rcu/rcu/next (f0312a5 rcu: Bring RTFP.txt up to date.)
$ git merge rcu/rcu/next
Merge made by the 'recursive' strategy.
Documentation/RCU/RTFP.txt | 1908 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 1757 insertions(+), 151 deletions(-)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
$ git merge cputime/cputime
Already up-to-date.
Merging uprobes/for-next (0a19a93 perf: perf interface for uprobes)
$ git merge uprobes/for-next
Auto-merging tools/perf/util/symbol.h
Auto-merging tools/perf/util/symbol.c
Auto-merging tools/perf/builtin-probe.c
Auto-merging mm/mmap.c
Auto-merging kernel/trace/trace.h
Auto-merging kernel/signal.c
Auto-merging kernel/fork.c
Auto-merging kernel/Makefile
Auto-merging include/linux/srcu.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/mm_types.h
Auto-merging arch/x86/kernel/signal.c
Auto-merging arch/x86/kernel/Makefile
Auto-merging arch/x86/include/asm/thread_info.h
Auto-merging arch/x86/Kconfig
Auto-merging arch/Kconfig
Merge made by the 'recursive' strategy.
Documentation/trace/uprobetracer.txt | 93 ++
arch/Kconfig | 3 +
arch/x86/Kconfig | 5 +-
arch/x86/include/asm/thread_info.h | 2 +
arch/x86/include/asm/uprobes.h | 59 ++
arch/x86/kernel/Makefile | 1 +
arch/x86/kernel/signal.c | 6 +
arch/x86/kernel/uprobes.c | 674 ++++++++++++++
include/linux/mm_types.h | 5 +
include/linux/sched.h | 4 +
include/linux/srcu.h | 43 +
include/linux/uprobes.h | 171 ++++
kernel/Makefile | 1 +
kernel/fork.c | 15 +
kernel/signal.c | 3 +
kernel/trace/Kconfig | 20 +
kernel/trace/Makefile | 2 +
kernel/trace/trace.h | 5 +
kernel/trace/trace_kprobe.c | 899 +-----------------
kernel/trace/trace_probe.c | 786 ++++++++++++++++
kernel/trace/trace_probe.h | 162 ++++
kernel/trace/trace_uprobe.c | 768 +++++++++++++++
kernel/uprobes.c | 1546 +++++++++++++++++++++++++++++++
mm/mmap.c | 33 +-
tools/perf/Documentation/perf-probe.txt | 14 +
tools/perf/builtin-probe.c | 49 +-
tools/perf/util/probe-event.c | 430 +++++++--
tools/perf/util/probe-event.h | 12 +-
tools/perf/util/symbol.c | 8 +
tools/perf/util/symbol.h | 1 +
30 files changed, 4832 insertions(+), 988 deletions(-)
create mode 100644 Documentation/trace/uprobetracer.txt
create mode 100644 arch/x86/include/asm/uprobes.h
create mode 100644 arch/x86/kernel/uprobes.c
create mode 100644 include/linux/uprobes.h
create mode 100644 kernel/trace/trace_probe.c
create mode 100644 kernel/trace/trace_probe.h
create mode 100644 kernel/trace/trace_uprobe.c
create mode 100644 kernel/uprobes.c
$ git am -3 ../patches/0001-uprobes-bad-merge-fix.patch
Applying: uprobes: bad merge fix
$ git reset HEAD^
Unstaged changes after reset:
M include/linux/srcu.h
$ git add .
$ git commit -v -a --amend
[master aa9bd6c] Merge remote-tracking branch 'uprobes/for-next'
Merging cgroup/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge cgroup/for-next
Already up-to-date.
Merging kmemleak/kmemleak (029aeff kmemleak: Add support for memory hotplug)
$ git merge kmemleak/kmemleak
Already up-to-date.
Merging kvm/linux-next (da69dee KVM: PPC: Whitespace fix for kvm.h)
$ git merge kvm/linux-next
Already up-to-date.
Merging oprofile/for-next (42fcb11 Merge branch 'oprofile/perf-ibs-v4' into oprofile/for-next)
$ git merge oprofile/for-next
Resolved 'tools/perf/util/header.c' using previous resolution.
Resolved 'tools/perf/util/header.h' using previous resolution.
Auto-merging tools/perf/util/parse-events.c
Auto-merging tools/perf/util/header.h
CONFLICT (content): Merge conflict in tools/perf/util/header.h
Auto-merging tools/perf/util/header.c
CONFLICT (content): Merge conflict in tools/perf/util/header.c
Auto-merging tools/perf/builtin-record.c
Auto-merging arch/x86/include/asm/perf_event.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a8ecafd] Merge remote-tracking branch 'oprofile/for-next'
$ git diff -M --stat --summary HEAD^..
arch/x86/include/asm/msr-index.h | 5 +
arch/x86/include/asm/perf_event.h | 2 +
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 438 +++++++++++++++++++++++++++++-
tools/perf/builtin-record.c | 28 +--
tools/perf/scripts/perl/bin/ibs-record | 23 ++
tools/perf/scripts/perl/bin/ibs-report | 6 +
tools/perf/scripts/perl/ibs.pl | 47 ++++
tools/perf/util/header.c | 443 +++++++++++++++++++-----------
tools/perf/util/header.h | 2 +
tools/perf/util/parse-events.c | 84 ++++++-
10 files changed, 885 insertions(+), 193 deletions(-)
create mode 100644 tools/perf/scripts/perl/bin/ibs-record
create mode 100644 tools/perf/scripts/perl/bin/ibs-report
create mode 100644 tools/perf/scripts/perl/ibs.pl
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
$ git merge xen/upstream/xen
Resolved 'arch/x86/include/asm/cmpxchg.h' using previous resolution.
Auto-merging arch/x86/include/asm/cmpxchg.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master dc1d4b2] Merge remote-tracking branch 'xen/upstream/xen'
$ git diff -M --stat --summary HEAD^..
Merging xen-two/linux-next (429de5a Merge branch 'stable/for-linus-fixes-3.3' into linux-next)
$ git merge xen-two/linux-next
Merge made by the 'recursive' strategy.
drivers/xen/xen-balloon.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
$ git merge xen-pvhvm/linux-next
Already up-to-date.
Merging percpu/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge workqueues/for-next
Already up-to-date.
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
$ git merge sfi/sfi-test
Already up-to-date.
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
$ git merge asm-generic/next
Already up-to-date.
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
$ git merge drivers-x86/linux-next
Already up-to-date.
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
$ git merge hwpoison/hwpoison
Already up-to-date.
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
$ git merge sysctl/master
Auto-merging fs/proc/proc_sysctl.c
Merge made by the 'recursive' strategy.
fs/proc/proc_sysctl.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
$ git merge namespace/master
Auto-merging fs/proc/namespaces.c
Auto-merging fs/proc/inode.c
Merge made by the 'recursive' strategy.
fs/proc/inode.c | 6 +-
fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 142 insertions(+), 24 deletions(-)
Merging regmap/for-next (0a92815 mfd: Clearing events requires event registers to be writable for da9052-core)
$ git merge regmap/for-next
Already up-to-date.
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
$ git merge hsi/for-next
Auto-merging include/linux/Kbuild
Auto-merging drivers/Makefile
Auto-merging drivers/Kconfig
Merge made by the 'recursive' strategy.
Documentation/DocBook/device-drivers.tmpl | 17 +
Documentation/ioctl/ioctl-number.txt | 1 +
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/hsi/Kconfig | 19 +
drivers/hsi/Makefile | 6 +
drivers/hsi/clients/Kconfig | 13 +
drivers/hsi/clients/Makefile | 5 +
drivers/hsi/clients/hsi_char.c | 802 +++++++++++++++++++++++++++++
drivers/hsi/hsi.c | 494 ++++++++++++++++++
drivers/hsi/hsi_boardinfo.c | 62 +++
drivers/hsi/hsi_core.h | 35 ++
include/linux/Kbuild | 1 +
include/linux/hsi/Kbuild | 1 +
include/linux/hsi/hsi.h | 410 +++++++++++++++
include/linux/hsi/hsi_char.h | 63 +++
16 files changed, 1932 insertions(+), 0 deletions(-)
create mode 100644 drivers/hsi/Kconfig
create mode 100644 drivers/hsi/Makefile
create mode 100644 drivers/hsi/clients/Kconfig
create mode 100644 drivers/hsi/clients/Makefile
create mode 100644 drivers/hsi/clients/hsi_char.c
create mode 100644 drivers/hsi/hsi.c
create mode 100644 drivers/hsi/hsi_boardinfo.c
create mode 100644 drivers/hsi/hsi_core.h
create mode 100644 include/linux/hsi/Kbuild
create mode 100644 include/linux/hsi/hsi.h
create mode 100644 include/linux/hsi/hsi_char.h
Merging driver-core/driver-core-next (c99516c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge driver-core/driver-core-next
Already up-to-date.
Merging tty/tty-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge usb/usb-next
Already up-to-date.
Merging staging/staging-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge staging/staging-next
Already up-to-date.
Merging char-misc/char-misc-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
$ git merge char-misc/char-misc-next
Already up-to-date.
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
$ git merge bkl-config/config
Already up-to-date.
Merging tmem/linux-next (805a6af Linux 3.2)
$ git merge tmem/linux-next
Already up-to-date.
Merging writeback/writeback-for-next (bc31b86 writeback: move MIN_WRITEBACK_PAGES to fs-writeback.c)
$ git merge writeback/writeback-for-next
Already up-to-date.
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
$ git merge arm-dt/devicetree/arm-next
Already up-to-date.
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
$ git merge hwspinlock/linux-next
Already up-to-date.
Merging pinctrl/for-next (0d2006b pinctrl: remove unnecessary max pin number)
$ git merge pinctrl/for-next
Already up-to-date.
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
$ git merge moduleh/for-sfr
Already up-to-date.
Merging vhost/linux-next (193a667 alpha: drop pci_iomap/pci_iounmap from pci-noop.c)
$ git merge vhost/linux-next
Already up-to-date.
Merging kmap_atomic/kmap_atomic (bb30431 feature-removal-schedule.txt: add the deprecated form of kmap_atomic())
$ git merge kmap_atomic/kmap_atomic
Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
Auto-merging mm/vmalloc.c
Auto-merging mm/swapfile.c
Auto-merging mm/memory.c
Auto-merging mm/ksm.c
Auto-merging mm/filemap.c
Auto-merging include/linux/bio.h
Auto-merging fs/pipe.c
Auto-merging fs/ntfs/super.c
Auto-merging fs/nfs/nfs4proc.c
Auto-merging fs/logfs/segment.c
Auto-merging fs/logfs/readwrite.c
Auto-merging fs/logfs/dir.c
Auto-merging fs/fuse/file.c
Auto-merging fs/fuse/dev.c
Auto-merging fs/aio.c
Auto-merging drivers/target/tcm_fc/tfc_io.c
Auto-merging drivers/target/target_core_transport.c
Removing drivers/staging/rtl8192u/ieee80211/kmap_types.h
Auto-merging drivers/scsi/fcoe/fcoe.c
Auto-merging drivers/scsi/cxgbi/libcxgbi.c
Auto-merging drivers/memstick/host/tifm_ms.c
Auto-merging drivers/memstick/host/jmb38x_ms.c
Auto-merging drivers/crypto/hifn_795x.c
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/mips/mm/init.c
Auto-merging arch/mips/mm/c-r4k.c
Auto-merging Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 84a5928] Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
$ git diff -M --stat --summary HEAD^..
Documentation/feature-removal-schedule.txt | 8 ++
arch/arm/include/asm/highmem.h | 2 +-
arch/arm/mm/copypage-fa.c | 12 ++--
arch/arm/mm/copypage-feroceon.c | 12 ++--
arch/arm/mm/copypage-v3.c | 12 ++--
arch/arm/mm/copypage-v4mc.c | 8 +-
arch/arm/mm/copypage-v4wb.c | 12 ++--
arch/arm/mm/copypage-v4wt.c | 12 ++--
arch/arm/mm/copypage-v6.c | 12 ++--
arch/arm/mm/copypage-xsc3.c | 12 ++--
arch/arm/mm/copypage-xscale.c | 8 +-
arch/arm/mm/highmem.c | 4 +-
arch/frv/include/asm/highmem.h | 2 +-
arch/frv/mm/highmem.c | 4 +-
arch/mips/include/asm/highmem.h | 2 +-
arch/mips/mm/c-r4k.c | 4 +-
arch/mips/mm/highmem.c | 4 +-
arch/mips/mm/init.c | 8 +-
arch/mn10300/include/asm/highmem.h | 2 +-
arch/parisc/include/asm/cacheflush.h | 2 +-
arch/powerpc/include/asm/highmem.h | 2 +-
arch/powerpc/kvm/book3s_pr.c | 4 +-
arch/powerpc/mm/dma-noncoherent.c | 5 +-
arch/powerpc/mm/hugetlbpage.c | 4 +-
arch/powerpc/mm/mem.c | 4 +-
arch/sh/mm/cache-sh4.c | 4 +-
arch/sh/mm/cache.c | 12 ++--
arch/sparc/include/asm/highmem.h | 2 +-
arch/sparc/mm/highmem.c | 4 +-
arch/tile/include/asm/highmem.h | 2 +-
arch/tile/mm/highmem.c | 4 +-
arch/um/kernel/skas/uaccess.c | 4 +-
arch/x86/crypto/aesni-intel_glue.c | 24 +++---
arch/x86/include/asm/highmem.h | 2 +-
arch/x86/kernel/crash_dump_32.c | 6 +-
arch/x86/kvm/lapic.c | 8 +-
arch/x86/kvm/paging_tmpl.h | 4 +-
arch/x86/kvm/x86.c | 8 +-
arch/x86/lib/usercopy_32.c | 4 +-
arch/x86/mm/highmem_32.c | 4 +-
crypto/ahash.c | 4 +-
crypto/async_tx/async_memcpy.c | 8 +-
crypto/blkcipher.c | 8 +-
crypto/ccm.c | 4 +-
crypto/scatterwalk.c | 8 +-
crypto/shash.c | 8 +-
drivers/ata/libata-sff.c | 8 +-
drivers/block/brd.c | 20 +++---
drivers/block/drbd/drbd_bitmap.c | 50 ++++++------
drivers/block/drbd/drbd_nl.c | 4 +-
drivers/block/loop.c | 16 ++--
drivers/block/pktcdvd.c | 8 +-
drivers/crypto/hifn_795x.c | 10 +-
drivers/edac/edac_mc.c | 4 +-
drivers/gpu/drm/drm_cache.c | 8 +-
drivers/gpu/drm/ttm/ttm_tt.c | 16 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 6 +-
drivers/ide/ide-taskfile.c | 4 +-
drivers/infiniband/ulp/iser/iser_memory.c | 8 +-
drivers/md/bitmap.c | 42 +++++-----
drivers/md/dm-crypt.c | 8 +-
drivers/media/video/ivtv/ivtv-udma.c | 4 +-
drivers/memstick/host/jmb38x_ms.c | 4 +-
drivers/memstick/host/tifm_ms.c | 4 +-
drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 10 +--
drivers/net/ethernet/sun/cassini.c | 4 +-
drivers/scsi/arcmsr/arcmsr_hba.c | 8 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 5 +-
drivers/scsi/cxgbi/libcxgbi.c | 5 +-
drivers/scsi/fcoe/fcoe.c | 4 +-
drivers/scsi/fcoe/fcoe_transport.c | 5 +-
drivers/scsi/gdth.c | 4 +-
drivers/scsi/ips.c | 6 +-
drivers/scsi/isci/request.c | 16 ++--
drivers/scsi/libfc/fc_fcp.c | 8 +-
drivers/scsi/libfc/fc_libfc.c | 8 +-
drivers/scsi/libfc/fc_libfc.h | 2 +-
drivers/scsi/libfc/fc_lport.c | 2 +-
drivers/scsi/libiscsi_tcp.c | 4 +-
drivers/scsi/libsas/sas_host_smp.c | 8 +-
drivers/scsi/megaraid.c | 4 +-
drivers/scsi/mvsas/mv_sas.c | 4 +-
drivers/scsi/scsi_debug.c | 24 +++---
drivers/scsi/scsi_lib.c | 4 +-
drivers/scsi/sd_dif.c | 12 ++--
drivers/staging/gma500/mmu.c | 30 ++++----
drivers/staging/hv/storvsc_drv.c | 31 +++----
drivers/staging/pohmelfs/inode.c | 8 +-
drivers/staging/rtl8192u/ieee80211/cipher.c | 8 +-
drivers/staging/rtl8192u/ieee80211/digest.c | 8 +-
drivers/staging/rtl8192u/ieee80211/internal.h | 17 ----
drivers/staging/rtl8192u/ieee80211/kmap_types.h | 20 -----
drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 19 +---
drivers/staging/zcache/zcache-main.c | 16 ++--
drivers/staging/zram/xvmalloc.c | 39 +++++-----
drivers/staging/zram/zram_drv.c | 44 +++++-----
drivers/target/target_core_transport.c | 4 +-
drivers/target/tcm_fc/tfc_io.c | 10 +--
drivers/vhost/vhost.c | 4 +-
fs/afs/fsclient.c | 8 +-
fs/afs/mntpt.c | 4 +-
fs/aio.c | 30 ++++----
fs/bio-integrity.c | 10 +-
fs/btrfs/compression.c | 12 ++--
fs/btrfs/extent_io.c | 16 ++--
fs/btrfs/file-item.c | 4 +-
fs/btrfs/inode.c | 26 +++---
fs/btrfs/lzo.c | 4 +-
fs/btrfs/scrub.c | 8 +-
fs/btrfs/zlib.c | 4 +-
fs/ecryptfs/mmap.c | 4 +-
fs/ecryptfs/read_write.c | 8 +-
fs/exec.c | 4 +-
fs/exofs/dir.c | 4 +-
fs/ext2/dir.c | 4 +-
fs/fuse/dev.c | 4 +-
fs/fuse/file.c | 4 +-
fs/gfs2/aops.c | 12 ++--
fs/gfs2/lops.c | 8 +-
fs/gfs2/quota.c | 4 +-
fs/jbd/journal.c | 12 ++--
fs/jbd/transaction.c | 4 +-
fs/jbd2/commit.c | 4 +-
fs/jbd2/journal.c | 12 ++--
fs/jbd2/transaction.c | 4 +-
fs/logfs/dir.c | 18 ++--
fs/logfs/readwrite.c | 38 +++++-----
fs/logfs/segment.c | 4 +-
fs/minix/dir.c | 4 +-
fs/namei.c | 4 +-
fs/nfs/dir.c | 8 +-
fs/nfs/nfs4proc.c | 4 +-
fs/nilfs2/cpfile.c | 94 +++++++++++-----------
fs/nilfs2/dat.c | 38 +++++-----
fs/nilfs2/dir.c | 4 +-
fs/nilfs2/ifile.c | 4 +-
fs/nilfs2/mdt.c | 4 +-
fs/nilfs2/page.c | 8 +-
fs/nilfs2/recovery.c | 4 +-
fs/nilfs2/segbuf.c | 4 +-
fs/nilfs2/sufile.c | 68 ++++++++--------
fs/ntfs/aops.c | 20 +++---
fs/ntfs/attrib.c | 20 +++---
fs/ntfs/file.c | 16 ++--
fs/ntfs/super.c | 8 +-
fs/ocfs2/aops.c | 16 ++--
fs/pipe.c | 8 +-
fs/reiserfs/stree.c | 4 +-
fs/reiserfs/tail_conversion.c | 4 +-
fs/splice.c | 7 +-
fs/squashfs/file.c | 8 +-
fs/squashfs/symlink.c | 4 +-
fs/ubifs/file.c | 4 +-
fs/udf/file.c | 4 +-
include/crypto/scatterwalk.h | 28 +------
include/linux/bio.h | 8 +-
include/linux/highmem.h | 79 +++++++++++++-----
kernel/debug/kdb/kdb_support.c | 4 +-
kernel/power/snapshot.c | 28 +++---
lib/scatterlist.c | 4 +-
lib/swiotlb.c | 5 +-
mm/bounce.c | 4 +-
mm/filemap.c | 8 +-
mm/ksm.c | 12 ++--
mm/memory.c | 4 +-
mm/shmem.c | 4 +-
mm/swapfile.c | 30 ++++----
mm/vmalloc.c | 8 +-
net/core/kmap_skb.h | 4 +-
net/rds/ib_recv.c | 7 +-
net/rds/info.c | 6 +-
net/rds/iw_recv.c | 7 +-
net/rds/loop.c | 2 +-
net/rds/rds.h | 2 +-
net/rds/recv.c | 2 +-
net/rds/tcp_recv.c | 11 +--
net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +-
net/sunrpc/socklib.c | 4 +-
net/sunrpc/xdr.c | 20 +++---
net/sunrpc/xprtrdma/rpc_rdma.c | 8 +-
security/tomoyo/domain.c | 4 +-
182 files changed, 917 insertions(+), 967 deletions(-)
delete mode 100644 drivers/staging/rtl8192u/ieee80211/kmap_types.h
Merging xshm/xshm-for-next (0d0ab68 caif-xshm: Add CAIF driver for Shared memory for M7400)
$ git merge xshm/xshm-for-next
Auto-merging include/linux/Kbuild
Auto-merging drivers/Makefile
Auto-merging drivers/Kconfig
Merge made by the 'recursive' strategy.
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/net/caif/Kconfig | 10 +
drivers/net/caif/Makefile | 1 +
drivers/net/caif/caif_xshm.c | 915 +++++++++++++++++++++++++++
drivers/xshm/Kconfig | 61 ++
drivers/xshm/Makefile | 5 +
drivers/xshm/dummy_c2c_genio.c | 76 +++
drivers/xshm/xshm_boot.c | 1150 +++++++++++++++++++++++++++++++++
drivers/xshm/xshm_bus.c | 113 ++++
drivers/xshm/xshm_chr.c | 1262 +++++++++++++++++++++++++++++++++++++
drivers/xshm/xshm_dev.c | 546 ++++++++++++++++
drivers/xshm/xshm_ipctoc.h | 153 +++++
include/linux/Kbuild | 1 +
include/linux/c2c_genio.h | 195 ++++++
include/linux/xshm/Kbuild | 1 +
include/linux/xshm/xshm_dev.h | 245 +++++++
include/linux/xshm/xshm_netlink.h | 95 +++
18 files changed, 4832 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/caif/caif_xshm.c
create mode 100644 drivers/xshm/Kconfig
create mode 100644 drivers/xshm/Makefile
create mode 100644 drivers/xshm/dummy_c2c_genio.c
create mode 100644 drivers/xshm/xshm_boot.c
create mode 100644 drivers/xshm/xshm_bus.c
create mode 100644 drivers/xshm/xshm_chr.c
create mode 100644 drivers/xshm/xshm_dev.c
create mode 100644 drivers/xshm/xshm_ipctoc.h
create mode 100644 include/linux/c2c_genio.h
create mode 100644 include/linux/xshm/Kbuild
create mode 100644 include/linux/xshm/xshm_dev.h
create mode 100644 include/linux/xshm/xshm_netlink.h
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
$ git merge memblock/memblock-kill-early_node_map
Already up-to-date.
Merging remoteproc/for-next (238c1e1 rpmsg: depends on EXPERIMENTAL)
$ git merge remoteproc/for-next
Auto-merging include/linux/mod_devicetable.h
Auto-merging drivers/Makefile
Auto-merging drivers/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-bus-rpmsg | 75 ++
Documentation/remoteproc.txt | 324 ++++++
Documentation/rpmsg.txt | 293 ++++++
MAINTAINERS | 7 +
arch/arm/plat-omap/include/plat/remoteproc.h | 57 +
drivers/Kconfig | 4 +
drivers/Makefile | 2 +
drivers/remoteproc/Kconfig | 29 +
drivers/remoteproc/Makefile | 9 +
drivers/remoteproc/omap_remoteproc.c | 238 +++++
drivers/remoteproc/omap_remoteproc.h | 69 ++
drivers/remoteproc/remoteproc_core.c | 1438 ++++++++++++++++++++++++++
drivers/remoteproc/remoteproc_debugfs.c | 179 ++++
drivers/remoteproc/remoteproc_internal.h | 44 +
drivers/remoteproc/remoteproc_rpmsg.c | 295 ++++++
drivers/rpmsg/Kconfig | 10 +
drivers/rpmsg/Makefile | 1 +
drivers/rpmsg/virtio_rpmsg_bus.c | 1026 ++++++++++++++++++
include/linux/mod_devicetable.h | 9 +
include/linux/remoteproc.h | 264 +++++
include/linux/rpmsg.h | 326 ++++++
include/linux/virtio_ids.h | 1 +
samples/Kconfig | 8 +
samples/Makefile | 2 +-
samples/rpmsg/Makefile | 1 +
samples/rpmsg/rpmsg_client_sample.c | 100 ++
26 files changed, 4810 insertions(+), 1 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-bus-rpmsg
create mode 100644 Documentation/remoteproc.txt
create mode 100644 Documentation/rpmsg.txt
create mode 100644 arch/arm/plat-omap/include/plat/remoteproc.h
create mode 100644 drivers/remoteproc/Kconfig
create mode 100644 drivers/remoteproc/Makefile
create mode 100644 drivers/remoteproc/omap_remoteproc.c
create mode 100644 drivers/remoteproc/omap_remoteproc.h
create mode 100644 drivers/remoteproc/remoteproc_core.c
create mode 100644 drivers/remoteproc/remoteproc_debugfs.c
create mode 100644 drivers/remoteproc/remoteproc_internal.h
create mode 100644 drivers/remoteproc/remoteproc_rpmsg.c
create mode 100644 drivers/rpmsg/Kconfig
create mode 100644 drivers/rpmsg/Makefile
create mode 100644 drivers/rpmsg/virtio_rpmsg_bus.c
create mode 100644 include/linux/remoteproc.h
create mode 100644 include/linux/rpmsg.h
create mode 100644 samples/rpmsg/Makefile
create mode 100644 samples/rpmsg/rpmsg_client_sample.c
$ git am -3 ../patches/rpmsg__rename_virtqueue_add_buf_gfp_to_virtqueue_add_buf.patch
Applying: rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
$ git reset HEAD^
Unstaged changes after reset:
M drivers/rpmsg/virtio_rpmsg_bus.c
$ git add .
$ git commit -v -a --amend
[master 2fc2f46] Merge remote-tracking branch 'remoteproc/for-next'
$ git am -3 ../patches/fix-for-vring_new_virtqueue-change.patch
Applying: remoteproc: don't use virtio's weak barriers
$ git reset HEAD^
Unstaged changes after reset:
M drivers/remoteproc/remoteproc_rpmsg.c
$ git add .
$ git commit -v -a --amend
[master e3d7246] Merge remote-tracking branch 'remoteproc/for-next'
Merging kvmtool/master (0234379 kvm tools: Remove tags/TAGS on "make clean")
$ git merge kvmtool/master
Resolved 'include/net/9p/9p.h' using previous resolution.
Resolved 'scripts/kconfig/Makefile' using previous resolution.
Auto-merging scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
Auto-merging include/net/9p/9p.h
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Auto-merging arch/x86/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c800cd3] Merge remote-tracking branch 'kvmtool/master'
$ git diff -M --stat --summary HEAD^..
MAINTAINERS | 8 +
arch/x86/Kconfig | 31 +
scripts/kconfig/Makefile | 7 +-
tools/kvm/.gitignore | 11 +
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-sandbox.txt | 16 +
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/Documentation/virtio-console.txt | 41 +
tools/kvm/Makefile | 364 ++++++
tools/kvm/README | 109 ++
tools/kvm/builtin-balloon.c | 80 ++
tools/kvm/builtin-debug.c | 103 ++
tools/kvm/builtin-help.c | 63 ++
tools/kvm/builtin-list.c | 149 +++
tools/kvm/builtin-pause.c | 88 ++
tools/kvm/builtin-resume.c | 88 ++
tools/kvm/builtin-run.c | 1218 ++++++++++++++++++++
tools/kvm/builtin-sandbox.c | 9 +
tools/kvm/builtin-setup.c | 232 ++++
tools/kvm/builtin-stat.c | 127 +++
tools/kvm/builtin-stop.c | 70 ++
tools/kvm/builtin-version.c | 15 +
tools/kvm/code16gcc.h | 15 +
tools/kvm/command-list.txt | 15 +
tools/kvm/config/feature-tests.mak | 168 +++
tools/kvm/config/utilities.mak | 188 ++++
tools/kvm/disk/blk.c | 39 +
tools/kvm/disk/core.c | 242 ++++
tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++++++++
tools/kvm/disk/raw.c | 140 +++
tools/kvm/framebuffer.c | 68 ++
tools/kvm/guest/init.c | 38 +
tools/kvm/guest/init_stage2.c | 55 +
tools/kvm/guest/passwd | 1 +
tools/kvm/guest_compat.c | 99 ++
tools/kvm/hw/i8042.c | 348 ++++++
tools/kvm/hw/pci-shmem.c | 262 +++++
tools/kvm/hw/rtc.c | 118 ++
tools/kvm/hw/serial.c | 414 +++++++
tools/kvm/hw/vesa.c | 78 ++
tools/kvm/include/asm/hweight.h | 8 +
tools/kvm/include/bios/memcpy.h | 9 +
tools/kvm/include/kvm/8250-serial.h | 10 +
tools/kvm/include/kvm/apic.h | 17 +
tools/kvm/include/kvm/brlock.h | 41 +
tools/kvm/include/kvm/builtin-balloon.h | 9 +
tools/kvm/include/kvm/builtin-debug.h | 18 +
tools/kvm/include/kvm/builtin-help.h | 6 +
tools/kvm/include/kvm/builtin-list.h | 10 +
tools/kvm/include/kvm/builtin-pause.h | 9 +
tools/kvm/include/kvm/builtin-resume.h | 9 +
tools/kvm/include/kvm/builtin-run.h | 11 +
tools/kvm/include/kvm/builtin-sandbox.h | 6 +
tools/kvm/include/kvm/builtin-setup.h | 11 +
tools/kvm/include/kvm/builtin-stat.h | 9 +
tools/kvm/include/kvm/builtin-stop.h | 9 +
tools/kvm/include/kvm/builtin-version.h | 6 +
tools/kvm/include/kvm/compiler.h | 10 +
tools/kvm/include/kvm/disk-image.h | 81 ++
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/ioeventfd.h | 27 +
tools/kvm/include/kvm/ioport.h | 66 ++
tools/kvm/include/kvm/irq.h | 31 +
tools/kvm/include/kvm/kvm-cmd.h | 17 +
tools/kvm/include/kvm/kvm-cpu.h | 24 +
tools/kvm/include/kvm/kvm-ipc.h | 24 +
tools/kvm/include/kvm/kvm.h | 91 ++
tools/kvm/include/kvm/mutex.h | 33 +
tools/kvm/include/kvm/parse-options.h | 214 ++++
tools/kvm/include/kvm/pci-shmem.h | 28 +
tools/kvm/include/kvm/pci.h | 94 ++
tools/kvm/include/kvm/qcow.h | 133 +++
tools/kvm/include/kvm/rbtree-interval.h | 27 +
tools/kvm/include/kvm/read-write.h | 43 +
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 | 19 +
tools/kvm/include/kvm/symbol.h | 22 +
tools/kvm/include/kvm/term.h | 20 +
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 | 95 ++
tools/kvm/include/kvm/vesa.h | 18 +
tools/kvm/include/kvm/virtio-9p.h | 74 ++
tools/kvm/include/kvm/virtio-balloon.h | 8 +
tools/kvm/include/kvm/virtio-blk.h | 13 +
tools/kvm/include/kvm/virtio-console.h | 9 +
tools/kvm/include/kvm/virtio-net.h | 23 +
tools/kvm/include/kvm/virtio-pci-dev.h | 37 +
tools/kvm/include/kvm/virtio-pci.h | 48 +
tools/kvm/include/kvm/virtio-rng.h | 9 +
tools/kvm/include/kvm/virtio-trans.h | 43 +
tools/kvm/include/kvm/virtio.h | 67 ++
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/compiler.h | 19 +
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 | 51 +
tools/kvm/ioeventfd.c | 142 +++
tools/kvm/ioport.c | 134 +++
tools/kvm/kvm-cmd.c | 91 ++
tools/kvm/kvm-cpu.c | 175 +++
tools/kvm/kvm-ipc.c | 205 ++++
tools/kvm/kvm.c | 533 +++++++++
tools/kvm/main.c | 19 +
tools/kvm/mmio.c | 135 +++
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 | 185 ++++
tools/kvm/powerpc/include/kvm/barrier.h | 6 +
tools/kvm/powerpc/include/kvm/kvm-arch.h | 71 ++
tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 66 ++
tools/kvm/powerpc/ioport.c | 18 +
tools/kvm/powerpc/irq.c | 40 +
tools/kvm/powerpc/kvm-cpu.c | 233 ++++
tools/kvm/powerpc/kvm.c | 193 ++++
tools/kvm/symbol.c | 98 ++
tools/kvm/term.c | 166 +++
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/ui/sdl.c | 280 +++++
tools/kvm/ui/vnc.c | 218 ++++
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/read-write.c | 344 ++++++
tools/kvm/util/set_private_br.sh | 51 +
tools/kvm/util/strbuf.c | 39 +
tools/kvm/util/threadpool.c | 145 +++
tools/kvm/util/util.c | 115 ++
tools/kvm/virtio/9p-pdu.c | 287 +++++
tools/kvm/virtio/9p.c | 1326 ++++++++++++++++++++++
tools/kvm/virtio/balloon.c | 275 +++++
tools/kvm/virtio/blk.c | 273 +++++
tools/kvm/virtio/console.c | 203 ++++
tools/kvm/virtio/core.c | 158 +++
tools/kvm/virtio/net.c | 547 +++++++++
tools/kvm/virtio/pci.c | 346 ++++++
tools/kvm/virtio/rng.c | 188 ++++
tools/kvm/virtio/trans.c | 22 +
tools/kvm/x86/bios.c | 174 +++
tools/kvm/x86/bios/.gitignore | 3 +
tools/kvm/x86/bios/bios-rom.S | 12 +
tools/kvm/x86/bios/e820.c | 72 ++
tools/kvm/x86/bios/entry.S | 92 ++
tools/kvm/x86/bios/gen-offsets.sh | 14 +
tools/kvm/x86/bios/int10.c | 110 ++
tools/kvm/x86/bios/int15.c | 18 +
tools/kvm/x86/bios/local.S | 7 +
tools/kvm/x86/bios/macro.S | 25 +
tools/kvm/x86/bios/memcpy.c | 23 +
tools/kvm/x86/bios/rom.ld.S | 17 +
tools/kvm/x86/cpuid.c | 55 +
tools/kvm/x86/include/kvm/assembly.h | 24 +
tools/kvm/x86/include/kvm/barrier.h | 16 +
tools/kvm/x86/include/kvm/bios-export.h | 13 +
tools/kvm/x86/include/kvm/bios.h | 88 ++
tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
tools/kvm/x86/include/kvm/cpufeature.h | 41 +
tools/kvm/x86/include/kvm/interrupt.h | 26 +
tools/kvm/x86/include/kvm/kvm-arch.h | 65 ++
tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
tools/kvm/x86/include/kvm/mptable.h | 8 +
tools/kvm/x86/interrupt.c | 28 +
tools/kvm/x86/ioport.c | 59 +
tools/kvm/x86/irq.c | 193 ++++
tools/kvm/x86/kvm-cpu.c | 421 +++++++
tools/kvm/x86/kvm.c | 374 +++++++
tools/kvm/x86/mptable.c | 280 +++++
206 files changed, 21146 insertions(+), 1 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-sandbox.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/Documentation/virtio-console.txt
create mode 100644 tools/kvm/Makefile
create mode 100644 tools/kvm/README
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-sandbox.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/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/init_stage2.c
create mode 100644 tools/kvm/guest/passwd
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/bios/memcpy.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/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-sandbox.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/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/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-ipc.h
create mode 100644 tools/kvm/include/kvm/kvm.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-trans.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/compiler.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/ioeventfd.c
create mode 100644 tools/kvm/ioport.c
create mode 100644 tools/kvm/kvm-cmd.c
create mode 100644 tools/kvm/kvm-cpu.c
create mode 100644 tools/kvm/kvm-ipc.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/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/powerpc/include/kvm/barrier.h
create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
create mode 100644 tools/kvm/powerpc/ioport.c
create mode 100644 tools/kvm/powerpc/irq.c
create mode 100644 tools/kvm/powerpc/kvm-cpu.c
create mode 100644 tools/kvm/powerpc/kvm.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/ui/sdl.c
create mode 100644 tools/kvm/ui/vnc.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 100644 tools/kvm/util/read-write.c
create mode 100755 tools/kvm/util/set_private_br.sh
create mode 100644 tools/kvm/util/strbuf.c
create mode 100644 tools/kvm/util/threadpool.c
create mode 100644 tools/kvm/util/util.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
create mode 100644 tools/kvm/virtio/trans.c
create mode 100644 tools/kvm/x86/bios.c
create mode 100644 tools/kvm/x86/bios/.gitignore
create mode 100644 tools/kvm/x86/bios/bios-rom.S
create mode 100644 tools/kvm/x86/bios/e820.c
create mode 100644 tools/kvm/x86/bios/entry.S
create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
create mode 100644 tools/kvm/x86/bios/int10.c
create mode 100644 tools/kvm/x86/bios/int15.c
create mode 100644 tools/kvm/x86/bios/local.S
create mode 100644 tools/kvm/x86/bios/macro.S
create mode 100644 tools/kvm/x86/bios/memcpy.c
create mode 100644 tools/kvm/x86/bios/rom.ld.S
create mode 100644 tools/kvm/x86/cpuid.c
create mode 100644 tools/kvm/x86/include/kvm/assembly.h
create mode 100644 tools/kvm/x86/include/kvm/barrier.h
create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
create mode 100644 tools/kvm/x86/include/kvm/bios.h
create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
create mode 100644 tools/kvm/x86/include/kvm/mptable.h
create mode 100644 tools/kvm/x86/interrupt.c
create mode 100644 tools/kvm/x86/ioport.c
create mode 100644 tools/kvm/x86/irq.c
create mode 100644 tools/kvm/x86/kvm-cpu.c
create mode 100644 tools/kvm/x86/kvm.c
create mode 100644 tools/kvm/x86/mptable.c
Merging uapi/for-next (1632b9e UAPI: Split trivial #if defined(__KERNEL__) && X conditionals)
$ git merge uapi/for-next
Already up-to-date.
Merging scsi-post-merge/merge-base:master ()
$ 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: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: drivers/watchdog/hpwdt.c: mark page executable
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs
Applying: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-fix
Applying: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2
Applying: x86, olpc: add debugfs interface for EC commands
Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes
Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2
Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2-checkpatch-fixes
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: hrtimers: Special-case zero length sleeps
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-fix
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: debugobjects: Fix selftest for static warnings
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/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: MAINTAINERS: Staging: cx25821: Add L: linux-media
Applying: mm: fix page-faults detection in swap-token logic
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: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
Applying: init/do_mounts.c: create /root if it does not exist
Applying: cpusets, cgroups: disallow attaching kthreadd
Applying: mm: isolate pages for immediate reclaim on their own LRU
Applying: mm: isolate pages for immediate reclaim on their own LRU fix
Applying: mm-isolate-pages-for-immediate-reclaim-on-their-own-lru-fix-2
Applying: ipc/mqueue: simplify reading msgqueue limit
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc: provide generic compat versions of IPC syscalls
Applying: drivers/memstick: use kmemdup rather than duplicating its implementation
Applying: notify_change(): check that i_mutex is held
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm
From ../rebase-tmp
+ 1f7e0d6...9a4c376 akpm -> akpm (forced update)
$ rm -rf ../rebase-tmp
Merging akpm (9a4c376 notify_change(): check that i_mutex is held)
$ git merge --no-ff akpm
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/debugfs-olpc | 16 ++
Documentation/laptops/sony-laptop.txt | 5 +
Documentation/sysctl/vm.txt | 16 ++
MAINTAINERS | 5 +
arch/Kconfig | 3 +
arch/arm/include/asm/processor.h | 1 -
arch/arm/mach-ux500/mbox-db5500.c | 2 +-
arch/mips/Kconfig | 1 +
arch/powerpc/Kconfig | 1 +
arch/s390/Kconfig | 1 +
arch/sparc/Kconfig | 1 +
arch/tile/include/asm/compat.h | 11 --
arch/tile/kernel/compat.c | 43 ------
arch/x86/Kconfig | 1 +
arch/x86/platform/iris/iris.c | 67 +++++++--
arch/x86/platform/olpc/olpc-xo15-sci.c | 67 +++++++++
arch/x86/platform/olpc/olpc.c | 86 +++++++++++
drivers/char/hpet.c | 56 ++++++-
drivers/idle/intel_idle.c | 59 +++++---
drivers/memstick/core/mspro_block.c | 3 +-
drivers/platform/x86/acerhdf.c | 67 ++++++---
drivers/platform/x86/sony-laptop.c | 16 ++-
drivers/scsi/aacraid/commctrl.c | 1 +
drivers/scsi/megaraid.c | 8 +-
drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +-
drivers/scsi/sg.c | 25 ++--
drivers/watchdog/hpwdt.c | 2 +
fs/attr.c | 3 +-
fs/cifs/cifsfs.c | 2 +-
include/linux/compat.h | 12 ++-
include/linux/hpet.h | 1 +
include/linux/ipc_namespace.h | 40 +++++-
include/linux/mm_types.h | 1 +
include/linux/mmzone.h | 4 +-
include/linux/swap.h | 36 +++++
include/linux/vm_event_item.h | 1 +
include/scsi/scsi_netlink.h | 2 +-
init/do_mounts.c | 3 +
ipc/compat.c | 70 ++++++++-
ipc/mq_sysctl.c | 31 +---
ipc/mqueue.c | 27 +++-
ipc/sem.c | 250 ++++++++++++++++++++++----------
kernel/cpuset.c | 7 +-
kernel/fork.c | 1 +
kernel/hrtimer.c | 8 +
kernel/sched/core.c | 9 +
kernel/sysctl.c | 11 +-
lib/debugobjects.c | 14 +--
mm/memory.c | 13 ++
mm/page_alloc.c | 42 ++++--
mm/rmap.c | 3 +-
mm/swap.c | 77 +++++++++-
mm/vmscan.c | 11 ++
mm/vmstat.c | 2 +
net/netfilter/nf_conntrack_netlink.c | 5 +
55 files changed, 950 insertions(+), 303 deletions(-)
create mode 100644 Documentation/ABI/testing/debugfs-olpc