--- /dev/null
+$ date
+Fri Jul 29 11:46:48 EST 2011
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 2271220 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
+Merging origin/master
+$ git merge origin/master
+Updating 2271220..55f9c40
+Fast-forward
+ Documentation/md.txt | 29 +-
+ Documentation/security/keys-ecryptfs.txt | 68 +
+ Documentation/security/keys-trusted-encrypted.txt | 52 +-
+ MAINTAINERS | 2 +-
+ arch/sparc/include/asm/elf_64.h | 6 +-
+ arch/sparc/include/asm/hypervisor.h | 1 +
+ arch/sparc/include/asm/spitfire.h | 1 +
+ arch/sparc/include/asm/xor_64.h | 3 +-
+ arch/sparc/kernel/cpu.c | 7 +
+ arch/sparc/kernel/cpumap.c | 1 +
+ arch/sparc/kernel/head_64.S | 31 +
+ arch/sparc/kernel/hvapi.c | 1 +
+ arch/sparc/kernel/pcr.c | 11 +-
+ arch/sparc/kernel/perf_event.c | 3 +-
+ drivers/char/hw_random/n2-drv.c | 29 +-
+ drivers/char/hw_random/n2rng.h | 2 +-
+ drivers/char/tpm/tpm.c | 102 +-
+ drivers/char/tpm/tpm.h | 7 +
+ drivers/char/tpm/tpm_nsc.c | 14 +-
+ drivers/char/tpm/tpm_tis.c | 182 ++-
+ drivers/crypto/n2_core.c | 33 +-
+ drivers/isdn/i4l/isdn_net.c | 3 +
+ drivers/md/bitmap.c | 137 +-
+ drivers/md/bitmap.h | 5 -
+ drivers/md/md.c | 871 ++++++++-
+ drivers/md/md.h | 110 +-
+ drivers/md/raid1.c | 962 ++++++++---
+ drivers/md/raid1.h | 26 +-
+ drivers/md/raid10.c | 1183 ++++++++++---
+ drivers/md/raid10.h | 21 +
+ drivers/md/raid5.c | 1015 +++++-------
+ drivers/md/raid5.h | 99 +-
+ drivers/net/Makefile | 1 +
+ drivers/net/acenic.c | 45 +-
+ drivers/net/acenic.h | 6 +-
+ drivers/net/bonding/bond_main.c | 8 +-
+ drivers/net/bonding/bond_sysfs.c | 133 +-
+ drivers/net/forcedeth.c | 16 +-
+ drivers/net/gianfar.c | 6 +-
+ drivers/net/ifb.c | 2 +-
+ drivers/net/macvlan.c | 2 +-
+ drivers/net/tg3.c | 287 ++--
+ drivers/net/tg3.h | 9 +-
+ drivers/net/tun.c | 1 +
+ drivers/net/usb/asix.c | 7 +-
+ drivers/net/veth.c | 2 +
+ drivers/net/wan/hdlc_fr.c | 5 +-
+ drivers/net/wireless/airo.c | 1 +
+ drivers/net/wireless/b43/Kconfig | 2 +-
+ drivers/net/wireless/b43/bus.c | 2 +
+ drivers/net/wireless/b43/main.c | 5 +-
+ drivers/net/wireless/hostap/hostap_main.c | 1 +
+ drivers/nfc/pn533.c | 2 +-
+ drivers/staging/ath6kl/os/linux/ar6000_drv.c | 1 +
+ fs/ecryptfs/ecryptfs_kernel.h | 150 +--
+ fs/ecryptfs/keystore.c | 13 +-
+ include/keys/encrypted-type.h | 13 +-
+ include/linux/ecryptfs.h | 113 ++
+ include/linux/if.h | 2 +
+ include/linux/netdevice.h | 7 +-
+ include/linux/raid/md_p.h | 14 +-
+ kernel/cgroup.c | 5 +
+ net/8021q/vlan_dev.c | 2 +-
+ net/bluetooth/bnep/netdev.c | 1 +
+ net/core/dev.c | 4 +-
+ net/core/pktgen.c | 8 +-
+ net/ethernet/eth.c | 2 +
+ net/ipv4/devinet.c | 16 +-
+ net/ipv6/addrconf.c | 2 +
+ net/l2tp/l2tp_eth.c | 2 +-
+ net/mac80211/iface.c | 1 +
+ net/socket.c | 2 +-
+ net/wireless/reg.c | 7 +-
+ security/apparmor/domain.c | 2 +-
+ security/apparmor/lsm.c | 2 +-
+ security/keys/Makefile | 2 +-
+ security/keys/ecryptfs_format.c | 81 +
+ security/keys/ecryptfs_format.h | 30 +
+ security/keys/encrypted.c | 251 +++-
+ security/keys/request_key_auth.c | 2 +
+ security/tomoyo/Kconfig | 61 +
+ security/tomoyo/Makefile | 49 +-
+ security/tomoyo/audit.c | 456 +++++
+ security/tomoyo/common.c | 1967 +++++++++++++--------
+ security/tomoyo/common.h | 1197 +++++++------
+ security/tomoyo/condition.c | 1035 +++++++++++
+ security/tomoyo/domain.c | 630 +++++---
+ security/tomoyo/file.c | 954 ++++------
+ security/tomoyo/gc.c | 551 +++++-
+ security/tomoyo/group.c | 61 +-
+ security/tomoyo/load_policy.c | 80 +-
+ security/tomoyo/memory.c | 173 +--
+ security/tomoyo/mount.c | 176 +--
+ security/tomoyo/realpath.c | 226 ++-
+ security/tomoyo/securityfs_if.c | 22 +-
+ security/tomoyo/tomoyo.c | 238 +++-
+ security/tomoyo/util.c | 363 +++--
+ sound/oss/ad1848.c | 6 +-
+ sound/oss/sb_mixer.c | 6 +-
+ sound/pci/asihpi/hpioctl.c | 13 +-
+ sound/pci/hda/patch_realtek.c | 29 +-
+ sound/pci/hda/patch_sigmatel.c | 199 ++-
+ 102 files changed, 10216 insertions(+), 4571 deletions(-)
+ create mode 100644 Documentation/security/keys-ecryptfs.txt
+ create mode 100644 include/linux/ecryptfs.h
+ create mode 100644 security/keys/ecryptfs_format.c
+ create mode 100644 security/keys/ecryptfs_format.h
+ create mode 100644 security/tomoyo/audit.c
+ create mode 100644 security/tomoyo/condition.c
+Merging fixes/fixes
+$ git merge fixes/fixes
+Already up-to-date.
+Merging kbuild-current/rc-fixes
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/master
+$ git merge arm-current/master
+Already up-to-date.
+Merging m68k-current/for-linus
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging 52xx-and-virtex-current/powerpc/merge
+$ git merge 52xx-and-virtex-current/powerpc/merge
+Already up-to-date.
+Merging sparc-current/master
+$ git merge sparc-current/master
+Already up-to-date.
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net-current/master
+$ git merge net-current/master
+Already up-to-date.
+Merging sound-current/for-linus
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless-current/master
+$ git merge wireless-current/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Already up-to-date.
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide-curent/master
+$ git merge ide-curent/master
+Already up-to-date.
+Merging dwmw2/master
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging rmobile-current/rmobile-fixes-for-linus
+$ git merge rmobile-current/rmobile-fixes-for-linus
+Already up-to-date.
+Merging fbdev-current/fbdev-fixes-for-linus
+$ git merge fbdev-current/fbdev-fixes-for-linus
+Auto-merging drivers/video/msm/mdp.c
+Auto-merging drivers/video/udlfb.c
+Merge made by recursive.
+ drivers/video/carminefb.c | 6 +++---
+ drivers/video/msm/mdp.c | 4 +++-
+ drivers/video/s3c2410fb.c | 1 -
+ drivers/video/udlfb.c | 21 +++++++++++++++------
+ 4 files changed, 21 insertions(+), 11 deletions(-)
+Merging devicetree-current/devicetree/merge
+$ git merge devicetree-current/devicetree/merge
+Merge made by recursive.
+Merging spi-current/spi/merge
+$ git merge spi-current/spi/merge
+Already up-to-date.
+Merging arm/for-next
+$ git merge arm/for-next
+Merge made by recursive.
+ arch/arm/include/asm/pgalloc.h | 2 +-
+ arch/arm/include/asm/pgtable.h | 23 +++++++++++++----------
+ arch/arm/include/asm/tlb.h | 1 +
+ 3 files changed, 15 insertions(+), 11 deletions(-)
+Merging arm-lpae/for-next
+$ git merge arm-lpae/for-next
+Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
+Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
+Resolved 'arch/arm/include/asm/proc-fns.h' using previous resolution.
+Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
+Resolved 'arch/arm/mm/context.c' using previous resolution.
+Resolved 'arch/arm/mm/proc-v7.S' using previous resolution.
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/boot/compressed/head.S
+Auto-merging arch/arm/include/asm/assembler.h
+Auto-merging arch/arm/include/asm/memory.h
+Auto-merging arch/arm/include/asm/pgalloc.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
+Auto-merging arch/arm/include/asm/pgtable.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
+Auto-merging arch/arm/include/asm/proc-fns.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/proc-fns.h
+Auto-merging arch/arm/include/asm/setup.h
+Auto-merging arch/arm/include/asm/tlb.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
+Auto-merging arch/arm/include/asm/tlbflush.h
+Auto-merging arch/arm/kernel/head.S
+Auto-merging arch/arm/kernel/module.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/kernel/sleep.S
+Auto-merging arch/arm/mm/Kconfig
+Auto-merging arch/arm/mm/alignment.c
+Auto-merging arch/arm/mm/context.c
+CONFLICT (content): Merge conflict in arch/arm/mm/context.c
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/mm/fault.c
+Auto-merging arch/arm/mm/mm.h
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm/mm/proc-macros.S
+Auto-merging arch/arm/mm/proc-v7.S
+CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8b03472] Merge remote-tracking branch 'arm-lpae/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/compressed/head.S | 1 +
+ arch/arm/include/asm/assembler.h | 11 +
+ arch/arm/include/asm/memory.h | 4 +-
+ arch/arm/include/asm/page.h | 44 +---
+ arch/arm/include/asm/pgalloc.h | 28 ++-
+ arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++++++
+ arch/arm/include/asm/pgtable-2level-types.h | 69 +++++
+ arch/arm/include/asm/pgtable-2level.h | 143 +++++++++
+ arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++
+ arch/arm/include/asm/pgtable-3level-types.h | 71 +++++
+ arch/arm/include/asm/pgtable-3level.h | 107 +++++++
+ arch/arm/include/asm/pgtable-hwdef.h | 81 +-----
+ arch/arm/include/asm/pgtable.h | 211 +++++---------
+ arch/arm/include/asm/proc-fns.h | 21 ++
+ arch/arm/include/asm/setup.h | 8 +
+ arch/arm/include/asm/tlb.h | 11 +-
+ arch/arm/include/asm/tlbflush.h | 4 +-
+ arch/arm/include/asm/types.h | 11 +-
+ arch/arm/kernel/head.S | 119 ++++++---
+ arch/arm/kernel/module.c | 2 +-
+ arch/arm/kernel/setup.c | 10 +
+ arch/arm/kernel/sleep.S | 2 +
+ arch/arm/mm/Kconfig | 13 +
+ arch/arm/mm/Makefile | 4 +
+ arch/arm/mm/alignment.c | 8 +-
+ arch/arm/mm/context.c | 19 +-
+ arch/arm/mm/dma-mapping.c | 6 +-
+ arch/arm/mm/fault.c | 87 ++++++
+ arch/arm/mm/idmap.c | 36 +++-
+ arch/arm/mm/ioremap.c | 17 +-
+ arch/arm/mm/mm.h | 4 +-
+ arch/arm/mm/mmu.c | 51 +++-
+ arch/arm/mm/pgd.c | 51 +++-
+ arch/arm/mm/proc-macros.S | 5 +-
+ arch/arm/mm/proc-v7.S | 10 +-
+ arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++
+ 37 files changed, 1521 insertions(+), 347 deletions(-)
+ create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
+ create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
+ create mode 100644 arch/arm/include/asm/pgtable-2level.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
+ create mode 100644 arch/arm/include/asm/pgtable-3level.h
+ create mode 100644 arch/arm/mm/proc-v7lpae.S
+Merging arm-soc/for-next
+$ git merge arm-soc/for-next
+Resolved 'arch/arm/mach-exynos4/pm.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/cm-regbits-44xx.h' using previous resolution.
+Auto-merging arch/arm/mach-exynos4/pm.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/pm.c
+Auto-merging arch/arm/mach-omap2/cm-regbits-44xx.h
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/cm-regbits-44xx.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a84be4d] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging at91/at91-next
+$ git merge at91/at91-next
+Already up-to-date.
+Merging davinci/davinci-next
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging i.MX/for-next
+$ git merge i.MX/for-next
+Already up-to-date.
+Merging linux-spec/for-next
+$ git merge linux-spec/for-next
+Already up-to-date.
+Merging msm/for-next
+$ git merge msm/for-next
+Auto-merging arch/arm/mach-msm/Makefile
+Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
+Merge made by recursive.
+ arch/arm/mach-msm/Makefile | 5 +-
+ arch/arm/mach-msm/acpuclock-arm11.c | 2 +-
+ arch/arm/mach-msm/board-halibut.c | 1 +
+ arch/arm/mach-msm/board-mahimahi.c | 1 +
+ arch/arm/mach-msm/board-msm7x30.c | 1 +
+ arch/arm/mach-msm/board-msm8960.c | 18 +
+ arch/arm/mach-msm/board-msm8x60.c | 9 +-
+ arch/arm/mach-msm/board-qsd8x50.c | 1 +
+ arch/arm/mach-msm/board-trout.c | 1 +
+ arch/arm/mach-msm/clock-dummy.c | 81 +++++
+ arch/arm/mach-msm/clock.h | 11 +
+ arch/arm/mach-msm/devices-msm7x00.c | 21 ++-
+ arch/arm/mach-msm/devices-msm7x30.c | 21 ++-
+ arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++
+ arch/arm/mach-msm/devices-msm8x60.c | 56 ++++
+ arch/arm/mach-msm/devices-qsd8x50.c | 21 ++-
+ arch/arm/mach-msm/devices.h | 8 +
+ arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++-----
+ arch/arm/mach-msm/include/mach/dma.h | 84 +++---
+ arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +-
+ arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +-
+ arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 +
+ arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +-
+ arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 +
+ arch/arm/mach-msm/io.c | 3 -
+ 25 files changed, 808 insertions(+), 133 deletions(-)
+ create mode 100644 arch/arm/mach-msm/clock-dummy.c
+ create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
+Merging omap/for-next
+$ git merge omap/for-next
+Already up-to-date.
+Merging pxa/for-next
+$ git merge pxa/for-next
+Already up-to-date.
+Merging samsung/next-samsung
+$ git merge samsung/next-samsung
+Already up-to-date.
+Merging s5p/for-next
+$ git merge s5p/for-next
+Resolved 'arch/arm/mach-exynos4/Kconfig' using previous resolution.
+Resolved 'arch/arm/mach-exynos4/mach-smdkc210.c' using previous resolution.
+Auto-merging arch/arm/mach-exynos4/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
+Auto-merging arch/arm/mach-exynos4/Makefile
+Auto-merging arch/arm/mach-exynos4/mach-smdkc210.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-smdkc210.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master adcea71] Merge remote-tracking branch 's5p/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/configs/exynos4_defconfig | 1 +
+ arch/arm/mach-exynos4/Kconfig | 10 +++
+ arch/arm/mach-exynos4/Makefile | 1 +
+ arch/arm/mach-exynos4/mach-origen.c | 108 +++++++++++++++++++++++++++++++++++
+ 4 files changed, 120 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/mach-exynos4/mach-origen.c
+Merging tegra/for-next
+$ git merge tegra/for-next
+Already up-to-date.
+Merging ux500-core/ux500-core
+$ git merge ux500-core/ux500-core
+Merge made by recursive.
+Merging xilinx/arm-next
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging cris/for-next
+$ git merge cris/for-next
+Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
+Auto-merging drivers/net/cris/eth_v10.c
+Merge made by recursive.
+ Documentation/cris/README | 62 +++++++++++++++---------------
+ arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
+ arch/cris/arch-v32/kernel/ptrace.c | 2 -
+ arch/cris/include/arch-v32/arch/cache.h | 2 +-
+ drivers/net/cris/eth_v10.c | 1 -
+ 5 files changed, 34 insertions(+), 39 deletions(-)
+Merging ia64/test
+$ git merge ia64/test
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging arch/ia64/Kconfig
+Auto-merging include/linux/efi.h
+Merge made by recursive.
+ Documentation/ABI/testing/pstore | 6 +
+ Documentation/kernel-parameters.txt | 2 +
+ arch/ia64/Kconfig | 4 +
+ arch/ia64/include/asm/gpio.h | 55 ++++++++
+ drivers/acpi/apei/erst.c | 20 ++-
+ drivers/firmware/efivars.c | 243 +++++++++++++++++++++++++++++++++--
+ fs/pstore/inode.c | 12 +-
+ fs/pstore/internal.h | 2 +-
+ fs/pstore/platform.c | 30 +++-
+ include/linux/efi.h | 6 +
+ include/linux/pstore.h | 9 +-
+ 11 files changed, 355 insertions(+), 34 deletions(-)
+ create mode 100644 arch/ia64/include/asm/gpio.h
+Merging m68k/for-next
+$ git merge m68k/for-next
+Auto-merging arch/sparc/kernel/ioport.c
+Auto-merging include/linux/ioport.h
+Merge made by recursive.
+ arch/m68k/Kconfig.mmu | 6 -
+ arch/m68k/amiga/chipram.c | 136 ++++-----
+ arch/m68k/atari/stram.c | 354 +++++-------------------
+ arch/m68k/include/asm/atari_stram.h | 3 +-
+ arch/m68k/include/asm/atarihw.h | 4 +-
+ arch/m68k/kernel/setup_mm.c | 2 +
+ arch/m68k/math-emu/fp_log.c | 3 -
+ arch/m68k/math-emu/multi_arith.h | 530 -----------------------------------
+ arch/m68k/mm/init_mm.c | 5 -
+ arch/sparc/kernel/ioport.c | 32 +--
+ include/linux/ioport.h | 1 +
+ kernel/resource.c | 21 ++
+ 12 files changed, 166 insertions(+), 931 deletions(-)
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Merge made by recursive.
+Merging microblaze/next
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/nxp/pnx8550/common/pci.c
+Removing arch/mips/nxp/pnx8550/common/setup.c
+Merge made by recursive.
+ arch/mips/Kconfig | 1 +
+ arch/mips/Makefile | 2 +
+ arch/mips/ar7/irq.c | 3 +-
+ arch/mips/bcm63xx/irq.c | 1 +
+ arch/mips/cobalt/irq.c | 1 +
+ arch/mips/dec/setup.c | 4 +
+ arch/mips/emma/markeins/irq.c | 2 +-
+ arch/mips/include/asm/cacheflush.h | 24 +++++
+ arch/mips/include/asm/io.h | 12 +--
+ arch/mips/include/asm/mipsprom.h | 6 +-
+ arch/mips/include/asm/prom.h | 6 +-
+ arch/mips/kernel/ftrace.c | 39 ++++----
+ arch/mips/kernel/scall32-o32.S | 2 +-
+ arch/mips/kernel/signal.c | 3 +
+ arch/mips/kernel/traps.c | 6 +-
+ arch/mips/lasat/interrupt.c | 1 +
+ arch/mips/loongson/fuloong-2e/irq.c | 1 +
+ arch/mips/loongson/lemote-2f/irq.c | 3 +-
+ arch/mips/mm/c-octeon.c | 6 +
+ arch/mips/mm/c-r3k.c | 7 ++
+ arch/mips/mm/c-r4k.c | 35 +++++++
+ arch/mips/mm/c-tx39.c | 7 ++
+ arch/mips/mm/cache.c | 5 +
+ arch/mips/mti-malta/malta-int.c | 6 +-
+ arch/mips/netlogic/Platform | 5 +
+ arch/mips/netlogic/xlr/setup.c | 4 +-
+ arch/mips/netlogic/xlr/smp.c | 2 +-
+ arch/mips/netlogic/xlr/smpboot.S | 16 ++-
+ arch/mips/nxp/pnx8550/common/pci.c | 134 --------------------------
+ arch/mips/nxp/pnx8550/common/setup.c | 143 ----------------------------
+ arch/mips/pci/pci-rc32434.c | 2 +-
+ arch/mips/pmc-sierra/msp71xx/msp_irq.c | 6 +-
+ arch/mips/pmc-sierra/msp71xx/msp_setup.c | 1 +
+ arch/mips/pmc-sierra/yosemite/py-console.c | 12 +--
+ arch/mips/pnx8550/common/int.c | 2 +-
+ arch/mips/pnx8550/common/prom.c | 2 +-
+ arch/mips/sgi-ip22/ip22-int.c | 10 +-
+ arch/mips/sgi-ip27/ip27-irq.c | 4 +-
+ arch/mips/sni/rm200.c | 1 +
+ arch/mips/vr41xx/common/irq.c | 1 +
+ drivers/mtd/maps/lantiq-flash.c | 4 +-
+ 41 files changed, 179 insertions(+), 353 deletions(-)
+ delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c
+ delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c
+Merging openrisc/for-upstream
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next
+$ git merge parisc/for-next
+Merge made by recursive.
+ arch/parisc/include/asm/futex.h | 66 +++++++++++++++++++++++++++++++++++---
+ 1 files changed, 60 insertions(+), 6 deletions(-)
+Merging powerpc/next
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next
+$ git merge 4xx/next
+Already up-to-date.
+Merging 52xx-and-virtex/powerpc/next
+$ git merge 52xx-and-virtex/powerpc/next
+Merge made by recursive.
+ arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++
+ arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
+ arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
+ 3 files changed, 249 insertions(+), 8 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/charon.dts
+Merging galak/next
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features
+$ git merge s390/features
+Merge made by recursive.
+ arch/s390/include/asm/ipl.h | 1 +
+ arch/s390/include/asm/lowcore.h | 11 ++++-
+ arch/s390/include/asm/system.h | 1 +
+ arch/s390/kernel/asm-offsets.c | 1 +
+ arch/s390/kernel/base.S | 36 +++++++++++++++++
+ arch/s390/kernel/entry.S | 28 +++++++++++++
+ arch/s390/kernel/entry64.S | 20 ++++++++++
+ arch/s390/kernel/ipl.c | 45 +++++++++++++++++++++-
+ arch/s390/kernel/reipl64.S | 80 +++++++++++++++++++++++++++++----------
+ arch/s390/kernel/setup.c | 24 +++++++++++-
+ arch/s390/kernel/smp.c | 8 ++++
+ arch/s390/mm/maccess.c | 16 ++++++++
+ arch/s390/mm/pgtable.c | 1 +
+ drivers/s390/block/dasd.c | 9 ++--
+ drivers/s390/block/dasd_proc.c | 4 +-
+ drivers/s390/cio/qdio.h | 2 +
+ drivers/s390/cio/qdio_main.c | 21 +++++++++-
+ 17 files changed, 275 insertions(+), 33 deletions(-)
+Merging sh/sh-latest
+$ git merge sh/sh-latest
+Auto-merging arch/arm/mach-shmobile/clock-sh7372.c
+Auto-merging drivers/sh/clk/core.c
+Auto-merging drivers/tty/serial/Kconfig
+Merge made by recursive.
+ arch/arm/mach-shmobile/clock-sh7367.c | 3 -
+ arch/arm/mach-shmobile/clock-sh7372.c | 4 -
+ arch/arm/mach-shmobile/clock-sh7377.c | 3 -
+ arch/arm/mach-shmobile/clock-sh73a0.c | 4 -
+ arch/sh/Makefile | 1 +
+ arch/sh/boards/board-apsh4a3a.c | 2 +-
+ arch/sh/boards/board-apsh4ad0a.c | 2 +-
+ arch/sh/boards/board-sh7785lcr.c | 2 +-
+ arch/sh/boards/board-urquell.c | 2 +-
+ arch/sh/boards/mach-highlander/setup.c | 2 -
+ arch/sh/boards/mach-sdk7786/setup.c | 2 +-
+ arch/sh/include/cpu-sh3/cpu/serial.h | 10 +
+ arch/sh/include/cpu-sh4a/cpu/serial.h | 7 +
+ arch/sh/kernel/cpu/clock-cpg.c | 2 -
+ arch/sh/kernel/cpu/sh3/Makefile | 18 +-
+ arch/sh/kernel/cpu/sh3/serial-sh770x.c | 33 ++
+ arch/sh/kernel/cpu/sh3/serial-sh7710.c | 20 +
+ arch/sh/kernel/cpu/sh3/serial-sh7720.c | 37 ++
+ arch/sh/kernel/cpu/sh3/setup-sh7705.c | 5 +
+ arch/sh/kernel/cpu/sh3/setup-sh770x.c | 9 +
+ arch/sh/kernel/cpu/sh3/setup-sh7720.c | 5 +
+ arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 -
+ arch/sh/kernel/cpu/sh4/setup-sh7750.c | 4 +-
+ arch/sh/kernel/cpu/sh4/setup-sh7760.c | 4 +
+ arch/sh/kernel/cpu/sh4a/Makefile | 2 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 33 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 25 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 46 +--
+ arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 84 +---
+ arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 36 +--
+ arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 2 -
+ arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 2 -
+ arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 79 +---
+ arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 115 +----
+ arch/sh/kernel/cpu/sh4a/clock-shx3.c | 67 +---
+ arch/sh/kernel/cpu/sh4a/serial-sh7722.c | 23 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 1 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 9 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 9 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 3 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 3 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 8 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 8 +-
+ drivers/dma/shdma.c | 88 +++-
+ drivers/dma/shdma.h | 4 +
+ drivers/sh/clk/core.c | 29 ++-
+ drivers/tty/serial/Kconfig | 2 +-
+ drivers/tty/serial/sh-sci.c | 757 +++++++++++++++++++------------
+ drivers/tty/serial/sh-sci.h | 434 +------------------
+ include/linux/serial_sci.h | 75 +++
+ include/linux/sh_clk.h | 4 +
+ include/linux/sh_dma.h | 8 +
+ 54 files changed, 962 insertions(+), 1188 deletions(-)
+ create mode 100644 arch/sh/include/cpu-sh3/cpu/serial.h
+ create mode 100644 arch/sh/include/cpu-sh4a/cpu/serial.h
+ create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh770x.c
+ create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7710.c
+ create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7720.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/serial-sh7722.c
+Merging rmobile/rmobile-latest
+$ git merge rmobile/rmobile-latest
+Auto-merging arch/arm/mach-shmobile/clock-sh7372.c
+Merge made by recursive.
+ arch/arm/mach-shmobile/board-ag5evm.c | 3 ++-
+ arch/arm/mach-shmobile/clock-sh7372.c | 8 ++++----
+ arch/arm/mach-shmobile/setup-sh7372.c | 30 +++++++++++++++---------------
+ 3 files changed, 21 insertions(+), 20 deletions(-)
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging tile/master
+$ git merge tile/master
+Auto-merging Documentation/ioctl/ioctl-number.txt
+Removing arch/tile/include/asm/bug.h
+Removing arch/tile/include/asm/bugs.h
+Removing arch/tile/include/asm/cputime.h
+Removing arch/tile/include/asm/device.h
+Removing arch/tile/include/asm/div64.h
+Removing arch/tile/include/asm/emergency-restart.h
+Removing arch/tile/include/asm/errno.h
+Removing arch/tile/include/asm/fb.h
+Removing arch/tile/include/asm/fcntl.h
+Removing arch/tile/include/asm/ioctl.h
+Removing arch/tile/include/asm/ioctls.h
+Removing arch/tile/include/asm/ipc.h
+Removing arch/tile/include/asm/ipcbuf.h
+Removing arch/tile/include/asm/irq_regs.h
+Removing arch/tile/include/asm/kdebug.h
+Removing arch/tile/include/asm/local.h
+Removing arch/tile/include/asm/module.h
+Removing arch/tile/include/asm/msgbuf.h
+Removing arch/tile/include/asm/mutex.h
+Removing arch/tile/include/asm/param.h
+Removing arch/tile/include/asm/parport.h
+Removing arch/tile/include/asm/poll.h
+Removing arch/tile/include/asm/posix_types.h
+Removing arch/tile/include/asm/resource.h
+Removing arch/tile/include/asm/scatterlist.h
+Removing arch/tile/include/asm/sembuf.h
+Removing arch/tile/include/asm/serial.h
+Removing arch/tile/include/asm/shmbuf.h
+Removing arch/tile/include/asm/shmparam.h
+Removing arch/tile/include/asm/socket.h
+Removing arch/tile/include/asm/sockios.h
+Removing arch/tile/include/asm/statfs.h
+Removing arch/tile/include/asm/termbits.h
+Removing arch/tile/include/asm/termios.h
+Removing arch/tile/include/asm/types.h
+Removing arch/tile/include/asm/ucontext.h
+Removing arch/tile/include/asm/xor.h
+Merge made by recursive.
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ arch/tile/include/asm/Kbuild | 38 +++
+ arch/tile/include/asm/bug.h | 1 -
+ arch/tile/include/asm/bugs.h | 1 -
+ arch/tile/include/asm/cputime.h | 1 -
+ arch/tile/include/asm/device.h | 1 -
+ arch/tile/include/asm/div64.h | 1 -
+ arch/tile/include/asm/emergency-restart.h | 1 -
+ arch/tile/include/asm/errno.h | 1 -
+ arch/tile/include/asm/fb.h | 1 -
+ arch/tile/include/asm/fcntl.h | 1 -
+ arch/tile/include/asm/ioctl.h | 1 -
+ arch/tile/include/asm/ioctls.h | 1 -
+ arch/tile/include/asm/ipc.h | 1 -
+ arch/tile/include/asm/ipcbuf.h | 1 -
+ arch/tile/include/asm/irq_regs.h | 1 -
+ arch/tile/include/asm/kdebug.h | 1 -
+ arch/tile/include/asm/local.h | 1 -
+ arch/tile/include/asm/module.h | 1 -
+ arch/tile/include/asm/msgbuf.h | 1 -
+ arch/tile/include/asm/mutex.h | 1 -
+ arch/tile/include/asm/param.h | 1 -
+ arch/tile/include/asm/parport.h | 1 -
+ arch/tile/include/asm/poll.h | 1 -
+ arch/tile/include/asm/posix_types.h | 1 -
+ arch/tile/include/asm/resource.h | 1 -
+ arch/tile/include/asm/scatterlist.h | 1 -
+ arch/tile/include/asm/sembuf.h | 1 -
+ arch/tile/include/asm/serial.h | 1 -
+ arch/tile/include/asm/shmbuf.h | 1 -
+ arch/tile/include/asm/shmparam.h | 1 -
+ arch/tile/include/asm/socket.h | 1 -
+ arch/tile/include/asm/sockios.h | 1 -
+ arch/tile/include/asm/statfs.h | 1 -
+ arch/tile/include/asm/termbits.h | 1 -
+ arch/tile/include/asm/termios.h | 1 -
+ arch/tile/include/asm/types.h | 1 -
+ arch/tile/include/asm/ucontext.h | 1 -
+ arch/tile/include/asm/xor.h | 1 -
+ arch/tile/include/hv/drv_srom_intf.h | 41 +++
+ arch/tile/kernel/time.c | 5 +-
+ drivers/char/Kconfig | 11 +
+ drivers/char/Makefile | 2 +
+ drivers/char/tile-srom.c | 481 +++++++++++++++++++++++++++++
+ 44 files changed, 575 insertions(+), 41 deletions(-)
+ delete mode 100644 arch/tile/include/asm/bug.h
+ delete mode 100644 arch/tile/include/asm/bugs.h
+ delete mode 100644 arch/tile/include/asm/cputime.h
+ delete mode 100644 arch/tile/include/asm/device.h
+ delete mode 100644 arch/tile/include/asm/div64.h
+ delete mode 100644 arch/tile/include/asm/emergency-restart.h
+ delete mode 100644 arch/tile/include/asm/errno.h
+ delete mode 100644 arch/tile/include/asm/fb.h
+ delete mode 100644 arch/tile/include/asm/fcntl.h
+ delete mode 100644 arch/tile/include/asm/ioctl.h
+ delete mode 100644 arch/tile/include/asm/ioctls.h
+ delete mode 100644 arch/tile/include/asm/ipc.h
+ delete mode 100644 arch/tile/include/asm/ipcbuf.h
+ delete mode 100644 arch/tile/include/asm/irq_regs.h
+ delete mode 100644 arch/tile/include/asm/kdebug.h
+ delete mode 100644 arch/tile/include/asm/local.h
+ delete mode 100644 arch/tile/include/asm/module.h
+ delete mode 100644 arch/tile/include/asm/msgbuf.h
+ delete mode 100644 arch/tile/include/asm/mutex.h
+ delete mode 100644 arch/tile/include/asm/param.h
+ delete mode 100644 arch/tile/include/asm/parport.h
+ delete mode 100644 arch/tile/include/asm/poll.h
+ delete mode 100644 arch/tile/include/asm/posix_types.h
+ delete mode 100644 arch/tile/include/asm/resource.h
+ delete mode 100644 arch/tile/include/asm/scatterlist.h
+ delete mode 100644 arch/tile/include/asm/sembuf.h
+ delete mode 100644 arch/tile/include/asm/serial.h
+ delete mode 100644 arch/tile/include/asm/shmbuf.h
+ delete mode 100644 arch/tile/include/asm/shmparam.h
+ delete mode 100644 arch/tile/include/asm/socket.h
+ delete mode 100644 arch/tile/include/asm/sockios.h
+ delete mode 100644 arch/tile/include/asm/statfs.h
+ delete mode 100644 arch/tile/include/asm/termbits.h
+ delete mode 100644 arch/tile/include/asm/termios.h
+ delete mode 100644 arch/tile/include/asm/types.h
+ delete mode 100644 arch/tile/include/asm/ucontext.h
+ delete mode 100644 arch/tile/include/asm/xor.h
+ create mode 100644 arch/tile/include/hv/drv_srom_intf.h
+ create mode 100644 drivers/char/tile-srom.c
+Merging unicore32/unicore32
+$ git merge unicore32/unicore32
+Merge made by recursive.
+ arch/unicore32/include/asm/bitops.h | 12 ++++++------
+ arch/unicore32/kernel/ksyms.c | 4 ++--
+ arch/unicore32/lib/findbit.S | 14 ++++++++------
+ 3 files changed, 16 insertions(+), 14 deletions(-)
+Merging xtensa/master
+$ git merge xtensa/master
+Already up-to-date.
+Merging ceph/for-next
+$ git merge ceph/for-next
+Resolved 'fs/ceph/export.c' using previous resolution.
+Auto-merging fs/ceph/export.c
+CONFLICT (content): Merge conflict in fs/ceph/export.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 969c059] Merge remote-tracking branch 'ceph/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging cifs/master
+$ git merge cifs/master
+Merge made by recursive.
+ fs/cifs/cifsencrypt.c | 16 ++++++++++++++--
+ fs/cifs/cifssmb.c | 4 +++-
+ fs/cifs/connect.c | 6 ------
+ fs/cifs/sess.c | 3 ++-
+ 4 files changed, 19 insertions(+), 10 deletions(-)
+Merging configfs/linux-next
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next
+$ git merge ecryptfs/next
+Merge made by recursive.
+Merging ext3/for_next
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev
+$ git merge ext4/dev
+Resolved 'fs/ext4/inode.c' using previous resolution.
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ext4/fsync.c
+Auto-merging fs/ext4/inode.c
+CONFLICT (content): Merge conflict in fs/ext4/inode.c
+Auto-merging fs/ext4/namei.c
+Auto-merging include/trace/events/ext4.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bcebac0] Merge remote-tracking branch 'ext4/dev'
+$ git diff -M --stat --summary HEAD^..
+ fs/ext4/Makefile | 2 +-
+ fs/ext4/balloc.c | 48 ++
+ fs/ext4/block_validity.c | 21 +
+ fs/ext4/ext4.h | 52 ++-
+ fs/ext4/extents.c | 129 ++--
+ fs/ext4/fsync.c | 17 +-
+ fs/ext4/indirect.c | 1484 ++++++++++++++++++++++++++++++++++++++++
+ fs/ext4/inode.c | 1596 +------------------------------------------
+ fs/ext4/ioctl.c | 12 +-
+ fs/ext4/mballoc.c | 127 +++-
+ fs/ext4/mballoc.h | 1 -
+ fs/ext4/namei.c | 21 +-
+ fs/ext4/page-io.c | 6 +-
+ fs/ext4/resize.c | 187 +++---
+ fs/ext4/super.c | 25 +-
+ fs/ext4/truncate.h | 43 ++
+ fs/jbd2/checkpoint.c | 5 +-
+ fs/jbd2/journal.c | 67 --
+ include/linux/jbd2.h | 6 -
+ include/trace/events/ext4.h | 71 ++
+ include/trace/events/jbd2.h | 36 +-
+ 21 files changed, 2067 insertions(+), 1889 deletions(-)
+ create mode 100644 fs/ext4/indirect.c
+ create mode 100644 fs/ext4/truncate.h
+$ git am -3 ../patches/0001-vfs-ext4-merge-fixup-for-moved-function.patch
+Applying: vfs/ext4: merge fixup for moved function
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/ext4/indirect.c
+$ git add .
+$ git commit -v -a --amend
+[master 0b572fb] Merge remote-tracking branch 'ext4/dev'
+Merging fatfs/master
+$ git merge fatfs/master
+Already up-to-date.
+Merging fuse/for-next
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master
+$ git merge gfs2/master
+Merge made by recursive.
+ fs/gfs2/dir.c | 32 +++++++++-----------------------
+ fs/gfs2/file.c | 34 ++++++++++++++++++++++++----------
+ 2 files changed, 33 insertions(+), 33 deletions(-)
+Merging hfsplus/for-next
+$ git merge hfsplus/for-next
+Already up-to-date.
+Merging jfs/next
+$ git merge jfs/next
+Already up-to-date.
+Merging logfs/master
+$ git merge logfs/master
+Resolved 'fs/logfs/logfs.h' using previous resolution.
+Auto-merging fs/logfs/logfs.h
+CONFLICT (content): Merge conflict in fs/logfs/logfs.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 142a9b4] Merge remote-tracking branch 'logfs/master'
+$ git diff -M --stat --summary HEAD^..
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging nilfs2/for-next
+$ git merge nilfs2/for-next
+Already up-to-date.
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/move_extents.c
+Auto-merging fs/ocfs2/super.c
+Merge made by recursive.
+ fs/ocfs2/dlmglue.c | 21 +++++++++++++++------
+ fs/ocfs2/ioctl.c | 8 ++++----
+ fs/ocfs2/move_extents.c | 2 +-
+ fs/ocfs2/ocfs2.h | 4 ++--
+ fs/ocfs2/super.c | 3 ++-
+ 5 files changed, 24 insertions(+), 14 deletions(-)
+Merging omfs/for-next
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master
+$ git merge squashfs/master
+Already up-to-date.
+Merging udf/for_next
+$ git merge udf/for_next
+Already up-to-date.
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/master
+$ git merge xfs/master
+Auto-merging fs/xfs/linux-2.6/xfs_buf.c
+Auto-merging fs/xfs/linux-2.6/xfs_sync.c
+Auto-merging fs/xfs/xfs_bmap.c
+Auto-merging fs/xfs/xfs_da_btree.c
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_log_recover.c
+Auto-merging fs/xfs/xfs_mount.c
+Auto-merging fs/xfs/xfs_vnodeops.c
+Merge made by recursive.
+ fs/xfs/linux-2.6/xfs_buf.c | 15 +++++++--------
+ fs/xfs/linux-2.6/xfs_buf.h | 32 +++++++++++---------------------
+ fs/xfs/linux-2.6/xfs_sync.c | 2 +-
+ fs/xfs/quota/xfs_dquot.c | 16 ++++++----------
+ fs/xfs/quota/xfs_qm.c | 2 +-
+ fs/xfs/xfs_ag.h | 6 +++---
+ fs/xfs/xfs_alloc.c | 7 +++----
+ fs/xfs/xfs_attr.c | 3 +--
+ fs/xfs/xfs_bmap.c | 3 +--
+ fs/xfs/xfs_btree.c | 17 ++++++-----------
+ fs/xfs/xfs_btree.h | 2 +-
+ fs/xfs/xfs_buf_item.c | 23 ++++++++++-------------
+ fs/xfs/xfs_da_btree.c | 12 ++++++------
+ fs/xfs/xfs_dinode.h | 2 +-
+ fs/xfs/xfs_ialloc.c | 5 ++---
+ fs/xfs/xfs_inode.c | 4 ++--
+ fs/xfs/xfs_log.c | 14 +++++---------
+ fs/xfs/xfs_log_recover.c | 32 +++++++++++++-------------------
+ fs/xfs/xfs_mount.c | 4 ++--
+ fs/xfs/xfs_rtalloc.c | 32 ++++++++++++++++----------------
+ fs/xfs/xfs_rtalloc.h | 2 +-
+ fs/xfs/xfs_rw.c | 8 ++++----
+ fs/xfs/xfs_sb.h | 2 +-
+ fs/xfs/xfs_trans_buf.c | 28 +++++++++-------------------
+ fs/xfs/xfs_vnodeops.c | 10 +++++-----
+ 25 files changed, 118 insertions(+), 165 deletions(-)
+Merging vfs/for-next
+$ git merge vfs/for-next
+Merge made by recursive.
+ fs/xfs/xfs_acl.h | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+Merging vfs-scale/vfs-scale-working
+$ git merge vfs-scale/vfs-scale-working
+Already up-to-date.
+Merging pci/linux-next
+$ git merge pci/linux-next
+Auto-merging arch/alpha/kernel/sys_ruffian.c
+Auto-merging arch/arm/common/it8152.c
+Auto-merging arch/arm/mach-cns3xxx/pcie.c
+Auto-merging arch/arm/mach-dove/pcie.c
+Auto-merging arch/arm/mach-iop13xx/pci.c
+Auto-merging arch/arm/mach-ixp4xx/goramo_mlr.c
+Auto-merging arch/arm/mach-kirkwood/pcie.c
+Auto-merging arch/arm/mach-mv78xx0/pcie.c
+Auto-merging arch/arm/mach-orion5x/pci.c
+Auto-merging arch/arm/mach-pxa/cm-x2xx-pci.c
+Auto-merging arch/arm/mach-sa1100/pci-nanoengine.c
+Auto-merging arch/arm/mach-shark/pci.c
+Auto-merging arch/arm/mach-tegra/pcie.c
+Auto-merging arch/arm/mach-versatile/pci.c
+Auto-merging arch/x86/Kconfig
+Auto-merging drivers/pci/probe.c
+Auto-merging include/linux/pci.h
+Merge made by recursive.
+ arch/alpha/kernel/sys_alcor.c | 2 +-
+ arch/alpha/kernel/sys_cabriolet.c | 6 +-
+ arch/alpha/kernel/sys_dp264.c | 8 +-
+ arch/alpha/kernel/sys_eb64p.c | 2 +-
+ arch/alpha/kernel/sys_eiger.c | 2 +-
+ arch/alpha/kernel/sys_marvel.c | 2 +-
+ arch/alpha/kernel/sys_miata.c | 2 +-
+ arch/alpha/kernel/sys_mikasa.c | 2 +-
+ arch/alpha/kernel/sys_nautilus.c | 2 +-
+ arch/alpha/kernel/sys_noritake.c | 2 +-
+ arch/alpha/kernel/sys_rawhide.c | 2 +-
+ arch/alpha/kernel/sys_ruffian.c | 2 +-
+ arch/alpha/kernel/sys_rx164.c | 2 +-
+ arch/alpha/kernel/sys_sable.c | 4 +-
+ arch/alpha/kernel/sys_sio.c | 4 +-
+ arch/alpha/kernel/sys_sx164.c | 2 +-
+ arch/alpha/kernel/sys_takara.c | 4 +-
+ arch/alpha/kernel/sys_titan.c | 2 +-
+ arch/alpha/kernel/sys_wildfire.c | 2 +-
+ arch/arm/common/it8152.c | 2 +-
+ arch/arm/include/asm/hardware/it8152.h | 2 +-
+ arch/arm/include/asm/mach/pci.h | 4 +-
+ arch/arm/kernel/bios32.c | 2 +-
+ arch/arm/mach-cns3xxx/pcie.c | 2 +-
+ arch/arm/mach-dove/pcie.c | 2 +-
+ arch/arm/mach-footbridge/cats-pci.c | 2 +-
+ arch/arm/mach-footbridge/ebsa285-pci.c | 2 +-
+ arch/arm/mach-footbridge/netwinder-pci.c | 2 +-
+ arch/arm/mach-footbridge/personal-pci.c | 3 +-
+ arch/arm/mach-integrator/pci.c | 2 +-
+ arch/arm/mach-iop13xx/iq81340mc.c | 2 +-
+ arch/arm/mach-iop13xx/pci.c | 2 +-
+ arch/arm/mach-iop32x/em7210.c | 2 +-
+ arch/arm/mach-iop32x/glantank.c | 2 +-
+ arch/arm/mach-iop32x/iq31244.c | 4 +-
+ arch/arm/mach-iop32x/iq80321.c | 2 +-
+ arch/arm/mach-iop32x/n2100.c | 2 +-
+ arch/arm/mach-iop33x/iq80331.c | 2 +-
+ arch/arm/mach-iop33x/iq80332.c | 2 +-
+ arch/arm/mach-ixp2000/enp2611.c | 3 +-
+ arch/arm/mach-ixp2000/ixdp2400.c | 3 +-
+ arch/arm/mach-ixp2000/ixdp2800.c | 3 +-
+ arch/arm/mach-ixp2000/ixdp2x01.c | 3 +-
+ arch/arm/mach-ixp23xx/ixdp2351.c | 2 +-
+ arch/arm/mach-ixp23xx/roadrunner.c | 3 +-
+ arch/arm/mach-ixp4xx/avila-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/coyote-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/dsmg600-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/fsg-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/gateway7001-pci.c | 3 +-
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +-
+ arch/arm/mach-ixp4xx/gtwx5715-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/nas100d-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/nslu2-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/vulcan-pci.c | 2 +-
+ arch/arm/mach-ixp4xx/wg302v2-pci.c | 2 +-
+ arch/arm/mach-kirkwood/pcie.c | 3 +-
+ arch/arm/mach-ks8695/board-dsm320.c | 2 +-
+ arch/arm/mach-ks8695/board-micrel.c | 2 +-
+ arch/arm/mach-ks8695/include/mach/devices.h | 2 +-
+ arch/arm/mach-mv78xx0/pcie.c | 3 +-
+ arch/arm/mach-orion5x/common.h | 2 +-
+ arch/arm/mach-orion5x/db88f5281-setup.c | 3 +-
+ arch/arm/mach-orion5x/dns323-setup.c | 4 +-
+ arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 +-
+ arch/arm/mach-orion5x/mss2-setup.c | 2 +-
+ arch/arm/mach-orion5x/pci.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +-
+ arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts209-setup.c | 3 +-
+ arch/arm/mach-orion5x/ts409-setup.c | 3 +-
+ arch/arm/mach-orion5x/wnr854t-setup.c | 3 +-
+ arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +-
+ arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +-
+ arch/arm/mach-sa1100/pci-nanoengine.c | 3 +-
+ arch/arm/mach-shark/pci.c | 2 +-
+ arch/arm/mach-tegra/pcie.c | 2 +-
+ arch/arm/mach-versatile/pci.c | 2 +-
+ arch/sh/drivers/pci/fixups-cayman.c | 2 +-
+ arch/sh/drivers/pci/fixups-dreamcast.c | 2 +-
+ arch/sh/drivers/pci/fixups-landisk.c | 2 +-
+ arch/sh/drivers/pci/fixups-r7780rp.c | 2 +-
+ arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +-
+ arch/sh/drivers/pci/fixups-sdk7780.c | 2 +-
+ arch/sh/drivers/pci/fixups-se7751.c | 2 +-
+ arch/sh/drivers/pci/fixups-sh03.c | 2 +-
+ arch/sh/drivers/pci/fixups-snapgear.c | 2 +-
+ arch/sh/drivers/pci/fixups-titan.c | 2 +-
+ arch/sh/drivers/pci/pcie-sh7786.c | 2 +-
+ arch/sh/include/asm/pci.h | 2 +-
+ arch/sparc/include/asm/leon_pci.h | 2 +-
+ arch/sparc/kernel/leon_pci_grpci2.c | 2 +-
+ arch/tile/kernel/pci.c | 2 +-
+ arch/unicore32/kernel/pci.c | 2 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/pci/acpi.c | 7 +-
+ arch/x86/pci/ce4100.c | 2 +
+ arch/x86/pci/common.c | 14 ++--
+ arch/x86/pci/direct.c | 6 +-
+ arch/x86/pci/numaq_32.c | 2 +
+ arch/x86/pci/olpc.c | 4 +
+ arch/x86/pci/pcbios.c | 2 +
+ arch/x86/pci/visws.c | 2 +-
+ drivers/pci/hotplug/acpi_pcihp.c | 6 +-
+ drivers/pci/hotplug/cpqphp_core.c | 17 ++---
+ drivers/pci/hotplug/pciehp_ctrl.c | 3 +
+ drivers/pci/hotplug/pciehp_hpc.c | 11 +---
+ drivers/pci/pci.c | 11 ++-
+ drivers/pci/pcie/aer/aerdrv_core.c | 76 ++++++++++++++++++--
+ drivers/pci/pcie/aer/aerdrv_errprint.c | 3 +-
+ drivers/pci/probe.c | 89 +++++++++++-------------
+ drivers/pci/setup-bus.c | 3 -
+ drivers/pci/setup-irq.c | 4 +-
+ drivers/pci/setup-res.c | 3 +-
+ include/linux/aer.h | 3 +
+ include/linux/pci.h | 6 +-
+ 120 files changed, 295 insertions(+), 216 deletions(-)
+Merging of-pci/of-pci
+$ git merge of-pci/of-pci
+Already up-to-date.
+Merging hid/for-next
+$ git merge hid/for-next
+Already up-to-date!
+Merge made by recursive.
+Merging quilt/i2c
+$ git merge quilt/i2c
+Already up-to-date.
+Merging bjdooks-i2c/next-i2c
+$ git merge bjdooks-i2c/next-i2c
+Already up-to-date.
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Already up-to-date.
+Merging hwmon-staging/hwmon-next
+$ git merge hwmon-staging/hwmon-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging drivers/hwmon/Makefile
+Auto-merging drivers/hwmon/pmbus/adm1275.c
+Auto-merging drivers/hwmon/pmbus/max16064.c
+Auto-merging drivers/hwmon/pmbus/max34440.c
+Auto-merging drivers/hwmon/pmbus/max8688.c
+Auto-merging drivers/hwmon/pmbus/pmbus.c
+Auto-merging drivers/hwmon/pmbus/pmbus.h
+Auto-merging drivers/hwmon/pmbus/pmbus_core.c
+Merge made by recursive.
+ Documentation/hwmon/adm1275 | 8 +-
+ Documentation/hwmon/coretemp | 7 +
+ Documentation/hwmon/lm25066 | 90 +++++
+ Documentation/hwmon/lm90 | 9 +-
+ Documentation/hwmon/lm95245 | 33 ++
+ Documentation/hwmon/max16064 | 4 +
+ Documentation/hwmon/max1668 | 60 +++
+ Documentation/hwmon/max34440 | 6 +
+ Documentation/hwmon/max8688 | 6 +
+ Documentation/hwmon/ntc_thermistor | 93 +++++
+ Documentation/hwmon/pmbus | 7 +
+ Documentation/hwmon/sysfs-interface | 46 +++
+ MAINTAINERS | 18 +
+ drivers/hwmon/Kconfig | 127 ++-----
+ drivers/hwmon/Makefile | 13 +-
+ drivers/hwmon/coretemp.c | 177 +++++++---
+ drivers/hwmon/lm90.c | 65 ++-
+ drivers/hwmon/lm95241.c | 31 +-
+ drivers/hwmon/lm95245.c | 543 ++++++++++++++++++++++++++
+ drivers/hwmon/max1668.c | 502 ++++++++++++++++++++++++
+ drivers/hwmon/ntc_thermistor.c | 453 +++++++++++++++++++++
+ drivers/hwmon/pmbus/Kconfig | 100 +++++
+ drivers/hwmon/pmbus/Makefile | 13 +
+ drivers/hwmon/{ => pmbus}/adm1275.c | 66 +++-
+ drivers/hwmon/pmbus/lm25066.c | 340 ++++++++++++++++
+ drivers/hwmon/{ => pmbus}/max16064.c | 57 +++-
+ drivers/hwmon/{ => pmbus}/max34440.c | 81 ++++-
+ drivers/hwmon/{ => pmbus}/max8688.c | 69 +++-
+ drivers/hwmon/{ => pmbus}/pmbus.c | 37 ++-
+ drivers/hwmon/{ => pmbus}/pmbus.h | 48 +++-
+ drivers/hwmon/{ => pmbus}/pmbus_core.c | 351 +++++++++++++----
+ drivers/hwmon/{ => pmbus}/ucd9000.c | 0
+ drivers/hwmon/{ => pmbus}/ucd9200.c | 0
+ include/linux/platform_data/ntc_thermistor.h | 53 +++
+ 34 files changed, 3229 insertions(+), 284 deletions(-)
+ create mode 100644 Documentation/hwmon/lm25066
+ create mode 100644 Documentation/hwmon/lm95245
+ create mode 100644 Documentation/hwmon/max1668
+ create mode 100644 Documentation/hwmon/ntc_thermistor
+ create mode 100644 drivers/hwmon/lm95245.c
+ create mode 100644 drivers/hwmon/max1668.c
+ create mode 100644 drivers/hwmon/ntc_thermistor.c
+ create mode 100644 drivers/hwmon/pmbus/Kconfig
+ create mode 100644 drivers/hwmon/pmbus/Makefile
+ rename drivers/hwmon/{ => pmbus}/adm1275.c (67%)
+ create mode 100644 drivers/hwmon/pmbus/lm25066.c
+ rename drivers/hwmon/{ => pmbus}/max16064.c (66%)
+ rename drivers/hwmon/{ => pmbus}/max34440.c (76%)
+ rename drivers/hwmon/{ => pmbus}/max8688.c (72%)
+ rename drivers/hwmon/{ => pmbus}/pmbus.c (89%)
+ rename drivers/hwmon/{ => pmbus}/pmbus.h (79%)
+ rename drivers/hwmon/{ => pmbus}/pmbus_core.c (84%)
+ rename drivers/hwmon/{ => pmbus}/ucd9000.c (100%)
+ rename drivers/hwmon/{ => pmbus}/ucd9200.c (100%)
+ create mode 100644 include/linux/platform_data/ntc_thermistor.h
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by recursive.
+ Documentation/SubmittingPatches | 2 +-
+ Documentation/kernel-docs.txt | 11 -------
+ Documentation/kernel-parameters.txt | 52 +++++++++++++++++++++-------------
+ 3 files changed, 33 insertions(+), 32 deletions(-)
+Merging docs/docs-move
+$ git merge docs/docs-move
+Already up-to-date.
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Removing Documentation/DocBook/dvb/dvbproperty.xml
+Removing Documentation/DocBook/dvb/dvbstb.png
+Removing Documentation/DocBook/dvb/frontend.h.xml
+Removing Documentation/DocBook/media-entities.tmpl
+Removing Documentation/DocBook/media-indices.tmpl
+Auto-merging Documentation/DocBook/media/dvb/audio.xml
+Auto-merging Documentation/DocBook/media/dvb/ca.xml
+Auto-merging Documentation/DocBook/media/dvb/demux.xml
+Auto-merging Documentation/DocBook/media/dvb/dvbapi.xml
+Auto-merging Documentation/DocBook/media/dvb/frontend.xml
+Auto-merging Documentation/DocBook/media/dvb/intro.xml
+Auto-merging Documentation/DocBook/media/dvb/net.xml
+Auto-merging Documentation/DocBook/media/dvb/video.xml
+Auto-merging Documentation/DocBook/media/v4l/common.xml
+Auto-merging Documentation/DocBook/media/v4l/compat.xml
+Auto-merging Documentation/DocBook/media/v4l/controls.xml
+Auto-merging Documentation/DocBook/media/v4l/lirc_device_interface.xml
+Auto-merging Documentation/DocBook/media/v4l/media-func-ioctl.xml
+Auto-merging Documentation/DocBook/media/v4l/media-ioc-device-info.xml
+Auto-merging Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
+Auto-merging Documentation/DocBook/media/v4l/media-ioc-setup-link.xml
+Auto-merging Documentation/DocBook/media/v4l/pixfmt.xml
+Auto-merging Documentation/DocBook/media/v4l/subdev-formats.xml
+Auto-merging Documentation/DocBook/media/v4l/v4l2.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-cropcap.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-dqevent.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-enumaudio.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-audio.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-audioout.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-crop.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-fmt.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-input.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-output.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-parm.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-priority.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-g-std.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-log-status.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-overlay.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-qbuf.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-querycap.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-queryctrl.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-querystd.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-reqbufs.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-streamon.xml
+Auto-merging Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml
+Auto-merging Documentation/DocBook/media_api.tmpl
+Removing Documentation/DocBook/v4l/bayer.pdf
+Removing Documentation/DocBook/v4l/bayer.png
+Removing Documentation/DocBook/v4l/crop.gif
+Removing Documentation/DocBook/v4l/dev-event.xml
+Removing Documentation/DocBook/v4l/fieldseq_bt.gif
+Removing Documentation/DocBook/v4l/fRecorded preimage for 'arch/arm/mach-omap2/board-rx51-peripherals.c'
+Resolved 'drivers/staging/tm6000/tm6000-alsa.c' using previous resolution.
+ieldseq_tb.gif
+Removing Documentation/DocBook/v4l/func-ioctl.xml
+Removing Documentation/DocBook/v4l/nv12mt.gif
+Removing Documentation/DocBook/v4l/nv12mt_example.gif
+Removing Documentation/DocBook/v4l/pipeline.png
+Removing Documentation/DocBook/v4l/vbi_525.gif
+Removing Documentation/DocBook/v4l/vbi_625.gif
+Removing Documentation/DocBook/v4l/vbi_hsync.gif
+Removing Documentation/DocBook/v4l/videodev2.h.xml
+Removing Documentation/DocBook/v4l/vidioc-subscribe-event.xml
+Auto-merging Documentation/feature-removal-schedule.txt
+Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
+Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Auto-merging arch/sh/boards/mach-ap325rxa/setup.c
+Auto-merging drivers/media/rc/ite-cir.c
+Removing drivers/media/video/cafe_ccic-regs.h
+Removing drivers/media/video/cafe_ccic.c
+Auto-merging drivers/media/video/hdpvr/hdpvr-core.c
+Auto-merging drivers/media/video/m5mols/m5mols_capture.c
+Auto-merging drivers/media/video/omap/omap_vout.c
+Auto-merging drivers/media/video/omap24xxcam.c
+Removing drivers/media/video/pwc/pwc-ioctl.h
+Removing drivers/media/video/pwc/pwc-uncompress.h
+Auto-merging drivers/media/video/uvc/uvc_ctrl.c
+Auto-merging drivers/media/video/uvc/uvc_v4l2.c
+Auto-merging drivers/media/video/videobuf2-memops.c
+Auto-merging drivers/staging/cxd2099/cxd2099.c
+Auto-merging drivers/staging/tm6000/tm6000-alsa.c
+CONFLICT (content): Merge conflict in drivers/staging/tm6000/tm6000-alsa.c
+Auto-merging kernel/compat.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/mach-omap2/board-rx51-peripherals.c'.
+[master a6ffe36] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/.gitignore | 5 +-
+ Documentation/DocBook/Makefile | 31 +-
+ Documentation/DocBook/dvb/dvbproperty.xml | 590 --
+ Documentation/DocBook/dvb/dvbstb.png | Bin 22655 -> 0 bytes
+ Documentation/DocBook/dvb/frontend.h.xml | 428 --
+ Documentation/DocBook/media-entities.tmpl | 464 --
+ Documentation/DocBook/media-indices.tmpl | 89 -
+ Documentation/DocBook/media/Makefile | 386 ++
+ Documentation/DocBook/media/bayer.png.b64 | 171 +
+ Documentation/DocBook/media/crop.gif.b64 | 105 +
+ Documentation/DocBook/{ => media}/dvb/.gitignore | 0
+ Documentation/DocBook/{ => media}/dvb/audio.xml | 488 +--
+ Documentation/DocBook/{ => media}/dvb/ca.xml | 112 +-
+ Documentation/DocBook/{ => media}/dvb/demux.xml | 327 +-
+ Documentation/DocBook/{ => media}/dvb/dvbapi.xml | 20 +
+ Documentation/DocBook/media/dvb/dvbproperty.xml | 859 +++
+ Documentation/DocBook/{ => media}/dvb/dvbstb.pdf | Bin 1881 -> 1881 bytes
+ Documentation/DocBook/{ => media}/dvb/examples.xml | 0
+ Documentation/DocBook/{ => media}/dvb/frontend.xml | 776 +--
+ Documentation/DocBook/{ => media}/dvb/intro.xml | 23 +-
+ Documentation/DocBook/{ => media}/dvb/kdapi.xml | 0
+ Documentation/DocBook/{ => media}/dvb/net.xml | 17 +
+ Documentation/DocBook/{ => media}/dvb/video.xml | 638 +--
+ Documentation/DocBook/media/dvbstb.png.b64 | 398 ++
+ Documentation/DocBook/media/fieldseq_bt.gif.b64 | 447 ++
+ Documentation/DocBook/media/fieldseq_tb.gif.b64 | 445 ++
+ Documentation/DocBook/media/nv12mt.gif.b64 | 37 +
+ Documentation/DocBook/media/nv12mt_example.gif.b64 | 121 +
+ Documentation/DocBook/media/pipeline.png.b64 | 213 +
+ Documentation/DocBook/{ => media}/v4l/.gitignore | 0
+ Documentation/DocBook/{ => media}/v4l/biblio.xml | 0
+ .../DocBook/{ => media}/v4l/capture.c.xml | 0
+ Documentation/DocBook/{ => media}/v4l/common.xml | 10 +-
+ Documentation/DocBook/{ => media}/v4l/compat.xml | 30 +-
+ Documentation/DocBook/{ => media}/v4l/controls.xml | 1517 +++++-
+ Documentation/DocBook/{ => media}/v4l/crop.pdf | Bin 5846 -> 5846 bytes
+ .../DocBook/{ => media}/v4l/dev-capture.xml | 0
+ .../DocBook/{ => media}/v4l/dev-codec.xml | 0
+ .../DocBook/{ => media}/v4l/dev-effect.xml | 0
+ Documentation/DocBook/media/v4l/dev-event.xml | 51 +
+ Documentation/DocBook/{ => media}/v4l/dev-osd.xml | 0
+ .../DocBook/{ => media}/v4l/dev-output.xml | 0
+ .../DocBook/{ => media}/v4l/dev-overlay.xml | 0
+ .../DocBook/{ => media}/v4l/dev-radio.xml | 0
+ .../DocBook/{ => media}/v4l/dev-raw-vbi.xml | 0
+ Documentation/DocBook/{ => media}/v4l/dev-rds.xml | 0
+ .../DocBook/{ => media}/v4l/dev-sliced-vbi.xml | 0
+ .../DocBook/{ => media}/v4l/dev-subdev.xml | 0
+ .../DocBook/{ => media}/v4l/dev-teletext.xml | 0
+ Documentation/DocBook/{ => media}/v4l/driver.xml | 0
+ .../DocBook/{ => media}/v4l/fdl-appendix.xml | 0
+ .../DocBook/{ => media}/v4l/fieldseq_bt.pdf | Bin 9185 -> 9185 bytes
+ .../DocBook/{ => media}/v4l/fieldseq_tb.pdf | Bin 9173 -> 9173 bytes
+ .../DocBook/{ => media}/v4l/func-close.xml | 0
+ Documentation/DocBook/media/v4l/func-ioctl.xml | 79 +
+ .../DocBook/{ => media}/v4l/func-mmap.xml | 0
+ .../DocBook/{ => media}/v4l/func-munmap.xml | 0
+ .../DocBook/{ => media}/v4l/func-open.xml | 0
+ .../DocBook/{ => media}/v4l/func-poll.xml | 0
+ .../DocBook/{ => media}/v4l/func-read.xml | 0
+ .../DocBook/{ => media}/v4l/func-select.xml | 0
+ .../DocBook/{ => media}/v4l/func-write.xml | 0
+ Documentation/DocBook/media/v4l/gen-errors.xml | 78 +
+ Documentation/DocBook/{ => media}/v4l/io.xml | 0
+ .../DocBook/{ => media}/v4l/keytable.c.xml | 0
+ Documentation/DocBook/{ => media}/v4l/libv4l.xml | 0
+ .../{ => media}/v4l/lirc_device_interface.xml | 4 +-
+ .../DocBook/{ => media}/v4l/media-controller.xml | 0
+ .../DocBook/{ => media}/v4l/media-func-close.xml | 0
+ .../DocBook/{ => media}/v4l/media-func-ioctl.xml | 47 +-
+ .../DocBook/{ => media}/v4l/media-func-open.xml | 0
+ .../{ => media}/v4l/media-ioc-device-info.xml | 3 +-
+ .../{ => media}/v4l/media-ioc-enum-entities.xml | 0
+ .../{ => media}/v4l/media-ioc-enum-links.xml | 2 +-
+ .../{ => media}/v4l/media-ioc-setup-link.xml | 9 -
+ Documentation/DocBook/{ => media}/v4l/pipeline.pdf | Bin 20276 -> 20276 bytes
+ .../DocBook/{ => media}/v4l/pixfmt-grey.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-m420.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-nv12.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-nv12m.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-nv12mt.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-nv16.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-sbggr16.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-sbggr8.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-srggb10.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-srggb12.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-srggb8.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-uyvy.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-vyuy.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-y10.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-y10b.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-y12.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-y16.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-y41p.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-yuv410.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-yuv411p.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-yuv420.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-yuv420m.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-yuv422p.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-yuyv.xml | 0
+ .../DocBook/{ => media}/v4l/pixfmt-yvyu.xml | 0
+ Documentation/DocBook/{ => media}/v4l/pixfmt.xml | 60 +-
+ .../DocBook/{ => media}/v4l/planar-apis.xml | 0
+ .../DocBook/{ => media}/v4l/remote_controllers.xml | 0
+ .../DocBook/{ => media}/v4l/subdev-formats.xml | 5 +-
+ Documentation/DocBook/{ => media}/v4l/v4l2.xml | 13 +-
+ .../DocBook/{ => media}/v4l/v4l2grab.c.xml | 0
+ Documentation/DocBook/{ => media}/v4l/vbi_525.pdf | Bin 3395 -> 3395 bytes
+ Documentation/DocBook/{ => media}/v4l/vbi_625.pdf | Bin 3683 -> 3683 bytes
+ .../DocBook/{ => media}/v4l/vbi_hsync.pdf | Bin 7405 -> 7405 bytes
+ .../DocBook/{ => media}/v4l/vidioc-cropcap.xml | 13 +-
+ .../{ => media}/v4l/vidioc-dbg-g-chip-ident.xml | 11 +-
+ .../{ => media}/v4l/vidioc-dbg-g-register.xml | 17 -
+ .../DocBook/{ => media}/v4l/vidioc-dqevent.xml | 27 +-
+ .../DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml | 11 +-
+ .../{ => media}/v4l/vidioc-enum-dv-presets.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-enum-fmt.xml | 0
+ .../{ => media}/v4l/vidioc-enum-frameintervals.xml | 11 -
+ .../{ => media}/v4l/vidioc-enum-framesizes.xml | 11 -
+ .../DocBook/{ => media}/v4l/vidioc-enumaudio.xml | 12 +-
+ .../{ => media}/v4l/vidioc-enumaudioout.xml | 12 +-
+ .../DocBook/{ => media}/v4l/vidioc-enuminput.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-enumoutput.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-enumstd.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-g-audio.xml | 18 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-audioout.xml | 18 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-crop.xml | 17 -
+ .../DocBook/{ => media}/v4l/vidioc-g-ctrl.xml | 7 +
+ .../DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml | 12 +-
+ .../{ => media}/v4l/vidioc-g-dv-timings.xml | 11 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-enc-index.xml | 17 -
+ .../DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml | 14 +
+ .../DocBook/{ => media}/v4l/vidioc-g-fbuf.xml | 19 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-fmt.xml | 20 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-frequency.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-g-input.xml | 19 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml | 17 -
+ .../DocBook/{ => media}/v4l/vidioc-g-modulator.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-g-output.xml | 18 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-parm.xml | 17 -
+ .../DocBook/{ => media}/v4l/vidioc-g-priority.xml | 3 +-
+ .../{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml | 11 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-std.xml | 9 +-
+ .../DocBook/{ => media}/v4l/vidioc-g-tuner.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-log-status.xml | 17 -
+ .../DocBook/{ => media}/v4l/vidioc-overlay.xml | 11 +-
+ .../DocBook/{ => media}/v4l/vidioc-qbuf.xml | 17 -
+ .../{ => media}/v4l/vidioc-query-dv-preset.xml | 22 -
+ .../DocBook/{ => media}/v4l/vidioc-querybuf.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-querycap.xml | 34 +-
+ .../DocBook/{ => media}/v4l/vidioc-queryctrl.xml | 12 +-
+ .../DocBook/{ => media}/v4l/vidioc-querystd.xml | 23 -
+ .../DocBook/{ => media}/v4l/vidioc-reqbufs.xml | 16 -
+ .../{ => media}/v4l/vidioc-s-hw-freq-seek.xml | 0
+ .../DocBook/{ => media}/v4l/vidioc-streamon.xml | 14 +-
+ .../v4l/vidioc-subdev-enum-frame-interval.xml | 0
+ .../v4l/vidioc-subdev-enum-frame-size.xml | 0
+ .../v4l/vidioc-subdev-enum-mbus-code.xml | 0
+ .../{ => media}/v4l/vidioc-subdev-g-crop.xml | 0
+ .../{ => media}/v4l/vidioc-subdev-g-fmt.xml | 3 +
+ .../v4l/vidioc-subdev-g-frame-interval.xml | 0
+ .../DocBook/media/v4l/vidioc-subscribe-event.xml | 297 +
+ Documentation/DocBook/media/vbi_525.gif.b64 | 84 +
+ Documentation/DocBook/media/vbi_625.gif.b64 | 90 +
+ Documentation/DocBook/media/vbi_hsync.gif.b64 | 43 +
+ .../DocBook/{media.tmpl => media_api.tmpl} | 8 +-
+ Documentation/DocBook/v4l/bayer.pdf | Bin 12116 -> 0 bytes
+ Documentation/DocBook/v4l/bayer.png | Bin 9725 -> 0 bytes
+ Documentation/DocBook/v4l/crop.gif | Bin 5967 -> 0 bytes
+ Documentation/DocBook/v4l/dev-event.xml | 31 -
+ Documentation/DocBook/v4l/fieldseq_bt.gif | Bin 25430 -> 0 bytes
+ Documentation/DocBook/v4l/fieldseq_tb.gif | Bin 25323 -> 0 bytes
+ Documentation/DocBook/v4l/func-ioctl.xml | 145 -
+ Documentation/DocBook/v4l/nv12mt.gif | Bin 2108 -> 0 bytes
+ Documentation/DocBook/v4l/nv12mt_example.gif | Bin 6858 -> 0 bytes
+ Documentation/DocBook/v4l/pipeline.png | Bin 12130 -> 0 bytes
+ Documentation/DocBook/v4l/vbi_525.gif | Bin 4741 -> 0 bytes
+ Documentation/DocBook/v4l/vbi_625.gif | Bin 5095 -> 0 bytes
+ Documentation/DocBook/v4l/vbi_hsync.gif | Bin 2400 -> 0 bytes
+ Documentation/DocBook/v4l/videodev2.h.xml | 1946 ------
+ .../DocBook/v4l/vidioc-subscribe-event.xml | 133 -
+ Documentation/dvb/get_dvb_firmware | 33 +-
+ Documentation/feature-removal-schedule.txt | 35 +
+ Documentation/media-framework.txt | 2 +-
+ Documentation/video4linux/API.html | 2 +-
+ Documentation/video4linux/CARDLIST.cx23885 | 2 +
+ Documentation/video4linux/CARDLIST.cx88 | 1 +
+ Documentation/video4linux/CARDLIST.em28xx | 2 +
+ Documentation/video4linux/CARDLIST.saa7134 | 4 +
+ Documentation/video4linux/CARDLIST.tuner | 2 +
+ Documentation/video4linux/CARDLIST.usbvision | 2 +
+ Documentation/video4linux/README.davinci-vpbe | 93 +
+ Documentation/video4linux/v4l2-controls.txt | 69 +-
+ Documentation/video4linux/v4l2-framework.txt | 59 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 6 +
+ arch/arm/mach-shmobile/board-ap4evb.c | 12 +-
+ arch/arm/mach-shmobile/board-mackerel.c | 13 +-
+ arch/sh/boards/mach-ap325rxa/setup.c | 15 +-
+ drivers/media/Kconfig | 14 +-
+ drivers/media/common/tuners/Kconfig | 10 +
+ drivers/media/common/tuners/Makefile | 1 +
+ drivers/media/common/tuners/tuner-types.c | 4 +
+ drivers/media/common/tuners/xc4000.c | 1691 +++++
+ drivers/media/common/tuners/xc4000.h | 67 +
+ drivers/media/dvb/Kconfig | 4 +
+ drivers/media/dvb/Makefile | 3 +-
+ drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +-
+ drivers/media/dvb/ddbridge/Kconfig | 18 +
+ drivers/media/dvb/ddbridge/Makefile | 14 +
+ drivers/media/dvb/ddbridge/ddbridge-core.c | 1719 ++++++
+ drivers/media/dvb/ddbridge/ddbridge-regs.h | 151 +
+ drivers/media/dvb/ddbridge/ddbridge.h | 187 +
+ drivers/media/dvb/dvb-core/Makefile | 4 +-
+ drivers/media/dvb/dvb-core/dvb_frontend.c | 3 +-
+ drivers/media/dvb/dvb-core/dvb_net.h | 21 +-
+ drivers/media/dvb/dvb-usb/Kconfig | 1 +
+ drivers/media/dvb/dvb-usb/af9015.c | 135 +-
+ drivers/media/dvb/dvb-usb/af9015.h | 1 -
+ drivers/media/dvb/dvb-usb/anysee.c | 69 +-
+ drivers/media/dvb/dvb-usb/anysee.h | 16 +-
+ drivers/media/dvb/dvb-usb/dib0700_devices.c | 188 +
+ drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 +
+ drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +-
+ drivers/media/dvb/dvb-usb/gp8psk.h | 3 -
+ drivers/media/dvb/dvb-usb/technisat-usb2.c | 4 +-
+ drivers/media/dvb/dvb-usb/vp7045.h | 3 -
+ drivers/media/dvb/firewire/firedtv-avc.c | 2 +-
+ drivers/media/dvb/firewire/firedtv-ci.c | 34 +-
+ drivers/media/dvb/frontends/Kconfig | 21 +
+ drivers/media/dvb/frontends/Makefile | 3 +
+ drivers/media/dvb/frontends/au8522_decoder.c | 2 +-
+ drivers/media/dvb/frontends/cx24113.c | 20 +-
+ drivers/media/dvb/frontends/cx24116.c | 6 +-
+ drivers/media/dvb/frontends/cxd2820r.h | 4 +-
+ drivers/media/dvb/frontends/cxd2820r_core.c | 22 +-
+ drivers/media/dvb/frontends/cxd2820r_priv.h | 4 +-
+ drivers/media/dvb/frontends/dib7000p.c | 5 +
+ drivers/media/dvb/frontends/drxd_hard.c | 9 +-
+ drivers/media/dvb/frontends/drxk.h | 47 +
+ drivers/media/dvb/frontends/drxk_hard.c | 6454 ++++++++++++++++++++
+ drivers/media/dvb/frontends/drxk_hard.h | 348 ++
+ drivers/media/dvb/frontends/drxk_map.h | 449 ++
+ drivers/media/dvb/frontends/itd1000.c | 25 +-
+ drivers/media/dvb/frontends/nxt6000.c | 2 +-
+ drivers/media/dvb/frontends/s5h1420.c | 12 +-
+ drivers/media/dvb/frontends/tda18271c2dd.c | 1251 ++++
+ drivers/media/dvb/frontends/tda18271c2dd.h | 16 +
+ drivers/media/dvb/frontends/tda18271c2dd_maps.h | 814 +++
+ drivers/media/dvb/ngene/Kconfig | 2 +
+ drivers/media/dvb/ngene/ngene-cards.c | 182 +-
+ drivers/media/dvb/ngene/ngene-core.c | 26 +-
+ drivers/media/dvb/ngene/ngene-dvb.c | 46 +-
+ drivers/media/dvb/ngene/ngene.h | 7 +-
+ drivers/media/dvb/siano/smscoreapi.c | 2 +-
+ drivers/media/dvb/siano/smscoreapi.h | 1 -
+ drivers/media/radio/dsbr100.c | 7 +-
+ drivers/media/radio/radio-aimslab.c | 5 +-
+ drivers/media/radio/radio-aztech.c | 5 +-
+ drivers/media/radio/radio-cadet.c | 5 +-
+ drivers/media/radio/radio-gemtek.c | 7 +-
+ drivers/media/radio/radio-maxiradio.c | 10 +-
+ drivers/media/radio/radio-mr800.c | 6 +-
+ drivers/media/radio/radio-rtrack2.c | 5 +-
+ drivers/media/radio/radio-sf16fmi.c | 5 +-
+ drivers/media/radio/radio-sf16fmr2.c | 531 +--
+ drivers/media/radio/radio-tea5764.c | 8 +-
+ drivers/media/radio/radio-terratec.c | 5 +-
+ drivers/media/radio/radio-timb.c | 3 +-
+ drivers/media/radio/radio-trust.c | 5 +-
+ drivers/media/radio/radio-typhoon.c | 9 +-
+ drivers/media/radio/radio-wl1273.c | 2 +-
+ drivers/media/radio/radio-zoltrix.c | 5 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 4 +-
+ drivers/media/radio/si470x/radio-si470x-usb.c | 6 +-
+ drivers/media/radio/si470x/radio-si470x.h | 1 -
+ drivers/media/radio/wl128x/fmdrv.h | 5 +-
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 3 +-
+ drivers/media/rc/Kconfig | 11 +
+ drivers/media/rc/Makefile | 1 +
+ drivers/media/rc/ene_ir.c | 4 +-
+ drivers/media/rc/ene_ir.h | 2 +-
+ drivers/media/rc/ir-lirc-codec.c | 15 +-
+ drivers/media/rc/ir-mce_kbd-decoder.c | 448 ++
+ drivers/media/rc/ir-raw.c | 1 +
+ drivers/media/rc/ite-cir.c | 5 +-
+ drivers/media/rc/keymaps/rc-rc6-mce.c | 3 +-
+ drivers/media/rc/mceusb.c | 10 +-
+ drivers/media/rc/nuvoton-cir.c | 12 +-
+ drivers/media/rc/rc-core-priv.h | 18 +
+ drivers/media/rc/rc-loopback.c | 13 +-
+ drivers/media/rc/rc-main.c | 4 +-
+ drivers/media/rc/redrat3.c | 63 +-
+ drivers/media/rc/winbond-cir.c | 28 +-
+ drivers/media/video/Kconfig | 44 +-
+ drivers/media/video/Makefile | 8 +-
+ drivers/media/video/adp1653.c | 491 ++
+ drivers/media/video/arv.c | 5 +-
+ drivers/media/video/atmel-isi.c | 1048 ++++
+ drivers/media/video/au0828/au0828-core.c | 1 +
+ drivers/media/video/au0828/au0828-video.c | 5 -
+ drivers/media/video/bt8xx/bttv-cards.c | 7 +-
+ drivers/media/video/bt8xx/bttv-driver.c | 14 +-
+ drivers/media/video/bt8xx/bttvp.h | 3 -
+ drivers/media/video/bw-qcam.c | 4 +-
+ drivers/media/video/c-qcam.c | 4 +-
+ drivers/media/video/cafe_ccic-regs.h | 166 -
+ drivers/media/video/cafe_ccic.c | 2267 -------
+ drivers/media/video/cpia2/cpia2.h | 5 -
+ drivers/media/video/cpia2/cpia2_v4l.c | 12 +-
+ drivers/media/video/cx18/cx18-alsa-main.c | 1 +
+ drivers/media/video/cx18/cx18-driver.h | 1 -
+ drivers/media/video/cx18/cx18-ioctl.c | 1 -
+ drivers/media/video/cx18/cx18-version.h | 8 +-
+ drivers/media/video/cx231xx/cx231xx-avcore.c | 4 +
+ drivers/media/video/cx231xx/cx231xx-cards.c | 78 +
+ drivers/media/video/cx231xx/cx231xx-core.c | 4 +
+ drivers/media/video/cx231xx/cx231xx-video.c | 29 +-
+ drivers/media/video/cx231xx/cx231xx.h | 5 +-
+ drivers/media/video/cx23885/altera-ci.c | 1 -
+ drivers/media/video/cx23885/cx23885-417.c | 1 -
+ drivers/media/video/cx23885/cx23885-cards.c | 70 +-
+ drivers/media/video/cx23885/cx23885-core.c | 13 +-
+ drivers/media/video/cx23885/cx23885-dvb.c | 23 +-
+ drivers/media/video/cx23885/cx23885-input.c | 6 +
+ drivers/media/video/cx23885/cx23885-video.c | 1 -
+ drivers/media/video/cx23885/cx23885.h | 4 +-
+ drivers/media/video/cx88/cx88-alsa.c | 19 +-
+ drivers/media/video/cx88/cx88-blackbird.c | 20 +-
+ drivers/media/video/cx88/cx88-cards.c | 150 +-
+ drivers/media/video/cx88/cx88-core.c | 11 +-
+ drivers/media/video/cx88/cx88-dvb.c | 77 +-
+ drivers/media/video/cx88/cx88-input.c | 4 +
+ drivers/media/video/cx88/cx88-mpeg.c | 35 +-
+ drivers/media/video/cx88/cx88-video.c | 65 +-
+ drivers/media/video/cx88/cx88.h | 7 +-
+ drivers/media/video/davinci/Kconfig | 23 +
+ drivers/media/video/davinci/Makefile | 2 +
+ drivers/media/video/davinci/vpbe.c | 864 +++
+ drivers/media/video/davinci/vpbe_display.c | 1860 ++++++
+ drivers/media/video/davinci/vpbe_osd.c | 1231 ++++
+ drivers/media/video/davinci/vpbe_osd_regs.h | 364 ++
+ drivers/media/video/davinci/vpbe_venc.c | 566 ++
+ drivers/media/video/davinci/vpbe_venc_regs.h | 177 +
+ drivers/media/video/davinci/vpif_capture.c | 9 +-
+ drivers/media/video/davinci/vpif_capture.h | 7 +-
+ drivers/media/video/davinci/vpif_display.c | 9 +-
+ drivers/media/video/davinci/vpif_display.h | 8 +-
+ drivers/media/video/em28xx/Kconfig | 12 +-
+ drivers/media/video/em28xx/Makefile | 6 +-
+ drivers/media/video/em28xx/em28xx-audio.c | 251 +-
+ drivers/media/video/em28xx/em28xx-cards.c | 159 +-
+ drivers/media/video/em28xx/em28xx-core.c | 84 +-
+ drivers/media/video/em28xx/em28xx-dvb.c | 126 +-
+ drivers/media/video/em28xx/em28xx-i2c.c | 17 +-
+ drivers/media/video/em28xx/em28xx-input.c | 1 +
+ drivers/media/video/em28xx/em28xx-reg.h | 1 +
+ drivers/media/video/em28xx/em28xx-video.c | 14 +-
+ drivers/media/video/em28xx/em28xx.h | 24 +-
+ drivers/media/video/et61x251/et61x251.h | 1 -
+ drivers/media/video/et61x251/et61x251_core.c | 16 +-
+ drivers/media/video/fsl-viu.c | 10 +-
+ drivers/media/video/gspca/Kconfig | 10 +
+ drivers/media/video/gspca/Makefile | 2 +
+ drivers/media/video/gspca/gl860/gl860.h | 1 -
+ drivers/media/video/gspca/gspca.c | 23 +-
+ drivers/media/video/gspca/ov519.c | 115 +-
+ drivers/media/video/gspca/se401.c | 774 +++
+ drivers/media/video/gspca/se401.h | 90 +
+ drivers/media/video/gspca/sunplus.c | 3 -
+ drivers/media/video/gspca/t613.c | 2 +-
+ drivers/media/video/hdpvr/hdpvr-core.c | 1 +
+ drivers/media/video/hdpvr/hdpvr-video.c | 2 -
+ drivers/media/video/hdpvr/hdpvr.h | 6 -
+ drivers/media/video/ivtv/ivtv-driver.h | 1 -
+ drivers/media/video/ivtv/ivtv-fileops.c | 19 +-
+ drivers/media/video/ivtv/ivtv-ioctl.c | 5 +-
+ drivers/media/video/ivtv/ivtv-version.h | 7 +-
+ drivers/media/video/m5mols/m5mols_capture.c | 1 -
+ drivers/media/video/m5mols/m5mols_core.c | 1 -
+ drivers/media/video/marvell-ccic/Kconfig | 23 +
+ drivers/media/video/marvell-ccic/Makefile | 6 +
+ drivers/media/video/marvell-ccic/cafe-driver.c | 654 ++
+ drivers/media/video/marvell-ccic/mcam-core.c | 1843 ++++++
+ drivers/media/video/marvell-ccic/mcam-core.h | 323 +
+ drivers/media/video/marvell-ccic/mmp-driver.c | 340 +
+ drivers/media/video/mem2mem_testdev.c | 4 +-
+ drivers/media/video/mt9m001.c | 14 +-
+ drivers/media/video/mt9m111.c | 359 +-
+ drivers/media/video/mt9t031.c | 3 +-
+ drivers/media/video/mt9t112.c | 10 +-
+ drivers/media/video/mt9v011.c | 85 +-
+ drivers/media/video/mt9v022.c | 10 +-
+ drivers/media/video/mt9v032.c | 20 +-
+ drivers/media/video/mx1_camera.c | 47 +-
+ drivers/media/video/mx2_camera.c | 66 +-
+ drivers/media/video/mx3_camera.c | 71 +-
+ drivers/media/video/omap/Kconfig | 7 +-
+ drivers/media/video/omap/Makefile | 1 +
+ drivers/media/video/omap/omap_vout.c | 645 +--
+ drivers/media/video/omap/omap_vout_vrfb.c | 390 ++
+ drivers/media/video/omap/omap_vout_vrfb.h | 40 +
+ drivers/media/video/omap/omap_voutdef.h | 78 +
+ drivers/media/video/omap/omap_voutlib.c | 46 +
+ drivers/media/video/omap/omap_voutlib.h | 12 +-
+ drivers/media/video/omap1_camera.c | 57 +-
+ drivers/media/video/omap24xxcam.c | 9 +-
+ drivers/media/video/omap3isp/isp.c | 1 +
+ drivers/media/video/omap3isp/isp.h | 6 +
+ drivers/media/video/omap3isp/ispccdc.c | 7 +-
+ drivers/media/video/omap3isp/ispccp2.c | 27 +-
+ drivers/media/video/omap3isp/ispccp2.h | 1 +
+ drivers/media/video/omap3isp/ispstat.c | 3 +-
+ drivers/media/video/omap3isp/ispvideo.c | 1 -
+ drivers/media/video/omap3isp/ispvideo.h | 3 +-
+ drivers/media/video/ov2640.c | 13 +-
+ drivers/media/video/ov5642.c | 1011 +++
+ drivers/media/video/ov7670.c | 3 +-
+ drivers/media/video/ov772x.c | 10 +-
+ drivers/media/video/ov9640.c | 13 +-
+ drivers/media/video/ov9740.c | 556 +-
+ drivers/media/video/pms.c | 4 +-
+ drivers/media/video/pvrusb2/pvrusb2-main.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 9 +-
+ drivers/media/video/pwc/Kconfig | 1 +
+ drivers/media/video/pwc/pwc-ctrl.c | 803 +--
+ drivers/media/video/pwc/pwc-dec1.c | 28 +-
+ drivers/media/video/pwc/pwc-dec1.h | 8 +-
+ drivers/media/video/pwc/pwc-dec23.c | 22 -
+ drivers/media/video/pwc/pwc-dec23.h | 10 -
+ drivers/media/video/pwc/pwc-if.c | 1259 ++---
+ drivers/media/video/pwc/pwc-ioctl.h | 323 -
+ drivers/media/video/pwc/pwc-kiara.c | 1 -
+ drivers/media/video/pwc/pwc-misc.c | 4 -
+ drivers/media/video/pwc/pwc-uncompress.c | 17 +-
+ drivers/media/video/pwc/pwc-uncompress.h | 40 -
+ drivers/media/video/pwc/pwc-v4l.c | 1257 +++--
+ drivers/media/video/pwc/pwc.h | 409 +-
+ drivers/media/video/pxa_camera.c | 92 +-
+ drivers/media/video/rj54n1cb0c.c | 7 +-
+ drivers/media/video/s2255drv.c | 35 +-
+ drivers/media/video/s5p-fimc/fimc-capture.c | 2 -
+ drivers/media/video/s5p-fimc/fimc-core.c | 3 +-
+ drivers/media/video/s5p-mfc/Makefile | 5 +
+ drivers/media/video/s5p-mfc/regs-mfc.h | 413 ++
+ drivers/media/video/s5p-mfc/s5p_mfc.c | 1274 ++++
+ drivers/media/video/s5p-mfc/s5p_mfc_cmd.c | 120 +
+ drivers/media/video/s5p-mfc/s5p_mfc_cmd.h | 30 +
+ drivers/media/video/s5p-mfc/s5p_mfc_common.h | 572 ++
+ drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c | 343 ++
+ drivers/media/video/s5p-mfc/s5p_mfc_ctrl.h | 29 +
+ drivers/media/video/s5p-mfc/s5p_mfc_debug.h | 48 +
+ drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 1036 ++++
+ drivers/media/video/s5p-mfc/s5p_mfc_dec.h | 23 +
+ drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 1829 ++++++
+ drivers/media/video/s5p-mfc/s5p_mfc_enc.h | 23 +
+ drivers/media/video/s5p-mfc/s5p_mfc_intr.c | 92 +
+ drivers/media/video/s5p-mfc/s5p_mfc_intr.h | 26 +
+ drivers/media/video/s5p-mfc/s5p_mfc_opr.c | 1397 +++++
+ drivers/media/video/s5p-mfc/s5p_mfc_opr.h | 91 +
+ drivers/media/video/s5p-mfc/s5p_mfc_pm.c | 117 +
+ drivers/media/video/s5p-mfc/s5p_mfc_pm.h | 24 +
+ drivers/media/video/s5p-mfc/s5p_mfc_shm.c | 47 +
+ drivers/media/video/s5p-mfc/s5p_mfc_shm.h | 91 +
+ drivers/media/video/s5p-tv/Kconfig | 76 +
+ drivers/media/video/s5p-tv/Makefile | 17 +
+ drivers/media/video/s5p-tv/hdmi_drv.c | 1042 ++++
+ drivers/media/video/s5p-tv/hdmiphy_drv.c | 188 +
+ drivers/media/video/s5p-tv/mixer.h | 354 ++
+ drivers/media/video/s5p-tv/mixer_drv.c | 487 ++
+ drivers/media/video/s5p-tv/mixer_grp_layer.c | 185 +
+ drivers/media/video/s5p-tv/mixer_reg.c | 541 ++
+ drivers/media/video/s5p-tv/mixer_video.c | 1006 +++
+ drivers/media/video/s5p-tv/mixer_vp_layer.c | 211 +
+ drivers/media/video/s5p-tv/regs-hdmi.h | 141 +
+ drivers/media/video/s5p-tv/regs-mixer.h | 121 +
+ drivers/media/video/s5p-tv/regs-sdo.h | 63 +
+ drivers/media/video/s5p-tv/regs-vp.h | 88 +
+ drivers/media/video/s5p-tv/sdo_drv.c | 479 ++
+ drivers/media/video/saa7115.c | 4 +-
+ drivers/media/video/saa7134/saa7134-cards.c | 13 +-
+ drivers/media/video/saa7134/saa7134-core.c | 12 +-
+ drivers/media/video/saa7134/saa7134-dvb.c | 25 +
+ drivers/media/video/saa7134/saa7134-empress.c | 1 -
+ drivers/media/video/saa7134/saa7134-video.c | 2 -
+ drivers/media/video/saa7134/saa7134.h | 3 +-
+ drivers/media/video/saa7164/saa7164-encoder.c | 6 +-
+ drivers/media/video/saa7164/saa7164-vbi.c | 6 +-
+ drivers/media/video/saa7164/saa7164.h | 1 -
+ drivers/media/video/sh_mobile_ceu_camera.c | 207 +-
+ drivers/media/video/sh_mobile_csi2.c | 135 +-
+ drivers/media/video/sh_vou.c | 3 +-
+ drivers/media/video/sn9c102/sn9c102.h | 1 -
+ drivers/media/video/sn9c102/sn9c102_core.c | 16 +-
+ drivers/media/video/soc_camera.c | 281 +-
+ drivers/media/video/soc_camera_platform.c | 10 +-
+ drivers/media/video/sr030pc30.c | 7 +-
+ drivers/media/video/tda7432.c | 5 +-
+ drivers/media/video/timblogiw.c | 1 -
+ drivers/media/video/tlg2300/pd-common.h | 1 -
+ drivers/media/video/tlg2300/pd-main.c | 1 +
+ drivers/media/video/tlg2300/pd-radio.c | 2 -
+ drivers/media/video/tuner-core.c | 18 +
+ drivers/media/video/tw9910.c | 21 +-
+ drivers/media/video/usbvision/usbvision-video.c | 12 +-
+ drivers/media/video/uvc/uvc_ctrl.c | 4 +-
+ drivers/media/video/uvc/uvc_driver.c | 12 +-
+ drivers/media/video/uvc/uvc_v4l2.c | 4 +-
+ drivers/media/video/uvc/uvcvideo.h | 3 +-
+ drivers/media/video/v4l2-common.c | 3 +
+ drivers/media/video/v4l2-compat-ioctl32.c | 37 +
+ drivers/media/video/v4l2-ctrls.c | 826 ++-
+ drivers/media/video/v4l2-device.c | 1 +
+ drivers/media/video/v4l2-event.c | 282 +-
+ drivers/media/video/v4l2-fh.c | 23 +-
+ drivers/media/video/v4l2-ioctl.c | 50 +-
+ drivers/media/video/v4l2-subdev.c | 31 +-
+ drivers/media/video/videobuf-dma-sg.c | 5 +-
+ drivers/media/video/videobuf2-dma-sg.c | 8 +-
+ drivers/media/video/videobuf2-memops.c | 6 +-
+ drivers/media/video/vino.c | 5 +-
+ drivers/media/video/vivi.c | 91 +-
+ drivers/media/video/w9966.c | 4 +-
+ drivers/media/video/zoran/zoran.h | 4 -
+ drivers/media/video/zoran/zoran_card.c | 7 +-
+ drivers/media/video/zoran/zoran_driver.c | 3 -
+ drivers/media/video/zr364xx.c | 6 +-
+ drivers/mfd/timberdale.c | 8 +-
+ drivers/staging/cxd2099/Kconfig | 11 +-
+ drivers/staging/cxd2099/cxd2099.c | 311 +-
+ drivers/staging/cxd2099/cxd2099.h | 18 +-
+ drivers/staging/tm6000/tm6000-alsa.c | 12 +-
+ drivers/usb/gadget/uvc_v4l2.c | 22 +-
+ include/linux/dvb/audio.h | 2 +-
+ include/linux/videodev2.h | 254 +-
+ include/media/adp1653.h | 126 +
+ include/media/atmel-isi.h | 119 +
+ include/media/davinci/vpbe.h | 184 +
+ include/media/davinci/vpbe_display.h | 147 +
+ include/media/davinci/vpbe_osd.h | 394 ++
+ include/media/davinci/vpbe_types.h | 91 +
+ include/media/davinci/vpbe_venc.h | 45 +
+ include/media/mmp-camera.h | 9 +
+ {drivers/media/video => include/media}/ov7670.h | 0
+ include/media/rc-core.h | 2 +-
+ include/media/rc-map.h | 3 +-
+ include/media/sh_mobile_ceu.h | 10 +-
+ include/media/sh_mobile_csi2.h | 8 +-
+ include/media/soc_camera.h | 44 +-
+ include/media/soc_camera_platform.h | 15 +-
+ include/media/timb_radio.h | 9 +-
+ include/media/tuner.h | 2 +
+ include/media/v4l2-chip-ident.h | 4 +-
+ include/media/v4l2-ctrls.h | 72 +-
+ include/media/v4l2-event.h | 84 +-
+ include/media/v4l2-fh.h | 13 +-
+ include/media/v4l2-mediabus.h | 63 +
+ include/media/v4l2-subdev.h | 24 +-
+ include/sound/tea575x-tuner.h | 8 +-
+ kernel/compat.c | 1 +
+ sound/i2c/other/tea575x-tuner.c | 143 +-
+ sound/pci/Kconfig | 4 +-
+ 565 files changed, 53056 insertions(+), 15028 deletions(-)
+ delete mode 100644 Documentation/DocBook/dvb/dvbproperty.xml
+ delete mode 100644 Documentation/DocBook/dvb/dvbstb.png
+ delete mode 100644 Documentation/DocBook/dvb/frontend.h.xml
+ delete mode 100644 Documentation/DocBook/media-entities.tmpl
+ delete mode 100644 Documentation/DocBook/media-indices.tmpl
+ create mode 100644 Documentation/DocBook/media/Makefile
+ create mode 100644 Documentation/DocBook/media/bayer.png.b64
+ create mode 100644 Documentation/DocBook/media/crop.gif.b64
+ rename Documentation/DocBook/{ => media}/dvb/.gitignore (100%)
+ rename Documentation/DocBook/{ => media}/dvb/audio.xml (79%)
+ rename Documentation/DocBook/{ => media}/dvb/ca.xml (67%)
+ rename Documentation/DocBook/{ => media}/dvb/demux.xml (84%)
+ rename Documentation/DocBook/{ => media}/dvb/dvbapi.xml (85%)
+ create mode 100644 Documentation/DocBook/media/dvb/dvbproperty.xml
+ rename Documentation/DocBook/{ => media}/dvb/dvbstb.pdf (100%)
+ rename Documentation/DocBook/{ => media}/dvb/examples.xml (100%)
+ rename Documentation/DocBook/{ => media}/dvb/frontend.xml (75%)
+ rename Documentation/DocBook/{ => media}/dvb/intro.xml (92%)
+ rename Documentation/DocBook/{ => media}/dvb/kdapi.xml (100%)
+ rename Documentation/DocBook/{ => media}/dvb/net.xml (57%)
+ rename Documentation/DocBook/{ => media}/dvb/video.xml (81%)
+ create mode 100644 Documentation/DocBook/media/dvbstb.png.b64
+ create mode 100644 Documentation/DocBook/media/fieldseq_bt.gif.b64
+ create mode 100644 Documentation/DocBook/media/fieldseq_tb.gif.b64
+ create mode 100644 Documentation/DocBook/media/nv12mt.gif.b64
+ create mode 100644 Documentation/DocBook/media/nv12mt_example.gif.b64
+ create mode 100644 Documentation/DocBook/media/pipeline.png.b64
+ rename Documentation/DocBook/{ => media}/v4l/.gitignore (100%)
+ rename Documentation/DocBook/{ => media}/v4l/biblio.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/capture.c.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/common.xml (99%)
+ rename Documentation/DocBook/{ => media}/v4l/compat.xml (99%)
+ rename Documentation/DocBook/{ => media}/v4l/controls.xml (62%)
+ rename Documentation/DocBook/{ => media}/v4l/crop.pdf (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-capture.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-codec.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-effect.xml (100%)
+ create mode 100644 Documentation/DocBook/media/v4l/dev-event.xml
+ rename Documentation/DocBook/{ => media}/v4l/dev-osd.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-output.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-overlay.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-radio.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-raw-vbi.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-rds.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-sliced-vbi.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-subdev.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/dev-teletext.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/driver.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/fdl-appendix.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.pdf (100%)
+ rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.pdf (100%)
+ rename Documentation/DocBook/{ => media}/v4l/func-close.xml (100%)
+ create mode 100644 Documentation/DocBook/media/v4l/func-ioctl.xml
+ rename Documentation/DocBook/{ => media}/v4l/func-mmap.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/func-munmap.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/func-open.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/func-poll.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/func-read.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/func-select.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/func-write.xml (100%)
+ create mode 100644 Documentation/DocBook/media/v4l/gen-errors.xml
+ rename Documentation/DocBook/{ => media}/v4l/io.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/keytable.c.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/libv4l.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/lirc_device_interface.xml (99%)
+ rename Documentation/DocBook/{ => media}/v4l/media-controller.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/media-func-close.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/media-func-ioctl.xml (59%)
+ rename Documentation/DocBook/{ => media}/v4l/media-func-open.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/media-ioc-device-info.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-entities.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-links.xml (98%)
+ rename Documentation/DocBook/{ => media}/v4l/media-ioc-setup-link.xml (87%)
+ rename Documentation/DocBook/{ => media}/v4l/pipeline.pdf (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-grey.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-m420.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12m.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12mt.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv16.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr16.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr8.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb10.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb12.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb8.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-uyvy.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-vyuy.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10b.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-y12.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-y16.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-y41p.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv410.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv411p.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420m.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv422p.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuyv.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt-yvyu.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/pixfmt.xml (94%)
+ rename Documentation/DocBook/{ => media}/v4l/planar-apis.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/remote_controllers.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/subdev-formats.xml (99%)
+ rename Documentation/DocBook/{ => media}/v4l/v4l2.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/v4l2grab.c.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vbi_525.pdf (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vbi_625.pdf (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.pdf (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-cropcap.xml (95%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-chip-ident.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-register.xml (94%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-dqevent.xml (84%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml (96%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-dv-presets.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-fmt.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-frameintervals.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-framesizes.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudio.xml (89%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudioout.xml (90%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enuminput.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enumoutput.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-enumstd.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audio.xml (93%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audioout.xml (92%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-crop.xml (93%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ctrl.xml (94%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml (96%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-timings.xml (98%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-enc-index.xml (95%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml (95%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fbuf.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fmt.xml (93%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-frequency.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-input.xml (85%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml (93%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-modulator.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-output.xml (87%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-parm.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-priority.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-std.xml (90%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-g-tuner.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-log-status.xml (80%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-overlay.xml (90%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-qbuf.xml (95%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-query-dv-preset.xml (79%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-querybuf.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-querycap.xml (93%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-queryctrl.xml (97%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-querystd.xml (78%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-reqbufs.xml (92%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-s-hw-freq-seek.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-streamon.xml (92%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-interval.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-size.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-mbus-code.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-crop.xml (100%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-fmt.xml (99%)
+ rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-frame-interval.xml (100%)
+ create mode 100644 Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml
+ create mode 100644 Documentation/DocBook/media/vbi_525.gif.b64
+ create mode 100644 Documentation/DocBook/media/vbi_625.gif.b64
+ create mode 100644 Documentation/DocBook/media/vbi_hsync.gif.b64
+ rename Documentation/DocBook/{media.tmpl => media_api.tmpl} (89%)
+ delete mode 100644 Documentation/DocBook/v4l/bayer.pdf
+ delete mode 100644 Documentation/DocBook/v4l/bayer.png
+ delete mode 100644 Documentation/DocBook/v4l/crop.gif
+ delete mode 100644 Documentation/DocBook/v4l/dev-event.xml
+ delete mode 100644 Documentation/DocBook/v4l/fieldseq_bt.gif
+ delete mode 100644 Documentation/DocBook/v4l/fieldseq_tb.gif
+ delete mode 100644 Documentation/DocBook/v4l/func-ioctl.xml
+ delete mode 100644 Documentation/DocBook/v4l/nv12mt.gif
+ delete mode 100644 Documentation/DocBook/v4l/nv12mt_example.gif
+ delete mode 100644 Documentation/DocBook/v4l/pipeline.png
+ delete mode 100644 Documentation/DocBook/v4l/vbi_525.gif
+ delete mode 100644 Documentation/DocBook/v4l/vbi_625.gif
+ delete mode 100644 Documentation/DocBook/v4l/vbi_hsync.gif
+ delete mode 100644 Documentation/DocBook/v4l/videodev2.h.xml
+ delete mode 100644 Documentation/DocBook/v4l/vidioc-subscribe-event.xml
+ mode change 100644 => 100755 Documentation/dvb/get_dvb_firmware
+ create mode 100644 Documentation/video4linux/README.davinci-vpbe
+ create mode 100644 drivers/media/common/tuners/xc4000.c
+ create mode 100644 drivers/media/common/tuners/xc4000.h
+ create mode 100644 drivers/media/dvb/ddbridge/Kconfig
+ create mode 100644 drivers/media/dvb/ddbridge/Makefile
+ create mode 100644 drivers/media/dvb/ddbridge/ddbridge-core.c
+ create mode 100644 drivers/media/dvb/ddbridge/ddbridge-regs.h
+ create mode 100644 drivers/media/dvb/ddbridge/ddbridge.h
+ create mode 100644 drivers/media/dvb/frontends/drxk.h
+ create mode 100644 drivers/media/dvb/frontends/drxk_hard.c
+ create mode 100644 drivers/media/dvb/frontends/drxk_hard.h
+ create mode 100644 drivers/media/dvb/frontends/drxk_map.h
+ create mode 100644 drivers/media/dvb/frontends/tda18271c2dd.c
+ create mode 100644 drivers/media/dvb/frontends/tda18271c2dd.h
+ create mode 100644 drivers/media/dvb/frontends/tda18271c2dd_maps.h
+ create mode 100644 drivers/media/rc/ir-mce_kbd-decoder.c
+ create mode 100644 drivers/media/video/adp1653.c
+ create mode 100644 drivers/media/video/atmel-isi.c
+ delete mode 100644 drivers/media/video/cafe_ccic-regs.h
+ delete mode 100644 drivers/media/video/cafe_ccic.c
+ create mode 100644 drivers/media/video/davinci/vpbe.c
+ create mode 100644 drivers/media/video/davinci/vpbe_display.c
+ create mode 100644 drivers/media/video/davinci/vpbe_osd.c
+ create mode 100644 drivers/media/video/davinci/vpbe_osd_regs.h
+ create mode 100644 drivers/media/video/davinci/vpbe_venc.c
+ create mode 100644 drivers/media/video/davinci/vpbe_venc_regs.h
+ create mode 100644 drivers/media/video/gspca/se401.c
+ create mode 100644 drivers/media/video/gspca/se401.h
+ create mode 100644 drivers/media/video/marvell-ccic/Kconfig
+ create mode 100644 drivers/media/video/marvell-ccic/Makefile
+ create mode 100644 drivers/media/video/marvell-ccic/cafe-driver.c
+ create mode 100644 drivers/media/video/marvell-ccic/mcam-core.c
+ create mode 100644 drivers/media/video/marvell-ccic/mcam-core.h
+ create mode 100644 drivers/media/video/marvell-ccic/mmp-driver.c
+ create mode 100644 drivers/media/video/omap/omap_vout_vrfb.c
+ create mode 100644 drivers/media/video/omap/omap_vout_vrfb.h
+ create mode 100644 drivers/media/video/ov5642.c
+ delete mode 100644 drivers/media/video/pwc/pwc-ioctl.h
+ delete mode 100644 drivers/media/video/pwc/pwc-uncompress.h
+ create mode 100644 drivers/media/video/s5p-mfc/Makefile
+ create mode 100644 drivers/media/video/s5p-mfc/regs-mfc.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_cmd.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_cmd.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_common.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_ctrl.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_debug.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_dec.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_enc.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_intr.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_intr.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_opr.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_opr.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_pm.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_pm.h
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_shm.c
+ create mode 100644 drivers/media/video/s5p-mfc/s5p_mfc_shm.h
+ create mode 100644 drivers/media/video/s5p-tv/Kconfig
+ create mode 100644 drivers/media/video/s5p-tv/Makefile
+ create mode 100644 drivers/media/video/s5p-tv/hdmi_drv.c
+ create mode 100644 drivers/media/video/s5p-tv/hdmiphy_drv.c
+ create mode 100644 drivers/media/video/s5p-tv/mixer.h
+ create mode 100644 drivers/media/video/s5p-tv/mixer_drv.c
+ create mode 100644 drivers/media/video/s5p-tv/mixer_grp_layer.c
+ create mode 100644 drivers/media/video/s5p-tv/mixer_reg.c
+ create mode 100644 drivers/media/video/s5p-tv/mixer_video.c
+ create mode 100644 drivers/media/video/s5p-tv/mixer_vp_layer.c
+ create mode 100644 drivers/media/video/s5p-tv/regs-hdmi.h
+ create mode 100644 drivers/media/video/s5p-tv/regs-mixer.h
+ create mode 100644 drivers/media/video/s5p-tv/regs-sdo.h
+ create mode 100644 drivers/media/video/s5p-tv/regs-vp.h
+ create mode 100644 drivers/media/video/s5p-tv/sdo_drv.c
+ create mode 100644 include/media/adp1653.h
+ create mode 100644 include/media/atmel-isi.h
+ create mode 100644 include/media/davinci/vpbe.h
+ create mode 100644 include/media/davinci/vpbe_display.h
+ create mode 100644 include/media/davinci/vpbe_osd.h
+ create mode 100644 include/media/davinci/vpbe_types.h
+ create mode 100644 include/media/davinci/vpbe_venc.h
+ create mode 100644 include/media/mmp-camera.h
+ rename {drivers/media/video => include/media}/ov7670.h (100%)
+Merging kbuild/for-next
+$ git merge kbuild/for-next
+Removing scripts/kconfig/kconfig_load.c
+Merge made by recursive.
+ scripts/kconfig/Makefile | 23 +--
+ scripts/kconfig/conf.c | 48 ++++-
+ scripts/kconfig/confdata.c | 340 ++++++++++++++++++++++++-----------
+ scripts/kconfig/expr.c | 13 +-
+ scripts/kconfig/expr.h | 3 -
+ scripts/kconfig/gconf.c | 38 +----
+ scripts/kconfig/kconfig_load.c | 35 ----
+ scripts/kconfig/kxgettext.c | 1 -
+ scripts/kconfig/lkc.h | 16 +--
+ scripts/kconfig/lkc_proto.h | 1 +
+ scripts/kconfig/mconf.c | 2 +-
+ scripts/kconfig/menu.c | 5 +-
+ scripts/kconfig/nconf.c | 30 +---
+ scripts/kconfig/qconf.cc | 17 +-
+ scripts/kconfig/qconf.h | 2 +-
+ scripts/kconfig/symbol.c | 47 +++++-
+ scripts/kconfig/util.c | 2 +
+ scripts/kconfig/zconf.l | 1 -
+ scripts/kconfig/zconf.lex.c_shipped | 1 -
+ scripts/kconfig/zconf.tab.c_shipped | 1 -
+ scripts/kconfig/zconf.y | 1 -
+ 21 files changed, 367 insertions(+), 260 deletions(-)
+ delete mode 100644 scripts/kconfig/kconfig_load.c
+Merging kconfig/for-next
+$ git merge kconfig/for-next
+Already up-to-date!
+Merge made by recursive.
+Merging ide/master
+$ git merge ide/master
+Already up-to-date.
+Merging libata/NEXT
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging acpi/test
+$ git merge acpi/test
+Resolved 'arch/ia64/Kconfig' using previous resolution.
+Resolved 'arch/powerpc/Kconfig' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'lib/Kconfig' using previous resolution.
+Resolved 'lib/Makefile' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging arch/alpha/Kconfig
+Auto-merging arch/ia64/Kconfig
+CONFLICT (content): Merge conflict in arch/ia64/Kconfig
+Auto-merging arch/m68k/Kconfig
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging drivers/acpi/apei/erst.c
+Auto-merging drivers/acpi/battery.c
+Auto-merging drivers/acpi/sbs.c
+Auto-merging drivers/acpi/video.c
+Auto-merging drivers/ata/libata-acpi.c
+Auto-merging drivers/cpufreq/acpi-cpufreq.c
+Auto-merging include/linux/bitmap.h
+Auto-merging include/linux/mm.h
+Auto-merging lib/Kconfig
+CONFLICT (content): Merge conflict in lib/Kconfig
+Auto-merging lib/Makefile
+CONFLICT (content): Merge conflict in lib/Makefile
+Auto-merging lib/bitmap.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 32ad810] Merge remote-tracking branch 'acpi/test'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 5 +
+ arch/Kconfig | 3 +
+ arch/alpha/Kconfig | 1 +
+ arch/avr32/Kconfig | 1 +
+ arch/frv/Kconfig | 1 +
+ arch/ia64/Kconfig | 1 +
+ arch/m68k/Kconfig | 1 +
+ arch/parisc/Kconfig | 1 +
+ arch/powerpc/Kconfig | 1 +
+ arch/s390/Kconfig | 1 +
+ arch/sh/Kconfig | 1 +
+ arch/sparc/Kconfig | 1 +
+ arch/tile/Kconfig | 1 +
+ arch/x86/Kconfig | 1 +
+ drivers/acpi/acpica/acglobal.h | 6 +
+ drivers/acpi/acpica/aclocal.h | 1 +
+ drivers/acpi/acpica/acpredef.h | 1 +
+ drivers/acpi/acpica/nspredef.c | 19 +-
+ drivers/acpi/acpica/nsrepair2.c | 15 ++
+ drivers/acpi/acpica/tbinstal.c | 27 ++-
+ drivers/acpi/apei/Kconfig | 11 +-
+ drivers/acpi/apei/apei-base.c | 35 +++-
+ drivers/acpi/apei/apei-internal.h | 15 ++-
+ drivers/acpi/apei/einj.c | 4 +-
+ drivers/acpi/apei/erst-dbg.c | 6 +-
+ drivers/acpi/apei/erst.c | 12 +-
+ drivers/acpi/apei/ghes.c | 430 ++++++++++++++++++++++++++++++++---
+ drivers/acpi/apei/hest.c | 17 +-
+ drivers/acpi/battery.c | 82 ++++---
+ drivers/acpi/bus.c | 14 +-
+ drivers/acpi/dock.c | 4 +-
+ drivers/acpi/ec_sys.c | 2 +-
+ drivers/acpi/fan.c | 2 +-
+ drivers/acpi/osl.c | 15 ++
+ drivers/acpi/pci_irq.c | 58 +++++
+ drivers/acpi/pci_root.c | 3 +-
+ drivers/acpi/processor_thermal.c | 2 +-
+ drivers/acpi/sbs.c | 13 +-
+ drivers/acpi/sysfs.c | 4 +-
+ drivers/acpi/thermal.c | 2 +-
+ drivers/acpi/video.c | 2 +-
+ drivers/ata/libata-acpi.c | 4 +-
+ drivers/cpufreq/acpi-cpufreq.c | 201 +----------------
+ drivers/pci/hotplug/acpiphp_glue.c | 2 +-
+ include/acpi/acpi_drivers.h | 2 +-
+ include/acpi/acpixf.h | 3 +-
+ include/acpi/apei.h | 5 +
+ include/acpi/processor.h | 2 +-
+ include/linux/acpi.h | 2 +
+ include/linux/bitmap.h | 1 +
+ include/linux/genalloc.h | 34 +++-
+ include/linux/llist.h | 126 ++++++++++
+ include/linux/mm.h | 1 +
+ lib/Kconfig | 3 +
+ lib/Makefile | 2 +
+ lib/bitmap.c | 2 -
+ lib/genalloc.c | 300 ++++++++++++++++++++-----
+ lib/llist.c | 129 +++++++++++
+ mm/memory-failure.c | 92 ++++++++
+ 59 files changed, 1354 insertions(+), 379 deletions(-)
+ create mode 100644 include/linux/llist.h
+ create mode 100644 lib/llist.c
+Merging idle-test/idle-test
+$ git merge idle-test/idle-test
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ MAINTAINERS | 6 +
+ arch/x86/platform/mrst/Makefile | 1 +
+ arch/x86/platform/mrst/pmu.c | 814 +++++++++++++++++++++++++++++++++++++++
+ arch/x86/platform/mrst/pmu.h | 234 +++++++++++
+ 4 files changed, 1055 insertions(+), 0 deletions(-)
+ create mode 100644 arch/x86/platform/mrst/pmu.c
+ create mode 100644 arch/x86/platform/mrst/pmu.h
+Merging powertools/tools-test
+$ git merge powertools/tools-test
+Merge made by recursive.
+ .../x86_energy_perf_policy.c | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+Merging cpupowerutils/master
+$ git merge cpupowerutils/master
+Auto-merging CREDITS
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ CREDITS | 17 +-
+ MAINTAINERS | 6 +
+ tools/power/cpupower/.gitignore | 22 +
+ tools/power/cpupower/Makefile | 279 ++++++
+ tools/power/cpupower/README | 49 +
+ tools/power/cpupower/ToDo | 11 +
+ tools/power/cpupower/bench/Makefile | 29 +
+ tools/power/cpupower/bench/README-BENCH | 124 +++
+ tools/power/cpupower/bench/benchmark.c | 194 ++++
+ tools/power/cpupower/bench/benchmark.h | 29 +
+ tools/power/cpupower/bench/config.h | 36 +
+ tools/power/cpupower/bench/cpufreq-bench_plot.sh | 104 +++
+ tools/power/cpupower/bench/cpufreq-bench_script.sh | 101 ++
+ tools/power/cpupower/bench/example.cfg | 11 +
+ tools/power/cpupower/bench/main.c | 202 ++++
+ tools/power/cpupower/bench/parse.c | 225 +++++
+ tools/power/cpupower/bench/parse.h | 53 ++
+ tools/power/cpupower/bench/system.c | 191 ++++
+ tools/power/cpupower/bench/system.h | 29 +
+ tools/power/cpupower/debug/i386/Makefile | 20 +
+ tools/power/cpupower/debug/i386/centrino-decode.c | 113 +++
+ tools/power/cpupower/debug/i386/dump_psb.c | 196 ++++
+ tools/power/cpupower/debug/i386/intel_gsic.c | 78 ++
+ .../power/cpupower/debug/i386/powernow-k8-decode.c | 96 ++
+ tools/power/cpupower/debug/kernel/Makefile | 23 +
+ .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 113 +++
+ tools/power/cpupower/debug/x86_64/Makefile | 14 +
+ .../power/cpupower/debug/x86_64/centrino-decode.c | 1 +
+ .../cpupower/debug/x86_64/powernow-k8-decode.c | 1 +
+ tools/power/cpupower/lib/cpufreq.c | 208 +++++
+ tools/power/cpupower/lib/cpufreq.h | 223 +++++
+ tools/power/cpupower/lib/sysfs.c | 672 ++++++++++++++
+ tools/power/cpupower/lib/sysfs.h | 31 +
+ tools/power/cpupower/man/cpupower-frequency-info.1 | 76 ++
+ tools/power/cpupower/man/cpupower-frequency-set.1 | 54 ++
+ tools/power/cpupower/man/cpupower-info.1 | 19 +
+ tools/power/cpupower/man/cpupower-monitor.1 | 179 ++++
+ tools/power/cpupower/man/cpupower-set.1 | 103 +++
+ tools/power/cpupower/man/cpupower.1 | 72 ++
+ tools/power/cpupower/po/cs.po | 944 +++++++++++++++++++
+ tools/power/cpupower/po/de.po | 961 ++++++++++++++++++++
+ tools/power/cpupower/po/fr.po | 947 +++++++++++++++++++
+ tools/power/cpupower/po/it.po | 961 ++++++++++++++++++++
+ tools/power/cpupower/po/pt.po | 957 +++++++++++++++++++
+ tools/power/cpupower/utils/builtin.h | 18 +
+ tools/power/cpupower/utils/cpufreq-info.c | 678 ++++++++++++++
+ tools/power/cpupower/utils/cpufreq-set.c | 358 ++++++++
+ tools/power/cpupower/utils/cpuidle-info.c | 244 +++++
+ tools/power/cpupower/utils/cpupower-info.c | 153 ++++
+ tools/power/cpupower/utils/cpupower-set.c | 153 ++++
+ tools/power/cpupower/utils/cpupower.c | 203 ++++
+ tools/power/cpupower/utils/helpers/amd.c | 137 +++
+ tools/power/cpupower/utils/helpers/bitmask.c | 292 ++++++
+ tools/power/cpupower/utils/helpers/bitmask.h | 33 +
+ tools/power/cpupower/utils/helpers/cpuid.c | 143 +++
+ tools/power/cpupower/utils/helpers/helpers.h | 180 ++++
+ tools/power/cpupower/utils/helpers/misc.c | 35 +
+ tools/power/cpupower/utils/helpers/msr.c | 122 +++
+ tools/power/cpupower/utils/helpers/pci.c | 44 +
+ tools/power/cpupower/utils/helpers/sysfs.c | 358 ++++++++
+ tools/power/cpupower/utils/helpers/sysfs.h | 28 +
+ tools/power/cpupower/utils/helpers/topology.c | 108 +++
+ .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 338 +++++++
+ .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 196 ++++
+ .../cpupower/utils/idle_monitor/cpupower-monitor.c | 448 +++++++++
+ .../cpupower/utils/idle_monitor/cpupower-monitor.h | 68 ++
+ .../cpupower/utils/idle_monitor/idle_monitors.def | 7 +
+ .../cpupower/utils/idle_monitor/idle_monitors.h | 18 +
+ .../cpupower/utils/idle_monitor/mperf_monitor.c | 255 ++++++
+ tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 216 +++++
+ tools/power/cpupower/utils/idle_monitor/snb_idle.c | 190 ++++
+ tools/power/cpupower/utils/version-gen.sh | 35 +
+ 72 files changed, 13831 insertions(+), 1 deletions(-)
+ create mode 100644 tools/power/cpupower/.gitignore
+ create mode 100644 tools/power/cpupower/Makefile
+ create mode 100644 tools/power/cpupower/README
+ create mode 100644 tools/power/cpupower/ToDo
+ create mode 100644 tools/power/cpupower/bench/Makefile
+ create mode 100644 tools/power/cpupower/bench/README-BENCH
+ create mode 100644 tools/power/cpupower/bench/benchmark.c
+ create mode 100644 tools/power/cpupower/bench/benchmark.h
+ create mode 100644 tools/power/cpupower/bench/config.h
+ create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh
+ create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh
+ create mode 100644 tools/power/cpupower/bench/example.cfg
+ create mode 100644 tools/power/cpupower/bench/main.c
+ create mode 100644 tools/power/cpupower/bench/parse.c
+ create mode 100644 tools/power/cpupower/bench/parse.h
+ create mode 100644 tools/power/cpupower/bench/system.c
+ create mode 100644 tools/power/cpupower/bench/system.h
+ create mode 100644 tools/power/cpupower/debug/i386/Makefile
+ create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c
+ create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c
+ create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c
+ create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c
+ create mode 100644 tools/power/cpupower/debug/kernel/Makefile
+ create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
+ create mode 100644 tools/power/cpupower/debug/x86_64/Makefile
+ create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
+ create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
+ create mode 100644 tools/power/cpupower/lib/cpufreq.c
+ create mode 100644 tools/power/cpupower/lib/cpufreq.h
+ create mode 100644 tools/power/cpupower/lib/sysfs.c
+ create mode 100644 tools/power/cpupower/lib/sysfs.h
+ create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1
+ create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1
+ create mode 100644 tools/power/cpupower/man/cpupower-info.1
+ create mode 100644 tools/power/cpupower/man/cpupower-monitor.1
+ create mode 100644 tools/power/cpupower/man/cpupower-set.1
+ create mode 100644 tools/power/cpupower/man/cpupower.1
+ create mode 100644 tools/power/cpupower/po/cs.po
+ create mode 100644 tools/power/cpupower/po/de.po
+ create mode 100644 tools/power/cpupower/po/fr.po
+ create mode 100644 tools/power/cpupower/po/it.po
+ create mode 100644 tools/power/cpupower/po/pt.po
+ create mode 100644 tools/power/cpupower/utils/builtin.h
+ create mode 100644 tools/power/cpupower/utils/cpufreq-info.c
+ create mode 100644 tools/power/cpupower/utils/cpufreq-set.c
+ create mode 100644 tools/power/cpupower/utils/cpuidle-info.c
+ create mode 100644 tools/power/cpupower/utils/cpupower-info.c
+ create mode 100644 tools/power/cpupower/utils/cpupower-set.c
+ create mode 100644 tools/power/cpupower/utils/cpupower.c
+ create mode 100644 tools/power/cpupower/utils/helpers/amd.c
+ create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c
+ create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h
+ create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c
+ create mode 100644 tools/power/cpupower/utils/helpers/helpers.h
+ create mode 100644 tools/power/cpupower/utils/helpers/misc.c
+ create mode 100644 tools/power/cpupower/utils/helpers/msr.c
+ create mode 100644 tools/power/cpupower/utils/helpers/pci.c
+ create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c
+ create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h
+ create mode 100644 tools/power/cpupower/utils/helpers/topology.c
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c
+ create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c
+ create mode 100755 tools/power/cpupower/utils/version-gen.sh
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/master
+$ git merge swiotlb/master
+Merge made by recursive.
+Merging ibft/master
+$ git merge ibft/master
+Merge made by recursive.
+Merging scsi/master
+$ git merge scsi/master
+Auto-merging drivers/scsi/hpsa.c
+Merge made by recursive.
+ Documentation/scsi/ChangeLog.megaraid_sas | 8 +
+ drivers/message/fusion/mptscsih.c | 2 +-
+ drivers/scsi/bfa/bfa.h | 51 +-
+ drivers/scsi/bfa/bfa_core.c | 60 +-
+ drivers/scsi/bfa/bfa_defs.h | 171 ++++
+ drivers/scsi/bfa/bfa_defs_svc.h | 99 ++
+ drivers/scsi/bfa/bfa_fc.h | 155 +++
+ drivers/scsi/bfa/bfa_fcpim.c | 736 ++++++++++++++-
+ drivers/scsi/bfa/bfa_fcpim.h | 45 +-
+ drivers/scsi/bfa/bfa_fcs.c | 26 +
+ drivers/scsi/bfa/bfa_fcs.h | 1 +
+ drivers/scsi/bfa/bfa_fcs_fcpim.c | 37 +-
+ drivers/scsi/bfa/bfa_fcs_lport.c | 74 ++-
+ drivers/scsi/bfa/bfa_fcs_rport.c | 49 +-
+ drivers/scsi/bfa/bfa_hw_cb.c | 38 +-
+ drivers/scsi/bfa/bfa_hw_ct.c | 25 +-
+ drivers/scsi/bfa/bfa_ioc.c | 569 +++++++++++-
+ drivers/scsi/bfa/bfa_ioc.h | 48 +-
+ drivers/scsi/bfa/bfa_modules.h | 3 +
+ drivers/scsi/bfa/bfa_svc.c | 249 ++++--
+ drivers/scsi/bfa/bfa_svc.h | 29 +-
+ drivers/scsi/bfa/bfad.c | 8 +-
+ drivers/scsi/bfa/bfad_bsg.c | 1084 ++++++++++++++++++++-
+ drivers/scsi/bfa/bfad_bsg.h | 237 +++++
+ drivers/scsi/bfa/bfad_drv.h | 6 +-
+ drivers/scsi/bfa/bfad_im.c | 26 +
+ drivers/scsi/bfa/bfad_im.h | 22 +
+ drivers/scsi/bfa/bfi.h | 20 +
+ drivers/scsi/bnx2fc/bnx2fc.h | 107 ++-
+ drivers/scsi/bnx2fc/bnx2fc_debug.h | 16 +-
+ drivers/scsi/bnx2fc/bnx2fc_els.c | 434 ++++++++-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 732 +++++++--------
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 433 +++++++--
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 194 +++-
+ drivers/scsi/bnx2fc/bnx2fc_tgt.c | 51 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 82 +-
+ drivers/scsi/fcoe/fcoe.c | 69 +-
+ drivers/scsi/hpsa.c | 4 +-
+ drivers/scsi/hpsa.h | 2 +-
+ drivers/scsi/ipr.c | 12 +-
+ drivers/scsi/libfc/fc_exch.c | 9 +-
+ drivers/scsi/libfc/fc_fcp.c | 9 +-
+ drivers/scsi/libfc/fc_lport.c | 1 -
+ drivers/scsi/libsas/sas_expander.c | 3 +
+ drivers/scsi/lpfc/lpfc.h | 15 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 161 ++--
+ drivers/scsi/lpfc/lpfc_bsg.c | 89 ++-
+ drivers/scsi/lpfc/lpfc_crtn.h | 12 +
+ drivers/scsi/lpfc/lpfc_debugfs.c | 1456 ++++++++++++++++++++++++++--
+ drivers/scsi/lpfc/lpfc_debugfs.h | 125 +++-
+ drivers/scsi/lpfc/lpfc_els.c | 105 ++-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 222 ++++-
+ drivers/scsi/lpfc/lpfc_hw.h | 7 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 30 +-
+ drivers/scsi/lpfc/lpfc_init.c | 90 ++-
+ drivers/scsi/lpfc/lpfc_mbox.c | 2 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 97 +--
+ drivers/scsi/lpfc/lpfc_sli.c | 399 +++++++-
+ drivers/scsi/lpfc/lpfc_sli4.h | 29 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 6 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 18 +-
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 1 -
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +
+ drivers/scsi/mvsas/Kconfig | 9 +-
+ drivers/scsi/mvsas/mv_64xx.c | 101 ++-
+ drivers/scsi/mvsas/mv_94xx.c | 508 ++++++++--
+ drivers/scsi/mvsas/mv_94xx.h | 99 ++-
+ drivers/scsi/mvsas/mv_chips.h | 17 +-
+ drivers/scsi/mvsas/mv_defs.h | 11 +-
+ drivers/scsi/mvsas/mv_init.c | 187 +++-
+ drivers/scsi/mvsas/mv_sas.c | 422 ++++-----
+ drivers/scsi/mvsas/mv_sas.h | 105 ++-
+ drivers/scsi/pmcraid.c | 3 +
+ drivers/scsi/qla2xxx/qla_attr.c | 183 ++--
+ drivers/scsi/qla2xxx/qla_bsg.c | 441 +++++----
+ drivers/scsi/qla2xxx/qla_dbg.c | 396 ++++++--
+ drivers/scsi/qla2xxx/qla_dbg.h | 187 +---
+ drivers/scsi/qla2xxx/qla_dfs.c | 16 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 8 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 371 ++++----
+ drivers/scsi/qla2xxx/qla_init.c | 856 ++++++++--------
+ drivers/scsi/qla2xxx/qla_inline.h | 8 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 120 +--
+ drivers/scsi/qla2xxx/qla_isr.c | 663 +++++++-------
+ drivers/scsi/qla2xxx/qla_mbx.c | 1091 ++++++++++-----------
+ drivers/scsi/qla2xxx/qla_mid.c | 160 ++-
+ drivers/scsi/qla2xxx/qla_nx.c | 556 ++++++-----
+ drivers/scsi/qla2xxx/qla_os.c | 747 +++++++++------
+ drivers/scsi/qla2xxx/qla_sup.c | 275 +++---
+ drivers/scsi/scsi_lib.c | 1 +
+ drivers/scsi/scsi_transport_spi.c | 24 +
+ include/scsi/fc_frame.h | 1 -
+ 93 files changed, 11931 insertions(+), 4541 deletions(-)
+Merging iscsi-target/for-next
+$ git merge iscsi-target/for-next
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ MAINTAINERS | 1 +
+ drivers/target/iscsi/Kconfig | 1 +
+ drivers/target/iscsi/iscsi_target.c | 15 ++++++++++-----
+ drivers/target/iscsi/iscsi_target_configfs.c | 2 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 2 +-
+ drivers/target/target_core_transport.c | 2 +-
+ 6 files changed, 15 insertions(+), 8 deletions(-)
+Merging slave-dma/next
+$ git merge slave-dma/next
+Resolved 'drivers/dma/mv_xor.c' using previous resolution.
+Auto-merging drivers/dma/coh901318.c
+Auto-merging drivers/dma/dmaengine.c
+Auto-merging drivers/dma/imx-sdma.c
+Auto-merging drivers/dma/ipu/ipu_idmac.c
+Auto-merging drivers/dma/mv_xor.c
+CONFLICT (content): Merge conflict in drivers/dma/mv_xor.c
+Auto-merging drivers/dma/ste_dma40.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b7b355b] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/dmaengine.txt | 234 ++++++++++++++++++++++++++-----------
+ drivers/dma/TODO | 1 -
+ drivers/dma/amba-pl08x.c | 246 ++++++++++++++++++++-------------------
+ drivers/dma/at_hdmac.c | 4 +-
+ drivers/dma/coh901318.c | 19 ++-
+ drivers/dma/dmaengine.c | 4 +-
+ drivers/dma/ep93xx_dma.c | 2 +-
+ drivers/dma/imx-sdma.c | 4 +-
+ drivers/dma/intel_mid_dma.c | 2 -
+ drivers/dma/ipu/ipu_idmac.c | 6 +-
+ drivers/dma/mv_xor.c | 3 +-
+ drivers/dma/mxs-dma.c | 13 ++-
+ drivers/dma/pch_dma.c | 127 +++++++++++++++-----
+ drivers/dma/pl330.c | 64 ++++++-----
+ drivers/dma/ste_dma40.c | 270 +++++++++++++++++++++++++------------------
+ drivers/dma/ste_dma40_ll.h | 3 -
+ include/linux/amba/pl08x.h | 9 +-
+ 17 files changed, 612 insertions(+), 399 deletions(-)
+Merging async_tx/next
+$ git merge async_tx/next
+Auto-merging include/linux/pci_ids.h
+Merge made by recursive.
+ drivers/dma/ioat/dma_v3.c | 8 ++++----
+ drivers/dma/ioat/pci.c | 11 +++++++++++
+ include/linux/pci_ids.h | 10 ++++++++++
+ 3 files changed, 25 insertions(+), 4 deletions(-)
+Merging net/master
+$ git merge net/master
+Already up-to-date.
+Merging wireless/master
+$ git merge wireless/master
+Already up-to-date.
+Merging bluetooth/master
+$ git merge bluetooth/master
+Merge made by recursive.
+ drivers/bluetooth/ath3k.c | 1 +
+ drivers/bluetooth/btusb.c | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+Merging mtd/master
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master
+$ git merge l2-mtd/master
+Recorded preimage for 'drivers/mtd/maps/lantiq-flash.c'
+Resolved 'drivers/mtd/maps/pxa2xx-flash.c' using previous resolution.
+Auto-merging arch/arm/mach-at91/board-cap9adk.c
+Auto-merging arch/arm/mach-at91/board-sam9260ek.c
+Auto-merging arch/arm/mach-at91/board-sam9261ek.c
+Auto-merging arch/arm/mach-at91/board-sam9263ek.c
+Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
+Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
+Auto-merging arch/arm/mach-at91/board-snapper9260.c
+Auto-merging arch/arm/mach-davinci/board-da830-evm.c
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm355-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c
+Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
+Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c
+Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c
+Auto-merging arch/arm/mach-pxa/cm-x300.c
+Auto-merging arch/arm/mach-pxa/littleton.c
+Auto-merging arch/arm/mach-pxa/raumfeld.c
+Auto-merging arch/arm/mach-pxa/zylonite.c
+Auto-merging drivers/mtd/devices/sst25l.c
+Auto-merging drivers/mtd/maps/bfin-async-flash.c
+Removing drivers/mtd/maps/ceiva.c
+Removing drivers/mtd/maps/edb7312.c
+Auto-merging drivers/mtd/maps/ixp2000.c
+Auto-merging drivers/mtd/maps/lantiq-flash.c
+CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
+Auto-merging drivers/mtd/maps/pxa2xx-flash.c
+CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
+Auto-merging drivers/mtd/mtdchar.c
+Auto-merging drivers/mtd/nand/atmel_nand.c
+Auto-merging drivers/mtd/nand/bcm_umi_nand.c
+Removing drivers/mtd/nand/edb7312.c
+Auto-merging drivers/mtd/nand/fsl_elbc_nand.c
+Auto-merging drivers/mtd/nand/mpc5121_nfc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/mtd/maps/lantiq-flash.c'.
+[master 39247c6] Merge remote-tracking branch 'l2-mtd/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/mtdnand.tmpl | 5 +-
+ .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 +
+ arch/arm/mach-at91/board-afeb-9260v1.c | 9 +-
+ arch/arm/mach-at91/board-cam60.c | 9 +-
+ arch/arm/mach-at91/board-cap9adk.c | 9 +-
+ arch/arm/mach-at91/board-kb9202.c | 9 +-
+ arch/arm/mach-at91/board-neocore926.c | 9 +-
+ arch/arm/mach-at91/board-qil-a9260.c | 9 +-
+ arch/arm/mach-at91/board-rm9200dk.c | 9 +-
+ arch/arm/mach-at91/board-sam9-l9260.c | 9 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9g20ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 9 +-
+ arch/arm/mach-at91/board-snapper9260.c | 10 +-
+ arch/arm/mach-at91/board-usb-a9260.c | 9 +-
+ arch/arm/mach-at91/board-usb-a9263.c | 9 +-
+ arch/arm/mach-at91/board-yl-9200.c | 9 +-
+ arch/arm/mach-at91/include/mach/board.h | 3 +-
+ arch/arm/mach-davinci/board-da830-evm.c | 2 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 3 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
+ arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
+ arch/arm/mach-davinci/include/mach/nand.h | 4 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 23 +-
+ arch/arm/mach-mmp/aspenite.c | 5 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
+ arch/arm/mach-pxa/cm-x300.c | 5 +-
+ arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +-
+ arch/arm/mach-pxa/littleton.c | 5 +-
+ arch/arm/mach-pxa/mxm8x10.c | 9 +-
+ arch/arm/mach-pxa/raumfeld.c | 5 +-
+ arch/arm/mach-pxa/zylonite.c | 5 +-
+ arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +-
+ arch/avr32/boards/atngw100/setup.c | 8 +-
+ arch/avr32/boards/atstk1000/atstk1002.c | 9 +-
+ arch/avr32/mach-at32ap/include/mach/board.h | 3 +-
+ arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +-
+ arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +-
+ drivers/mtd/Kconfig | 16 +-
+ drivers/mtd/Makefile | 2 +-
+ drivers/mtd/afs.c | 4 +-
+ drivers/mtd/ar7part.c | 2 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 31 +-
+ drivers/mtd/chips/fwh_lock.h | 3 +-
+ drivers/mtd/chips/jedec_probe.c | 34 +-
+ drivers/mtd/cmdlinepart.c | 7 +-
+ drivers/mtd/devices/doc2000.c | 13 +-
+ drivers/mtd/devices/doc2001.c | 7 +-
+ drivers/mtd/devices/doc2001plus.c | 7 +-
+ drivers/mtd/devices/docecc.c | 2 +-
+ drivers/mtd/devices/lart.c | 18 +-
+ drivers/mtd/devices/m25p80.c | 84 +--
+ drivers/mtd/devices/mtd_dataflash.c | 91 +-
+ drivers/mtd/devices/sst25l.c | 42 +-
+ drivers/mtd/ftl.c | 40 +-
+ drivers/mtd/inftlcore.c | 59 +-
+ drivers/mtd/inftlmount.c | 116 +--
+ drivers/mtd/maps/Kconfig | 22 -
+ drivers/mtd/maps/Makefile | 2 -
+ drivers/mtd/maps/bfin-async-flash.c | 16 +-
+ drivers/mtd/maps/ceiva.c | 341 -------
+ drivers/mtd/maps/dc21285.c | 9 +-
+ drivers/mtd/maps/edb7312.c | 134 ---
+ drivers/mtd/maps/gpio-addr-flash.c | 16 +-
+ drivers/mtd/maps/h720x-flash.c | 23 +-
+ drivers/mtd/maps/impa7.c | 28 +-
+ drivers/mtd/maps/intel_vr_nor.c | 7 +-
+ drivers/mtd/maps/ixp2000.c | 11 +-
+ drivers/mtd/maps/ixp4xx.c | 29 +-
+ drivers/mtd/maps/lantiq-flash.c | 17 +-
+ drivers/mtd/maps/latch-addr-flash.c | 24 +-
+ drivers/mtd/maps/pcmciamtd.c | 124 +--
+ drivers/mtd/maps/physmap.c | 38 +-
+ drivers/mtd/maps/physmap_of.c | 80 +--
+ drivers/mtd/maps/plat-ram.c | 23 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 22 +-
+ drivers/mtd/maps/rbtx4939-flash.c | 24 +-
+ drivers/mtd/maps/sa1100-flash.c | 30 +-
+ drivers/mtd/maps/solutionengine.c | 30 +-
+ drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +-
+ drivers/mtd/mtdblock.c | 18 +-
+ drivers/mtd/mtdchar.c | 37 +-
+ drivers/mtd/mtdconcat.c | 2 +-
+ drivers/mtd/mtdcore.c | 69 +-
+ drivers/mtd/mtdcore.h | 3 +
+ drivers/mtd/mtdpart.c | 52 +-
+ drivers/mtd/mtdsuper.c | 20 +-
+ drivers/mtd/mtdswap.c | 5 +-
+ drivers/mtd/nand/Kconfig | 14 +-
+ drivers/mtd/nand/Makefile | 1 -
+ drivers/mtd/nand/atmel_nand.c | 74 +--
+ drivers/mtd/nand/au1550nd.c | 29 +-
+ drivers/mtd/nand/autcpu12.c | 4 +-
+ drivers/mtd/nand/bcm_umi_nand.c | 24 +-
+ drivers/mtd/nand/cafe_nand.c | 18 +-
+ drivers/mtd/nand/cmx270_nand.c | 23 +-
+ drivers/mtd/nand/cs553x_nand.c | 15 +-
+ drivers/mtd/nand/davinci_nand.c | 39 +-
+ drivers/mtd/nand/denali.c | 6 +-
+ drivers/mtd/nand/diskonchip.c | 6 +-
+ drivers/mtd/nand/edb7312.c | 203 ----
+ drivers/mtd/nand/fsl_elbc_nand.c | 56 +-
+ drivers/mtd/nand/fsl_upm.c | 16 +-
+ drivers/mtd/nand/fsmc_nand.c | 77 +--
+ drivers/mtd/nand/h1910.c | 19 +-
+ drivers/mtd/nand/jz4740_nand.c | 18 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 22 +-
+ drivers/mtd/nand/mxc_nand.c | 33 +-
+ drivers/mtd/nand/nand_base.c | 996 ++++++++++----------
+ drivers/mtd/nand/nand_bbt.c | 516 +++++------
+ drivers/mtd/nand/nand_bch.c | 4 +-
+ drivers/mtd/nand/nand_ecc.c | 10 +-
+ drivers/mtd/nand/nandsim.c | 4 +-
+ drivers/mtd/nand/ndfc.c | 22 +-
+ drivers/mtd/nand/nomadik_nand.c | 1 +
+ drivers/mtd/nand/nuc900_nand.c | 1 +
+ drivers/mtd/nand/omap2.c | 22 +-
+ drivers/mtd/nand/orion_nand.c | 16 +-
+ drivers/mtd/nand/pasemi_nand.c | 3 +-
+ drivers/mtd/nand/plat_nand.c | 24 +-
+ drivers/mtd/nand/ppchameleonevb.c | 47 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 471 ++++++----
+ drivers/mtd/nand/rtc_from4.c | 5 +-
+ drivers/mtd/nand/s3c2410.c | 27 +-
+ drivers/mtd/nand/sharpsl.c | 13 +-
+ drivers/mtd/nand/socrates_nand.c | 28 +-
+ drivers/mtd/nand/tmio_nand.c | 17 +-
+ drivers/mtd/nand/txx9ndfmc.c | 8 +-
+ drivers/mtd/nftlcore.c | 27 +-
+ drivers/mtd/nftlmount.c | 26 +-
+ drivers/mtd/ofpart.c | 112 +++-
+ drivers/mtd/onenand/generic.c | 14 +-
+ drivers/mtd/onenand/omap2.c | 16 +-
+ drivers/mtd/onenand/onenand_base.c | 62 +-
+ drivers/mtd/onenand/onenand_bbt.c | 6 +-
+ drivers/mtd/onenand/samsung.c | 13 +-
+ drivers/mtd/redboot.c | 13 +-
+ drivers/mtd/sm_ftl.c | 18 +-
+ drivers/mtd/ssfdc.c | 44 +-
+ drivers/mtd/tests/mtd_readtest.c | 3 +-
+ fs/jffs2/scan.c | 4 +-
+ fs/jffs2/wbuf.c | 3 +-
+ include/linux/mtd/bbm.h | 39 +-
+ include/linux/mtd/mtd.h | 38 +-
+ include/linux/mtd/nand.h | 76 +-
+ include/linux/mtd/onenand.h | 4 +
+ include/linux/mtd/partitions.h | 46 +-
+ include/linux/mtd/physmap.h | 17 -
+ 156 files changed, 2072 insertions(+), 3624 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt
+ delete mode 100644 drivers/mtd/maps/ceiva.c
+ delete mode 100644 drivers/mtd/maps/edb7312.c
+ delete mode 100644 drivers/mtd/nand/edb7312.c
+Merging crypto/master
+$ git merge crypto/master
+Already up-to-date.
+Merging sound/for-next
+$ git merge sound/for-next
+Merge made by recursive.
+ sound/core/pcm_compat.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging sound-asoc/for-next
+$ git merge sound-asoc/for-next
+Already up-to-date.
+Merging cpufreq/next
+$ git merge cpufreq/next
+Already up-to-date.
+Merging quilt/rr
+$ git merge quilt/rr
+Merge made by recursive.
+ Documentation/virtual/lguest/lguest.c | 3 +++
+ arch/x86/lguest/boot.c | 10 ++++++++++
+ drivers/lguest/core.c | 2 +-
+ 3 files changed, 14 insertions(+), 1 deletions(-)
+Merging input/next
+$ git merge input/next
+Already up-to-date.
+Merging input-mt/next
+$ git merge input-mt/next
+Already up-to-date.
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Already up-to-date!
+Merge made by recursive.
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Auto-merging drivers/md/dm-crypt.c
+Auto-merging drivers/md/dm-kcopyd.c
+Auto-merging drivers/md/dm-mpath.c
+Auto-merging drivers/md/dm-table.c
+Merge made by recursive.
+ Documentation/device-mapper/dm-crypt.txt | 21 +-
+ Documentation/device-mapper/dm-flakey.txt | 50 +-
+ Documentation/device-mapper/dm-raid.txt | 138 +-
+ Documentation/device-mapper/persistent-data.txt | 84 +
+ Documentation/device-mapper/thin-provisioning.txt | 274 +++
+ drivers/md/Kconfig | 14 +-
+ drivers/md/Makefile | 3 +
+ drivers/md/dm-crypt.c | 56 +-
+ drivers/md/dm-flakey.c | 270 +++-
+ drivers/md/dm-io.c | 29 +-
+ drivers/md/dm-ioctl.c | 89 +-
+ drivers/md/dm-kcopyd.c | 73 +-
+ drivers/md/dm-log-userspace-base.c | 3 +-
+ drivers/md/dm-log.c | 12 +-
+ drivers/md/dm-mpath.c | 147 +-
+ drivers/md/dm-raid.c | 621 +++++-
+ drivers/md/dm-snap-persistent.c | 9 +-
+ drivers/md/dm-snap.c | 84 +-
+ drivers/md/dm-table.c | 134 +-
+ drivers/md/dm-thin-metadata.c | 1370 ++++++++++++
+ drivers/md/dm-thin-metadata.h | 165 ++
+ drivers/md/dm-thin.c | 2242 ++++++++++++++++++++
+ drivers/md/dm.c | 65 +-
+ drivers/md/dm.h | 2 +
+ drivers/md/persistent-data/Kconfig | 7 +
+ drivers/md/persistent-data/Makefile | 9 +
+ drivers/md/persistent-data/dm-block-manager.c | 946 +++++++++
+ drivers/md/persistent-data/dm-block-manager.h | 127 ++
+ drivers/md/persistent-data/dm-btree-internal.h | 133 ++
+ drivers/md/persistent-data/dm-btree-remove.c | 569 +++++
+ drivers/md/persistent-data/dm-btree-spine.c | 222 ++
+ drivers/md/persistent-data/dm-btree.c | 857 ++++++++
+ drivers/md/persistent-data/dm-btree.h | 158 ++
+ .../persistent-data/dm-persistent-data-internal.h | 20 +
+ drivers/md/persistent-data/dm-space-map-common.h | 94 +
+ drivers/md/persistent-data/dm-space-map-disk.c | 662 ++++++
+ drivers/md/persistent-data/dm-space-map-disk.h | 25 +
+ drivers/md/persistent-data/dm-space-map-metadata.c | 956 +++++++++
+ drivers/md/persistent-data/dm-space-map-metadata.h | 33 +
+ drivers/md/persistent-data/dm-space-map.h | 118 +
+ .../md/persistent-data/dm-transaction-manager.c | 417 ++++
+ .../md/persistent-data/dm-transaction-manager.h | 130 ++
+ include/linux/device-mapper.h | 61 +-
+ include/linux/dm-ioctl.h | 4 +-
+ include/linux/dm-kcopyd.h | 19 +
+ 45 files changed, 11155 insertions(+), 367 deletions(-)
+ create mode 100644 Documentation/device-mapper/persistent-data.txt
+ create mode 100644 Documentation/device-mapper/thin-provisioning.txt
+ create mode 100644 drivers/md/dm-thin-metadata.c
+ create mode 100644 drivers/md/dm-thin-metadata.h
+ create mode 100644 drivers/md/dm-thin.c
+ create mode 100644 drivers/md/persistent-data/Kconfig
+ create mode 100644 drivers/md/persistent-data/Makefile
+ create mode 100644 drivers/md/persistent-data/dm-block-manager.c
+ create mode 100644 drivers/md/persistent-data/dm-block-manager.h
+ create mode 100644 drivers/md/persistent-data/dm-btree-internal.h
+ create mode 100644 drivers/md/persistent-data/dm-btree-remove.c
+ create mode 100644 drivers/md/persistent-data/dm-btree-spine.c
+ create mode 100644 drivers/md/persistent-data/dm-btree.c
+ create mode 100644 drivers/md/persistent-data/dm-btree.h
+ create mode 100644 drivers/md/persistent-data/dm-persistent-data-internal.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-common.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c
+ create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c
+ create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h
+ create mode 100644 drivers/md/persistent-data/dm-space-map.h
+ create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c
+ create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h
+Merging embedded/master
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master
+$ git merge pcmcia/master
+Already up-to-date.
+Merging battery/master
+$ git merge battery/master
+Auto-merging drivers/power/Kconfig
+Auto-merging drivers/power/Makefile
+Merge made by recursive.
+ drivers/mfd/max8998.c | 2 +
+ drivers/power/Kconfig | 14 ++
+ drivers/power/Makefile | 2 +
+ drivers/power/apm_power.c | 8 +-
+ drivers/power/bq20z75.c | 103 ++++++++++++++--
+ drivers/power/gpio-charger.c | 2 +-
+ drivers/power/max17042_battery.c | 175 +++++++++++++++----------
+ drivers/power/max8903_charger.c | 16 ++--
+ drivers/power/max8997_charger.c | 206 ++++++++++++++++++++++++++++++
+ drivers/power/max8998_charger.c | 218 ++++++++++++++++++++++++++++++++
+ drivers/power/s3c_adc_battery.c | 2 +-
+ drivers/power/twl4030_charger.c | 10 +-
+ drivers/power/wm831x_backup.c | 12 ++-
+ drivers/power/wm831x_power.c | 26 ++++-
+ include/linux/mfd/max8997.h | 7 +-
+ include/linux/mfd/max8998.h | 12 ++
+ include/linux/power/bq20z75.h | 3 +
+ include/linux/power/max17042_battery.h | 91 +++++++++++++
+ 18 files changed, 806 insertions(+), 103 deletions(-)
+ create mode 100644 drivers/power/max8997_charger.c
+ create mode 100644 drivers/power/max8998_charger.c
+Merging leds/for-mm
+$ git merge leds/for-mm
+Resolved 'drivers/leds/Kconfig' using previous resolution.
+Auto-merging drivers/leds/Kconfig
+CONFLICT (content): Merge conflict in drivers/leds/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 07f32ab] Merge remote-tracking branch 'leds/for-mm'
+$ git diff -M --stat --summary HEAD^..
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Already up-to-date.
+Merging mmc/mmc-next
+$ git merge mmc/mmc-next
+Merge made by recursive.
+ drivers/misc/cb710/core.c | 3 +-
+ drivers/mmc/card/mmc_test.c | 56 +++++++++++++++++++++------------------
+ drivers/mmc/core/host.c | 11 ++++++++
+ drivers/mmc/core/mmc.c | 2 +-
+ drivers/mmc/host/sdhci-pxav3.c | 3 +-
+ drivers/mmc/host/sdhci-s3c.c | 3 ++
+ drivers/mmc/host/sdhci.c | 3 --
+ 7 files changed, 49 insertions(+), 32 deletions(-)
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Already up-to-date.
+Merging slab/for-next
+$ git merge slab/for-next
+Auto-merging include/linux/page-flags.h
+Auto-merging mm/slub.c
+Merge made by recursive.
+ include/linux/mm_types.h | 89 ++++--
+ include/linux/page-flags.h | 5 -
+ include/linux/slub_def.h | 3 +
+ mm/slub.c | 764 +++++++++++++++++++++++++++++---------------
+ tools/slub/slabinfo.c | 59 +++--
+ 5 files changed, 616 insertions(+), 304 deletions(-)
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-next
+$ git merge mfd/for-next
+Merge made by recursive.
+ drivers/gpio/Kconfig | 6 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-tps65912.c | 156 +++++++
+ drivers/mfd/Kconfig | 53 ++-
+ drivers/mfd/Makefile | 8 +-
+ drivers/mfd/aat2870-core.c | 535 +++++++++++++++++++++
+ drivers/mfd/ab3550-core.c | 41 +--
+ drivers/mfd/ab8500-core.c | 231 +++++++---
+ drivers/mfd/ab8500-debugfs.c | 41 +--
+ drivers/mfd/jz4740-adc.c | 90 ++---
+ drivers/mfd/lpc_sch.c | 49 ++-
+ drivers/mfd/max8997-irq.c | 2 -
+ drivers/mfd/omap-usb-host.c | 4 +-
+ drivers/mfd/stmpe.c | 2 +-
+ drivers/mfd/stmpe.h | 1 +
+ drivers/mfd/tps65910.c | 13 +-
+ drivers/mfd/tps65911-comparator.c | 2 +
+ drivers/mfd/tps65912-core.c | 177 +++++++
+ drivers/mfd/tps65912-i2c.c | 139 ++++++
+ drivers/mfd/tps65912-irq.c | 224 +++++++++
+ drivers/mfd/tps65912-spi.c | 142 ++++++
+ drivers/mfd/twl-core.c | 2 +
+ drivers/mfd/twl6030-pwm.c | 2 +
+ drivers/mfd/wm831x-auxadc.c | 299 ++++++++++++
+ drivers/mfd/wm831x-core.c | 259 +++--------
+ drivers/mfd/wm831x-irq.c | 77 ++--
+ drivers/mfd/wm8350-irq.c | 18 +-
+ drivers/mfd/wm8994-core.c | 33 +-
+ drivers/mfd/wm8994-irq.c | 12 +-
+ drivers/regulator/Kconfig | 13 +
+ drivers/regulator/Makefile | 2 +
+ drivers/regulator/aat2870-regulator.c | 232 +++++++++
+ drivers/regulator/tps65912-regulator.c | 800 ++++++++++++++++++++++++++++++++
+ drivers/video/backlight/Kconfig | 7 +
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/aat2870_bl.c | 246 ++++++++++
+ include/linux/mfd/aat2870.h | 181 +++++++
+ include/linux/mfd/ab8500.h | 8 +-
+ include/linux/mfd/stmpe.h | 3 +
+ include/linux/mfd/tps65910.h | 1 +
+ include/linux/mfd/tps65912.h | 327 +++++++++++++
+ include/linux/mfd/wm831x/core.h | 119 +++++-
+ include/linux/mfd/wm831x/pdata.h | 3 +
+ 43 files changed, 4114 insertions(+), 448 deletions(-)
+ create mode 100644 drivers/gpio/gpio-tps65912.c
+ create mode 100644 drivers/mfd/aat2870-core.c
+ create mode 100644 drivers/mfd/tps65912-core.c
+ create mode 100644 drivers/mfd/tps65912-i2c.c
+ create mode 100644 drivers/mfd/tps65912-irq.c
+ create mode 100644 drivers/mfd/tps65912-spi.c
+ create mode 100644 drivers/mfd/wm831x-auxadc.c
+ create mode 100644 drivers/regulator/aat2870-regulator.c
+ create mode 100644 drivers/regulator/tps65912-regulator.c
+ create mode 100644 drivers/video/backlight/aat2870_bl.c
+ create mode 100644 include/linux/mfd/aat2870.h
+ create mode 100644 include/linux/mfd/tps65912.h
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Already up-to-date.
+Merging drm/drm-next
+$ git merge drm/drm-next
+Already up-to-date.
+Merging fbdev/master
+$ git merge fbdev/master
+Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
+Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+Auto-merging arch/powerpc/sysdev/fsl_soc.h
+Auto-merging drivers/staging/xgifb/XGI_main_26.c
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/video/backlight/adp8860_bl.c
+Auto-merging drivers/video/controlfb.c
+Auto-merging drivers/video/fb_defio.c
+Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
+Auto-merging drivers/video/platinumfb.c
+Auto-merging drivers/video/via/viafbdev.c
+Merge made by recursive.
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 22 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c | 47 +--
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 55 ++--
+ arch/powerpc/sysdev/fsl_soc.h | 25 +-
+ drivers/staging/xgifb/XGI_main_26.c | 22 +-
+ drivers/video/68328fb.c | 4 +-
+ drivers/video/Kconfig | 16 +-
+ drivers/video/Makefile | 1 +
+ drivers/video/acornfb.c | 5 +-
+ drivers/video/arkfb.c | 9 +-
+ drivers/video/atmel_lcdfb.c | 15 +-
+ drivers/video/aty/radeon_base.c | 10 +-
+ drivers/video/au1200fb.c | 297 ++++++--------
+ drivers/video/backlight/adp8860_bl.c | 1 -
+ drivers/video/backlight/adp8870_bl.c | 1 -
+ drivers/video/controlfb.c | 2 +-
+ drivers/video/da8xx-fb.c | 155 +++++++-
+ drivers/video/fb-puv3.c | 4 +-
+ drivers/video/fb_defio.c | 3 +-
+ drivers/video/fsl-diu-fb.c | 74 +++-
+ drivers/video/g364fb.c | 5 +-
+ drivers/video/grvga.c | 579 ++++++++++++++++++++++++++
+ drivers/video/gxt4500.c | 4 +-
+ drivers/video/hgafb.c | 4 +-
+ drivers/video/imsttfb.c | 2 +-
+ drivers/video/intelfb/intelfbhw.c | 6 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c | 2 +-
+ drivers/video/mx3fb.c | 6 +-
+ drivers/video/neofb.c | 4 +-
+ drivers/video/platinumfb.c | 2 +-
+ drivers/video/pm2fb.c | 6 +-
+ drivers/video/pm3fb.c | 6 +-
+ drivers/video/pxa3xx-gcu.c | 2 -
+ drivers/video/s3c-fb.c | 2 +-
+ drivers/video/s3fb.c | 9 +-
+ drivers/video/savage/savagefb_driver.c | 16 +-
+ drivers/video/sis/sis_main.c | 30 +-
+ drivers/video/skeletonfb.c | 2 +-
+ drivers/video/sm501fb.c | 6 +-
+ drivers/video/tridentfb.c | 4 +-
+ drivers/video/valkyriefb.c | 2 +-
+ drivers/video/vfb.c | 4 +-
+ drivers/video/vga16fb.c | 2 +-
+ drivers/video/via/via_modesetting.h | 5 +
+ drivers/video/via/viafbdev.c | 16 +-
+ drivers/video/vt8500lcdfb.c | 4 +-
+ drivers/video/vt8623fb.c | 9 +-
+ drivers/video/xilinxfb.c | 1 -
+ 48 files changed, 1110 insertions(+), 398 deletions(-)
+ create mode 100644 drivers/video/grvga.c
+Merging viafb/viafb-next
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging voltage/for-next
+$ git merge voltage/for-next
+Merge made by recursive.
+ drivers/regulator/core.c | 190 ++++++++++++++++++-------------
+ drivers/regulator/dummy.c | 32 +++++-
+ drivers/regulator/tps65910-regulator.c | 63 +++++++++--
+ drivers/regulator/twl-regulator.c | 66 +++++------
+ drivers/regulator/wm831x-dcdc.c | 126 +++++++++++----------
+ drivers/regulator/wm831x-ldo.c | 25 ++++-
+ drivers/regulator/wm8994-regulator.c | 4 +-
+ include/linux/regulator/consumer.h | 3 +
+ include/linux/regulator/driver.h | 4 +-
+ 9 files changed, 311 insertions(+), 202 deletions(-)
+Merging security-testing/next
+$ git merge security-testing/next
+Already up-to-date.
+Merging selinux/master
+$ git merge selinux/master
+Already up-to-date.
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging agp/agp-next
+$ git merge agp/agp-next
+Merge made by recursive.
+Merging watchdog/master
+$ git merge watchdog/master
+Already up-to-date.
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging cputime/cputime
+$ git merge cputime/cputime
+Already up-to-date.
+Merging osd/linux-next
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging nommu/master
+$ git merge nommu/master
+Already up-to-date.
+Merging trivial/for-next
+$ git merge trivial/for-next
+Auto-merging fs/eventpoll.c
+Merge made by recursive.
+ fs/eventpoll.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging audit/for-next
+$ git merge audit/for-next
+Already up-to-date.
+Merging suspend/linux-next
+$ git merge suspend/linux-next
+Already up-to-date.
+Merging apm/for-next
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next
+$ git merge fsnotify/for-next
+Auto-merging fs/cachefiles/namei.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Auto-merging fs/notify/group.c
+Auto-merging fs/notify/mark.c
+Auto-merging include/linux/fsnotify_backend.h
+Merge made by recursive.
+ fs/cachefiles/namei.c | 1 -
+ fs/cachefiles/xattr.c | 1 -
+ fs/nfsd/vfs.c | 3 -
+ fs/notify/dnotify/dnotify.c | 15 +++---
+ fs/notify/fanotify/fanotify.c | 24 +++++----
+ fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
+ fs/notify/group.c | 1 +
+ fs/notify/mark.c | 36 +++++--------
+ include/linux/fanotify.h | 5 ++-
+ include/linux/fsnotify_backend.h | 14 ++++-
+ 10 files changed, 121 insertions(+), 80 deletions(-)
+Merging irda/for-next
+$ git merge irda/for-next
+Already up-to-date.
+Merging i7core_edac/linux_next
+$ git merge i7core_edac/linux_next
+Auto-merging drivers/edac/i7core_edac.c
+Merge made by recursive.
+ drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++---
+ 1 files changed, 20 insertions(+), 3 deletions(-)
+Merging i7300_edac/linux_next
+$ git merge i7300_edac/linux_next
+Already up-to-date!
+Merge made by recursive.
+Merging devicetree/devicetree/next
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging spi/spi/next
+$ git merge spi/spi/next
+Already up-to-date.
+Merging gpio/gpio/next
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging tip/auto-latest
+$ git merge tip/auto-latest
+Already up-to-date!
+Merge made by recursive.
+Merging rcu/rcu/next
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging kvm/linux-next
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging oprofile/for-next
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging ptrace/ptrace
+$ git merge ptrace/ptrace
+Already up-to-date.
+Merging xen/upstream/xen
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next
+$ git merge xen-two/linux-next
+Merge made by recursive.
+ drivers/xen/grant-table.c | 2 +-
+ drivers/xen/xen-pciback/xenbus.c | 1 -
+ drivers/xen/xen-selfballoon.c | 4 ++--
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+Merging xen-pvhvm/linux-next
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging edac-amd/for-next
+$ git merge edac-amd/for-next
+Already up-to-date.
+Merging percpu/for-next
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging sfi/sfi-test
+$ git merge sfi/sfi-test
+Already up-to-date.
+Merging asm-generic/next
+$ git merge asm-generic/next
+Already up-to-date.
+Merging drivers-x86/linux-next
+$ git merge drivers-x86/linux-next
+Recorded preimage for 'Documentation/feature-removal-schedule.txt'
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Auto-merging drivers/platform/x86/acer-wmi.c
+Auto-merging drivers/platform/x86/asus-wmi.c
+Auto-merging drivers/platform/x86/dell-laptop.c
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Auto-merging include/linux/input.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'Documentation/feature-removal-schedule.txt'.
+[master 18ed37d] Merge remote-tracking branch 'drivers-x86/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-platform-ideapad-laptop | 17 ++
+ Documentation/feature-removal-schedule.txt | 13 +
+ drivers/platform/x86/Kconfig | 8 +
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/acer-wmi.c | 12 +-
+ drivers/platform/x86/acerhdf.c | 1 +
+ drivers/platform/x86/asus-laptop.c | 9 +-
+ drivers/platform/x86/asus-nb-wmi.c | 27 ++-
+ drivers/platform/x86/asus-wmi.c | 239 +++++++++++++++++---
+ drivers/platform/x86/asus-wmi.h | 7 +
+ drivers/platform/x86/dell-laptop.c | 1 -
+ drivers/platform/x86/eeepc-wmi.c | 27 +++
+ drivers/platform/x86/ideapad-laptop.c | 192 ++++++++++++++--
+ drivers/platform/x86/intel_menlow.c | 2 +
+ drivers/platform/x86/intel_mid_thermal.c | 26 ++-
+ drivers/platform/x86/intel_rar_register.c | 4 +-
+ drivers/platform/x86/intel_scu_ipc.c | 2 +-
+ drivers/platform/x86/msi-laptop.c | 10 +
+ drivers/platform/x86/msi-wmi.c | 1 +
+ drivers/platform/x86/samsung-laptop.c | 10 +
+ drivers/platform/x86/samsung-q10.c | 196 ++++++++++++++++
+ drivers/platform/x86/thinkpad_acpi.c | 11 +-
+ include/linux/input.h | 2 +
+ 23 files changed, 745 insertions(+), 73 deletions(-)
+ create mode 100644 drivers/platform/x86/samsung-q10.c
+Merging hwpoison/hwpoison
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master
+$ git merge sysctl/master
+Auto-merging fs/proc/proc_sysctl.c
+Merge made by recursive.
+ fs/proc/proc_sysctl.c | 14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
+Merging namespace/master
+$ git merge namespace/master
+Auto-merging fs/proc/inode.c
+Merge made by recursive.
+ fs/proc/inode.c | 6 +-
+ fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 142 insertions(+), 24 deletions(-)
+Merging regmap/for-next
+$ git merge regmap/for-next
+Merge made by recursive.
+ drivers/base/regmap/regmap.c | 2 +-
+ include/linux/regmap.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+Merging driver-core/driver-core-next
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next
+$ git merge staging/staging-next
+Already up-to-date.
+Merging bkl-config/config
+$ git merge bkl-config/config
+Already up-to-date.
+Merging tmem/linux-next
+$ git merge tmem/linux-next
+Auto-merging include/linux/swap.h
+Auto-merging mm/Kconfig
+Auto-merging mm/swapfile.c
+Merge made by recursive.
+ .../ABI/testing/sysfs-kernel-mm-frontswap | 16 +
+ Documentation/vm/frontswap.txt | 210 ++++++++++++
+ include/linux/frontswap.h | 92 ++++++
+ include/linux/swap.h | 2 +
+ include/linux/swapfile.h | 13 +
+ mm/Kconfig | 17 +
+ mm/Makefile | 1 +
+ mm/frontswap.c | 335 ++++++++++++++++++++
+ mm/page_io.c | 12 +
+ mm/swapfile.c | 65 +++-
+ 10 files changed, 751 insertions(+), 12 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
+ create mode 100644 Documentation/vm/frontswap.txt
+ create mode 100644 include/linux/frontswap.h
+ create mode 100644 include/linux/swapfile.h
+ create mode 100644 mm/frontswap.c
+Merging writeback/next
+$ git merge writeback/next
+Already up-to-date.
+Merging arm-dt/devicetree/arm-next
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging scsi-post-merge/merge-base:master
+Merging moduleh/module.h-split
+$ git merge moduleh/module.h-split
+Recorded preimage for 'sound/i2c/other/tea575x-tuner.c'
+Auto-merging arch/arm/kernel/bios32.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/mips/kernel/traps.c
+Auto-merging arch/sparc/kernel/cpu.c
+Auto-merging arch/sparc/kernel/cpumap.c
+Auto-merging arch/sparc/kernel/hvapi.c
+Auto-merging arch/sparc/kernel/leon_pci_grpci2.c
+Auto-merging arch/sparc/kernel/pcr.c
+Auto-merging drivers/acpi/ec_sys.c
+Auto-merging drivers/acpi/sysfs.c
+Auto-merging drivers/dma/intel_mid_dma.c
+Auto-merging drivers/input/keyboard/tnetv107x-keypad.c
+Auto-merging drivers/input/touchscreen/ads7846.c
+Auto-merging drivers/md/dm-log-userspace-base.c
+Auto-merging drivers/md/dm-raid.c
+Auto-merging drivers/md/dm-snap-persistent.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/media/common/tuners/tuner-types.c
+Auto-merging drivers/media/radio/radio-timb.c
+Auto-merging drivers/media/radio/radio-wl1273.c
+Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c
+Auto-merging drivers/media/rc/ir-lirc-codec.c
+Auto-merging drivers/media/rc/ir-raw.c
+Auto-merging drivers/media/rc/keymaps/rc-rc6-mce.c
+Auto-merging drivers/media/rc/rc-main.c
+Auto-merging drivers/media/video/m5mols/m5mols_core.c
+Auto-merging drivers/media/video/mt9m001.c
+Auto-merging drivers/media/video/mt9m111.c
+Auto-merging drivers/media/video/mt9t031.c
+Auto-merging drivers/media/video/mt9v011.c
+Auto-merging drivers/media/video/mt9v022.c
+Auto-merging drivers/media/video/mt9v032.c
+Auto-merging drivers/media/video/omap24xxcam.c
+Auto-merging drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+Auto-merging drivers/media/video/rj54n1cb0c.c
+Auto-merging drivers/media/video/sh_mobile_csi2.c
+Auto-merging drivers/media/video/sh_vou.c
+Auto-merging drivers/media/video/sr030pc30.c
+Auto-merging drivers/media/video/timblogiw.c
+Auto-merging drivers/media/video/v4l2-ctrls.c
+Auto-merging drivers/media/video/v4l2-device.c
+Auto-merging drivers/media/video/v4l2-event.c
+Auto-merging drivers/media/video/v4l2-fh.c
+Auto-merging drivers/media/video/v4l2-subdev.c
+Auto-merging drivers/mfd/ab3550-core.c
+Auto-merging drivers/mfd/ab8500-debugfs.c
+Auto-merging drivers/mfd/twl-core.c
+Auto-merging drivers/mmc/card/mmc_test.c
+Auto-merging drivers/mmc/core/host.c
+Auto-merging drivers/mmc/core/mmc.c
+Auto-merging drivers/mmc/host/sdhci.c
+Auto-merging drivers/mtd/ar7part.c
+Auto-merging drivers/mtd/cmdlinepart.c
+Auto-merging drivers/mtd/mtdsuper.c
+Auto-merging drivers/mtd/nand/cafe_nand.c
+Auto-merging drivers/mtd/nand/diskonchip.c
+Auto-merging drivers/mtd/nand/nand_bbt.c
+Auto-merging drivers/mtd/onenand/onenand_bbt.c
+Auto-merging drivers/mtd/redboot.c
+Auto-merging drivers/pci/setup-res.c
+Auto-merging drivers/platform/x86/intel_scu_ipc.c
+Auto-merging drivers/platform/x86/msi-wmi.c
+Auto-merging drivers/power/max17042_battery.c
+Auto-merging drivers/power/max8903_charger.c
+Auto-merging drivers/regulator/dummy.c
+Auto-merging drivers/scsi/bfa/bfad_im.c
+Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c
+Auto-merging drivers/scsi/libfc/fc_exch.c
+Auto-merging drivers/scsi/libfc/fc_lport.c
+Auto-merging drivers/scsi/lpfc/lpfc_attr.c
+Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/video/carminefb.c
+Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
+Auto-merging drivers/xen/xen-selfballoon.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging include/linux/mtd/mtd.h
+Auto-merging include/linux/regulator/driver.h
+Auto-merging kernel/compat.c
+Auto-merging kernel/resource.c
+Auto-merging kernel/signal.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/swapfile.c
+Auto-merging sound/i2c/other/tea575x-tuner.c
+CONFLICT (content): Merge conflict in sound/i2c/other/tea575x-tuner.c
+Auto-merging sound/pci/asihpi/hpioctl.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'sound/i2c/other/tea575x-tuner.c'.
+[master eaa427a] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/kernel/armksyms.c | 2 +-
+ arch/arm/kernel/bios32.c | 2 +-
+ arch/arm/kernel/devtree.c | 2 +-
+ arch/arm/kernel/elf.c | 2 +-
+ arch/arm/kernel/io.c | 2 +-
+ arch/arm/kernel/irq.c | 1 -
+ arch/arm/kernel/leds.c | 3 +-
+ arch/arm/kernel/perf_event.c | 2 +-
+ arch/arm/kernel/pj4-cp0.c | 1 -
+ arch/arm/kernel/process.c | 2 +-
+ arch/arm/kernel/ptrace.c | 1 +
+ arch/arm/kernel/return_address.c | 2 +-
+ arch/arm/kernel/setup.c | 2 +-
+ arch/arm/kernel/stacktrace.c | 2 +-
+ arch/arm/kernel/sys_arm.c | 2 +-
+ arch/arm/kernel/time.c | 2 +-
+ arch/arm/kernel/unwind.c | 2 +-
+ arch/arm/kernel/xscale-cp0.c | 1 -
+ arch/arm/mm/fault-armv.c | 1 -
+ arch/arm/mm/init.c | 1 +
+ arch/arm/vfp/vfpmodule.c | 1 -
+ arch/mips/kernel/8250-platform.c | 1 -
+ arch/mips/kernel/cpu-probe.c | 3 +-
+ arch/mips/kernel/i8253.c | 2 +-
+ arch/mips/kernel/init_task.c | 2 +-
+ arch/mips/kernel/irq-msc01.c | 1 -
+ arch/mips/kernel/irq.c | 1 -
+ arch/mips/kernel/mips-mt.c | 2 +-
+ arch/mips/kernel/mips_ksyms.c | 2 +-
+ arch/mips/kernel/module.c | 1 -
+ arch/mips/kernel/process.c | 2 +-
+ arch/mips/kernel/prom.c | 2 +-
+ arch/mips/kernel/reset.c | 2 +-
+ arch/mips/kernel/rtlx.c | 1 -
+ arch/mips/kernel/setup.c | 2 +-
+ arch/mips/kernel/spinlock_test.c | 2 +-
+ arch/mips/kernel/stacktrace.c | 2 +-
+ arch/mips/kernel/time.c | 2 +-
+ arch/mips/kernel/traps.c | 1 -
+ arch/mips/kernel/unaligned.c | 1 -
+ arch/mips/kernel/vpe.c | 1 -
+ arch/powerpc/include/asm/lv1call.h | 1 +
+ arch/powerpc/include/asm/spu.h | 1 +
+ arch/powerpc/kernel/btext.c | 2 +-
+ arch/powerpc/kernel/clock.c | 2 +-
+ arch/powerpc/kernel/cputable.c | 2 +-
+ arch/powerpc/kernel/crash.c | 1 +
+ arch/powerpc/kernel/dma-iommu.c | 1 +
+ arch/powerpc/kernel/dma.c | 1 +
+ arch/powerpc/kernel/firmware.c | 3 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 1 -
+ arch/powerpc/kernel/ibmebus.c | 2 +
+ arch/powerpc/kernel/init_task.c | 2 +-
+ arch/powerpc/kernel/io-workarounds.c | 1 +
+ arch/powerpc/kernel/io.c | 2 +-
+ arch/powerpc/kernel/irq.c | 2 +-
+ arch/powerpc/kernel/isa-bridge.c | 1 +
+ arch/powerpc/kernel/kvm.c | 1 +
+ arch/powerpc/kernel/module.c | 1 -
+ arch/powerpc/kernel/of_platform.c | 2 +-
+ arch/powerpc/kernel/paca.c | 2 +-
+ arch/powerpc/kernel/pci-common.c | 1 +
+ arch/powerpc/kernel/pci_64.c | 1 +
+ arch/powerpc/kernel/pci_dn.c | 1 +
+ arch/powerpc/kernel/pci_of_scan.c | 1 +
+ arch/powerpc/kernel/pmc.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 2 +-
+ arch/powerpc/kernel/process.c | 2 +-
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kernel/prom_parse.c | 1 -
+ arch/powerpc/kernel/ptrace.c | 1 -
+ arch/powerpc/kernel/rtas.c | 2 +-
+ arch/powerpc/kernel/setup-common.c | 2 +-
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/powerpc/kernel/signal_64.c | 1 -
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kernel/stacktrace.c | 2 +-
+ arch/powerpc/kernel/swsusp_64.c | 1 +
+ arch/powerpc/kernel/sysfs.c | 2 +-
+ arch/powerpc/kernel/time.c | 2 +-
+ arch/powerpc/kernel/vdso.c | 1 -
+ arch/powerpc/kernel/vio.c | 3 +-
+ arch/powerpc/kvm/book3s.c | 1 +
+ arch/powerpc/kvm/book3s_exports.c | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 1 +
+ arch/powerpc/kvm/book3s_hv_builtin.c | 1 +
+ arch/powerpc/kvm/powerpc.c | 1 -
+ arch/powerpc/lib/checksum_wrappers_64.c | 2 +-
+ arch/powerpc/lib/devres.c | 2 +-
+ arch/powerpc/lib/locks.c | 2 +-
+ arch/powerpc/lib/rheap.c | 2 +-
+ arch/powerpc/mm/hash_utils_64.c | 1 +
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/powerpc/mm/mmu_context_hash64.c | 2 +-
+ arch/powerpc/mm/numa.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 1 +
+ arch/powerpc/mm/slice.c | 2 +-
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
+ arch/powerpc/platforms/85xx/sbc8548.c | 1 -
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 -
+ arch/powerpc/platforms/cell/axon_msi.c | 1 +
+ arch/powerpc/platforms/cell/beat.c | 2 +-
+ arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 -
+ arch/powerpc/platforms/cell/beat_wrapper.h | 1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 +
+ arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 +
+ arch/powerpc/platforms/cell/cbe_regs.c | 2 +-
+ arch/powerpc/platforms/cell/celleb_setup.c | 1 +
+ arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 +
+ arch/powerpc/platforms/cell/interrupt.c | 2 +-
+ arch/powerpc/platforms/cell/pmu.c | 1 +
+ arch/powerpc/platforms/cell/qpace_setup.c | 1 +
+ arch/powerpc/platforms/cell/setup.c | 1 +
+ arch/powerpc/platforms/cell/smp.c | 1 -
+ arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
+ arch/powerpc/platforms/cell/spu_fault.c | 2 +-
+ arch/powerpc/platforms/cell/spu_manage.c | 2 +-
+ arch/powerpc/platforms/cell/spu_notify.c | 3 +-
+ arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 -
+ arch/powerpc/platforms/cell/spu_syscalls.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 -
+ arch/powerpc/platforms/cell/spufs/context.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/coredump.c | 1 -
+ arch/powerpc/platforms/cell/spufs/fault.c | 1 -
+ arch/powerpc/platforms/cell/spufs/file.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 -
+ arch/powerpc/platforms/cell/spufs/sched.c | 1 -
+ arch/powerpc/platforms/cell/spufs/switch.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
+ arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +-
+ arch/powerpc/platforms/iseries/iommu.c | 2 +-
+ arch/powerpc/platforms/iseries/ksyms.c | 2 +-
+ arch/powerpc/platforms/iseries/lpardata.c | 1 -
+ arch/powerpc/platforms/iseries/lpevents.c | 2 +-
+ arch/powerpc/platforms/iseries/mf.c | 1 +
+ arch/powerpc/platforms/iseries/pci.c | 1 -
+ arch/powerpc/platforms/iseries/setup.c | 1 +
+ arch/powerpc/platforms/iseries/smp.c | 1 -
+ arch/powerpc/platforms/iseries/vio.c | 2 +-
+ arch/powerpc/platforms/iseries/viopath.c | 2 +-
+ arch/powerpc/platforms/maple/setup.c | 1 +
+ arch/powerpc/platforms/pasemi/cpufreq.c | 1 +
+ arch/powerpc/platforms/pasemi/dma_lib.c | 3 +-
+ arch/powerpc/platforms/pasemi/setup.c | 1 +
+ arch/powerpc/platforms/powermac/feature.c | 1 +
+ arch/powerpc/platforms/powermac/low_i2c.c | 2 +-
+ arch/powerpc/platforms/powermac/nvram.c | 2 +-
+ arch/powerpc/platforms/powermac/pic.c | 1 -
+ arch/powerpc/platforms/powermac/setup.c | 1 +
+ arch/powerpc/platforms/ps3/exports.c | 2 -
+ arch/powerpc/platforms/ps3/interrupt.c | 2 +-
+ arch/powerpc/platforms/ps3/mm.c | 2 +-
+ arch/powerpc/platforms/ps3/os-area.c | 1 +
+ arch/powerpc/platforms/ps3/setup.c | 1 +
+ arch/powerpc/platforms/ps3/spu.c | 1 +
+ arch/powerpc/platforms/ps3/system-bus.c | 2 +-
+ arch/powerpc/platforms/pseries/eeh.c | 2 +
+ arch/powerpc/platforms/pseries/eeh_event.c | 1 +
+ arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 +
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 +
+ arch/powerpc/platforms/pseries/hvconsole.c | 3 +-
+ arch/powerpc/platforms/pseries/io_event_irq.c | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 1 +
+ arch/powerpc/platforms/pseries/lpar.c | 1 +
+ arch/powerpc/platforms/pseries/mobility.c | 1 +
+ arch/powerpc/platforms/pseries/pci_dlpar.c | 1 +
+ arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 +
+ arch/powerpc/platforms/pseries/setup.c | 2 +-
+ arch/powerpc/platforms/pseries/smp.c | 1 -
+ arch/powerpc/platforms/pseries/suspend.c | 1 +
+ arch/powerpc/sysdev/bestcomm/sram.c | 2 +-
+ arch/powerpc/sysdev/dcr.c | 1 +
+ arch/powerpc/sysdev/fsl_lbc.c | 3 +-
+ arch/powerpc/sysdev/fsl_rio.c | 2 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +-
+ arch/powerpc/sysdev/mpc8xx_pic.c | 1 -
+ arch/powerpc/sysdev/pmi.c | 1 +
+ arch/powerpc/sysdev/qe_lib/ucc.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +-
+ arch/powerpc/sysdev/rtc_cmos_setup.c | 1 +
+ arch/powerpc/sysdev/simple_gpio.c | 1 -
+ arch/powerpc/sysdev/tsi108_dev.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 2 +-
+ arch/sparc/include/asm/termios.h | 1 -
+ arch/sparc/kernel/btext.c | 1 -
+ arch/sparc/kernel/central.c | 1 +
+ arch/sparc/kernel/cpu.c | 2 +-
+ arch/sparc/kernel/cpumap.c | 2 +-
+ arch/sparc/kernel/dma.c | 1 -
+ arch/sparc/kernel/ebus.c | 2 +-
+ arch/sparc/kernel/hvapi.c | 2 +-
+ arch/sparc/kernel/idprom.c | 2 +-
+ arch/sparc/kernel/iommu.c | 2 +-
+ arch/sparc/kernel/irq_64.c | 1 -
+ arch/sparc/kernel/ldc.c | 2 +-
+ arch/sparc/kernel/leon_kernel.c | 1 -
+ arch/sparc/kernel/leon_pci_grpci2.c | 1 -
+ arch/sparc/kernel/nmi.c | 2 +-
+ arch/sparc/kernel/of_device_32.c | 1 -
+ arch/sparc/kernel/of_device_64.c | 2 +-
+ arch/sparc/kernel/of_device_common.c | 2 +-
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/kernel/pci_fire.c | 1 +
+ arch/sparc/kernel/pci_psycho.c | 1 +
+ arch/sparc/kernel/pci_sabre.c | 1 +
+ arch/sparc/kernel/pci_schizo.c | 1 +
+ arch/sparc/kernel/pci_sun4v.c | 1 +
+ arch/sparc/kernel/pcr.c | 2 +-
+ arch/sparc/kernel/power.c | 2 +-
+ arch/sparc/kernel/process_64.c | 2 +-
+ arch/sparc/kernel/prom_32.c | 1 -
+ arch/sparc/kernel/prom_64.c | 1 -
+ arch/sparc/kernel/prom_common.c | 2 +-
+ arch/sparc/kernel/reboot.c | 2 +-
+ arch/sparc/kernel/sbus.c | 1 +
+ arch/sparc/kernel/setup_64.c | 1 +
+ arch/sparc/kernel/smp_64.c | 2 +-
+ arch/sparc/kernel/sparc_ksyms_64.c | 2 +-
+ arch/sparc/kernel/stacktrace.c | 2 +-
+ arch/sparc/kernel/sys_sparc32.c | 1 -
+ arch/sparc/kernel/sys_sparc_64.c | 2 +-
+ arch/sparc/kernel/time_64.c | 2 +-
+ arch/sparc/kernel/unaligned_32.c | 1 -
+ arch/sparc/kernel/vio.c | 1 +
+ arch/sparc/kernel/viohs.c | 2 +-
+ arch/sparc/mm/extable.c | 1 -
+ arch/sparc/mm/fault_32.c | 1 -
+ arch/sparc/mm/generic_64.c | 1 +
+ arch/sparc/mm/hugetlbpage.c | 1 -
+ arch/x86/crypto/aes_glue.c | 1 +
+ arch/x86/crypto/aesni-intel_glue.c | 1 +
+ arch/x86/kernel/cpu/amd.c | 1 +
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 +
+ arch/x86/kernel/hpet.c | 1 +
+ arch/x86/kernel/irq.c | 1 +
+ arch/x86/kernel/probe_roms.c | 4 +-
+ arch/x86/kernel/smp.c | 1 +
+ arch/x86/kernel/time.c | 1 +
+ arch/x86/kernel/topology.c | 1 +
+ arch/x86/kernel/vsyscall_64.c | 1 +
+ arch/x86/pci/i386.c | 1 +
+ arch/x86/pci/legacy.c | 1 +
+ arch/x86/platform/efi/efi.c | 1 +
+ arch/x86/platform/efi/efi_32.c | 1 +
+ arch/x86/platform/mrst/vrtc.c | 1 +
+ arch/x86/platform/uv/bios_uv.c | 1 +
+ arch/x86/power/cpu.c | 1 +
+ arch/x86/video/fbdev.c | 1 +
+ block/blk-integrity.c | 1 +
+ block/ioctl.c | 1 +
+ crypto/async_tx/async_memcpy.c | 1 +
+ crypto/async_tx/async_pq.c | 1 +
+ crypto/async_tx/async_raid6_recov.c | 1 +
+ crypto/async_tx/async_tx.c | 1 +
+ crypto/async_tx/async_xor.c | 1 +
+ crypto/async_tx/raid6test.c | 1 +
+ crypto/crypto_wq.c | 1 +
+ crypto/md4.c | 1 +
+ crypto/proc.c | 1 +
+ crypto/vmac.c | 1 +
+ crypto/xcbc.c | 1 +
+ drivers/acpi/acpica/hwsleep.c | 1 +
+ drivers/acpi/ec_sys.c | 1 +
+ drivers/acpi/sbshc.c | 1 +
+ drivers/acpi/sysfs.c | 2 +-
+ drivers/ata/libata-eh.c | 1 +
+ drivers/ata/libata-pmp.c | 1 +
+ drivers/ata/libata-scsi.c | 1 +
+ drivers/ata/libata-sff.c | 1 +
+ drivers/base/base.h | 1 +
+ drivers/base/dma-coherent.c | 1 +
+ drivers/base/dma-mapping.c | 1 +
+ drivers/base/hypervisor.c | 1 +
+ drivers/base/power/generic_ops.c | 1 +
+ drivers/base/power/main.c | 1 +
+ drivers/base/power/runtime.c | 1 +
+ drivers/base/power/sysfs.c | 1 +
+ drivers/base/power/trace.c | 1 +
+ drivers/base/power/wakeup.c | 1 +
+ drivers/base/transport_class.c | 1 +
+ drivers/bcma/core.c | 1 +
+ drivers/bcma/driver_chipcommon.c | 1 +
+ drivers/bcma/driver_pci.c | 1 +
+ drivers/bcma/host_pci.c | 1 +
+ drivers/bcma/main.c | 1 +
+ drivers/block/aoe/aoechr.c | 1 +
+ drivers/block/ps3disk.c | 1 +
+ drivers/block/ps3vram.c | 1 +
+ drivers/block/virtio_blk.c | 1 +
+ drivers/char/hw_random/virtio-rng.c | 1 +
+ drivers/char/ramoops.c | 1 +
+ drivers/char/ttyprintk.c | 1 +
+ drivers/char/virtio_console.c | 1 +
+ drivers/clocksource/sh_cmt.c | 1 +
+ drivers/clocksource/sh_mtu2.c | 1 +
+ drivers/clocksource/sh_tmu.c | 1 +
+ drivers/cpufreq/cpufreq_stats.c | 1 +
+ drivers/dca/dca-core.c | 1 +
+ drivers/dca/dca-sysfs.c | 1 +
+ drivers/dma/intel_mid_dma.c | 1 +
+ drivers/edac/mce_amd_inj.c | 1 +
+ drivers/firewire/core-iso.c | 1 +
+ drivers/firmware/google/gsmi.c | 1 +
+ drivers/firmware/sigma.c | 1 +
+ drivers/gpio/gpio-74x164.c | 1 +
+ drivers/gpio/gpio-mc33880.c | 1 +
+ drivers/gpio/gpio-mcp23s08.c | 1 +
+ drivers/gpio/gpio-ml-ioh.c | 1 +
+ drivers/gpio/gpio-pcf857x.c | 1 +
+ drivers/gpio/gpio-pch.c | 1 +
+ drivers/gpio/gpio-xilinx.c | 1 +
+ drivers/gpu/drm/ttm/ttm_tt.c | 1 +
+ drivers/hid/hid-axff.c | 1 +
+ drivers/hid/hid-debug.c | 1 +
+ drivers/hid/hid-dr.c | 1 +
+ drivers/hid/hid-emsff.c | 1 +
+ drivers/hid/hid-gaff.c | 1 +
+ drivers/hid/hid-holtekff.c | 1 +
+ drivers/hid/hid-picolcd.c | 1 +
+ drivers/hid/hid-pl.c | 1 +
+ drivers/hid/hid-roccat-common.c | 1 +
+ drivers/hid/hid-roccat.c | 1 +
+ drivers/hid/hid-sjoy.c | 1 +
+ drivers/hid/hid-tmff.c | 1 +
+ drivers/hid/hid-zpff.c | 1 +
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ drivers/hwmon/ultra45_env.c | 1 +
+ drivers/i2c/i2c-boardinfo.c | 1 +
+ drivers/ide/cmd640.c | 1 +
+ drivers/ide/ide-acpi.c | 1 +
+ drivers/ide/ide-atapi.c | 1 +
+ drivers/ide/ide-disk_proc.c | 1 +
+ drivers/ide/ide-dma-sff.c | 1 +
+ drivers/ide/ide-dma.c | 1 +
+ drivers/ide/ide-eh.c | 1 +
+ drivers/ide/ide-floppy_proc.c | 1 +
+ drivers/ide/ide-io-std.c | 1 +
+ drivers/ide/ide-ioctls.c | 1 +
+ drivers/ide/ide-legacy.c | 1 +
+ drivers/ide/ide-lib.c | 1 +
+ drivers/ide/ide-pnp.c | 1 +
+ drivers/ide/ide-taskfile.c | 1 +
+ drivers/ide/ide-xfer-mode.c | 1 +
+ drivers/ide/pmac.c | 1 +
+ drivers/ide/setup-pci.c | 1 +
+ drivers/ide/tc86c001.c | 1 +
+ drivers/idle/intel_idle.c | 1 +
+ drivers/infiniband/core/cm.c | 1 +
+ drivers/infiniband/core/fmr_pool.c | 1 +
+ drivers/infiniband/core/mad.c | 1 +
+ drivers/infiniband/core/multicast.c | 1 +
+ drivers/infiniband/core/packer.c | 1 +
+ drivers/infiniband/core/sysfs.c | 1 +
+ drivers/infiniband/core/ud_header.c | 1 +
+ drivers/infiniband/core/umem.c | 1 +
+ drivers/infiniband/core/uverbs_marshall.c | 1 +
+ drivers/infiniband/core/verbs.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_diag.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 +
+ drivers/infiniband/hw/ipath/ipath_verbs.c | 1 +
+ drivers/infiniband/hw/mthca/mthca_catas.c | 1 +
+ drivers/infiniband/hw/mthca/mthca_cmd.c | 1 +
+ drivers/infiniband/hw/mthca/mthca_provider.c | 2 +
+ drivers/infiniband/hw/qib/qib_diag.c | 1 +
+ drivers/infiniband/hw/qib/qib_file_ops.c | 1 +
+ drivers/infiniband/hw/qib/qib_iba7220.c | 1 +
+ drivers/infiniband/hw/qib/qib_iba7322.c | 1 +
+ drivers/infiniband/hw/qib/qib_pcie.c | 1 +
+ drivers/infiniband/hw/qib/qib_sd7220.c | 1 +
+ drivers/infiniband/hw/qib/qib_verbs.c | 1 +
+ drivers/input/input-compat.c | 1 +
+ drivers/input/input-mt.c | 1 +
+ drivers/input/input-polldev.c | 1 +
+ drivers/input/joystick/as5011.c | 1 +
+ drivers/input/keyboard/tnetv107x-keypad.c | 1 +
+ drivers/input/misc/ad714x.c | 1 +
+ drivers/input/misc/adxl34x.c | 1 +
+ drivers/input/misc/ati_remote2.c | 1 +
+ drivers/input/misc/cma3000_d0x.c | 1 +
+ drivers/input/misc/dm355evm_keys.c | 1 +
+ drivers/input/sparse-keymap.c | 1 +
+ drivers/input/touchscreen/ad7877.c | 1 +
+ drivers/input/touchscreen/ad7879-spi.c | 1 +
+ drivers/input/touchscreen/ad7879.c | 1 +
+ drivers/input/touchscreen/ads7846.c | 1 +
+ drivers/input/touchscreen/bu21013_ts.c | 1 +
+ drivers/isdn/capi/kcapi_proc.c | 1 +
+ drivers/leds/dell-led.c | 1 +
+ drivers/leds/leds-88pm860x.c | 1 +
+ drivers/leds/leds-asic3.c | 1 +
+ drivers/leds/leds-atmel-pwm.c | 1 +
+ drivers/leds/leds-cobalt-raq.c | 1 +
+ drivers/leds/leds-gpio.c | 1 +
+ drivers/leds/leds-lm3530.c | 1 +
+ drivers/leds/leds-lt3593.c | 1 +
+ drivers/leds/leds-net48xx.c | 1 +
+ drivers/leds/leds-net5501.c | 1 +
+ drivers/leds/leds-wm831x-status.c | 1 +
+ drivers/leds/leds-wm8350.c | 1 +
+ drivers/leds/leds-wrap.c | 1 +
+ drivers/lguest/lguest_device.c | 1 +
+ drivers/md/dm-exception-store.c | 1 +
+ drivers/md/dm-log-userspace-base.c | 1 +
+ drivers/md/dm-path-selector.c | 1 +
+ drivers/md/dm-raid.c | 1 +
+ drivers/md/dm-round-robin.c | 1 +
+ drivers/md/dm-service-time.c | 1 +
+ drivers/md/dm-snap-persistent.c | 1 +
+ drivers/md/dm-snap-transient.c | 1 +
+ drivers/md/dm-uevent.c | 1 +
+ drivers/md/faulty.c | 1 +
+ drivers/md/linear.c | 1 +
+ drivers/md/md.c | 1 +
+ drivers/md/multipath.c | 1 +
+ drivers/md/raid0.c | 1 +
+ drivers/md/raid1.c | 1 +
+ drivers/md/raid10.c | 1 +
+ drivers/md/raid5.c | 1 +
+ drivers/media/common/saa7146_core.c | 1 +
+ drivers/media/common/saa7146_fops.c | 1 +
+ drivers/media/common/saa7146_hlp.c | 1 +
+ drivers/media/common/saa7146_video.c | 1 +
+ drivers/media/common/tuners/tuner-types.c | 1 +
+ drivers/media/dvb/frontends/dibx000_common.c | 1 +
+ drivers/media/dvb/siano/sms-cards.c | 1 +
+ drivers/media/dvb/siano/smsendian.c | 1 +
+ drivers/media/dvb/siano/smssdio.c | 1 +
+ drivers/media/dvb/siano/smsusb.c | 1 +
+ drivers/media/media-device.c | 1 +
+ drivers/media/radio/radio-timb.c | 1 +
+ drivers/media/radio/radio-wl1273.c | 1 +
+ drivers/media/radio/si4713-i2c.c | 1 +
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +
+ drivers/media/rc/ir-jvc-decoder.c | 1 +
+ drivers/media/rc/ir-lirc-codec.c | 1 +
+ drivers/media/rc/ir-nec-decoder.c | 1 +
+ drivers/media/rc/ir-raw.c | 1 +
+ drivers/media/rc/ir-rc5-decoder.c | 1 +
+ drivers/media/rc/ir-rc5-sz-decoder.c | 1 +
+ drivers/media/rc/ir-rc6-decoder.c | 1 +
+ drivers/media/rc/ir-sony-decoder.c | 1 +
+ drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 +
+ drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 +
+ drivers/media/rc/keymaps/rc-anysee.c | 1 +
+ drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 +
+ drivers/media/rc/keymaps/rc-asus-pc39.c | 1 +
+ drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 +
+ .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia.c | 1 +
+ drivers/media/rc/keymaps/rc-avertv-303.c | 1 +
+ drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 +
+ drivers/media/rc/keymaps/rc-behold-columbus.c | 1 +
+ drivers/media/rc/keymaps/rc-behold.c | 1 +
+ drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 +
+ drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 +
+ drivers/media/rc/keymaps/rc-cinergy.c | 1 +
+ drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 +
+ drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 +
+ drivers/media/rc/keymaps/rc-digittrade.c | 1 +
+ drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 +
+ drivers/media/rc/keymaps/rc-em-terratec.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 +
+ drivers/media/rc/keymaps/rc-evga-indtube.c | 1 +
+ drivers/media/rc/keymaps/rc-eztv.c | 1 +
+ drivers/media/rc/keymaps/rc-flydvb.c | 1 +
+ drivers/media/rc/keymaps/rc-flyvideo.c | 1 +
+ drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 +
+ drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 +
+ drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 +
+ drivers/media/rc/keymaps/rc-gotview7135.c | 1 +
+ drivers/media/rc/keymaps/rc-hauppauge.c | 1 +
+ drivers/media/rc/keymaps/rc-imon-mce.c | 1 +
+ drivers/media/rc/keymaps/rc-imon-pad.c | 1 +
+ drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 +
+ drivers/media/rc/keymaps/rc-kaiomy.c | 1 +
+ drivers/media/rc/keymaps/rc-kworld-315u.c | 1 +
+ .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 +
+ drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 +
+ drivers/media/rc/keymaps/rc-lirc.c | 1 +
+ drivers/media/rc/keymaps/rc-lme2510.c | 1 +
+ drivers/media/rc/keymaps/rc-manli.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 +
+ drivers/media/rc/keymaps/rc-nebula.c | 1 +
+ .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 +
+ drivers/media/rc/keymaps/rc-norwood.c | 1 +
+ drivers/media/rc/keymaps/rc-npgtech.c | 1 +
+ drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-new.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview.c | 1 +
+ .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 +
+ drivers/media/rc/keymaps/rc-proteus-2309.c | 1 +
+ drivers/media/rc/keymaps/rc-purpletv.c | 1 +
+ drivers/media/rc/keymaps/rc-pv951.c | 1 +
+ drivers/media/rc/keymaps/rc-rc6-mce.c | 1 +
+ .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 +
+ drivers/media/rc/keymaps/rc-streamzap.c | 1 +
+ drivers/media/rc/keymaps/rc-tbs-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-slim.c | 1 +
+ drivers/media/rc/keymaps/rc-tevii-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-tivo.c | 1 +
+ drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 +
+ drivers/media/rc/keymaps/rc-trekstor.c | 1 +
+ drivers/media/rc/keymaps/rc-tt-1500.c | 1 +
+ drivers/media/rc/keymaps/rc-twinhan1027.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-s350.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 +
+ drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 +
+ drivers/media/rc/keymaps/rc-winfast.c | 1 +
+ drivers/media/rc/rc-main.c | 1 +
+ drivers/media/video/ak881x.c | 1 +
+ drivers/media/video/cpia2/cpia2_usb.c | 1 +
+ drivers/media/video/cx25840/cx25840-ir.c | 1 +
+ drivers/media/video/davinci/dm355_ccdc.c | 1 +
+ drivers/media/video/davinci/dm644x_ccdc.c | 1 +
+ drivers/media/video/hdpvr/hdpvr-i2c.c | 1 +
+ drivers/media/video/hexium_gemini.c | 1 +
+ drivers/media/video/hexium_orion.c | 1 +
+ drivers/media/video/imx074.c | 1 +
+ drivers/media/video/m5mols/m5mols_core.c | 1 +
+ drivers/media/video/mt9m001.c | 1 +
+ drivers/media/video/mt9m111.c | 1 +
+ drivers/media/video/mt9t031.c | 1 +
+ drivers/media/video/mt9v011.c | 1 +
+ drivers/media/video/mt9v022.c | 1 +
+ drivers/media/video/mt9v032.c | 1 +
+ drivers/media/video/mxb.c | 1 +
+ drivers/media/video/noon010pc30.c | 1 +
+ drivers/media/video/omap24xxcam.c | 1 +
+ drivers/media/video/ov6650.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 +
+ drivers/media/video/rj54n1cb0c.c | 1 +
+ drivers/media/video/sh_mobile_csi2.c | 1 +
+ drivers/media/video/sh_vou.c | 1 +
+ drivers/media/video/sr030pc30.c | 1 +
+ drivers/media/video/tcm825x.c | 1 +
+ drivers/media/video/timblogiw.c | 1 +
+ drivers/media/video/tvp514x.c | 1 +
+ drivers/media/video/tvp5150.c | 1 +
+ drivers/media/video/tvp7002.c | 1 +
+ drivers/media/video/usbvision/usbvision-cards.c | 1 +
+ drivers/media/video/v4l2-ctrls.c | 1 +
+ drivers/media/video/v4l2-device.c | 1 +
+ drivers/media/video/v4l2-event.c | 1 +
+ drivers/media/video/v4l2-fh.c | 1 +
+ drivers/media/video/v4l2-int-device.c | 1 +
+ drivers/media/video/v4l2-subdev.c | 1 +
+ drivers/memstick/core/memstick.c | 1 +
+ drivers/memstick/core/mspro_block.c | 1 +
+ drivers/memstick/host/jmb38x_ms.c | 1 +
+ drivers/memstick/host/tifm_ms.c | 1 +
+ drivers/message/i2o/pci.c | 1 +
+ drivers/mfd/ab3100-core.c | 1 +
+ drivers/mfd/ab3550-core.c | 1 +
+ drivers/mfd/ab8500-debugfs.c | 1 +
+ drivers/mfd/ab8500-sysctrl.c | 1 +
+ drivers/mfd/abx500-core.c | 1 +
+ drivers/mfd/asic3.c | 1 +
+ drivers/mfd/dm355evm_msp.c | 1 +
+ drivers/mfd/max8997.c | 1 +
+ drivers/mfd/mfd-core.c | 1 +
+ drivers/mfd/pcf50633-irq.c | 1 +
+ drivers/mfd/tmio_core.c | 1 +
+ drivers/mfd/twl-core.c | 1 +
+ drivers/mfd/twl6030-irq.c | 1 +
+ drivers/mfd/wl1273-core.c | 1 +
+ drivers/mfd/wm8400-core.c | 1 +
+ drivers/misc/ab8500-pwm.c | 1 +
+ drivers/misc/atmel-ssc.c | 1 +
+ drivers/misc/atmel_tclib.c | 1 +
+ drivers/misc/bh1780gli.c | 1 +
+ drivers/misc/kgdbts.c | 1 +
+ drivers/misc/ti-st/st_kim.c | 1 +
+ drivers/misc/tifm_7xx1.c | 1 +
+ drivers/misc/tifm_core.c | 1 +
+ drivers/mmc/card/mmc_test.c | 1 +
+ drivers/mmc/core/bus.c | 2 +
+ drivers/mmc/core/debugfs.c | 1 +
+ drivers/mmc/core/host.c | 1 +
+ drivers/mmc/core/mmc.c | 1 +
+ drivers/mmc/core/mmc_ops.c | 1 +
+ drivers/mmc/core/quirks.c | 1 +
+ drivers/mmc/core/sd.c | 1 +
+ drivers/mmc/core/sd_ops.c | 1 +
+ drivers/mmc/core/sdio_bus.c | 1 +
+ drivers/mmc/core/sdio_io.c | 1 +
+ drivers/mmc/core/sdio_irq.c | 1 +
+ drivers/mmc/host/mmc_spi.c | 1 +
+ drivers/mmc/host/sdhci-pci.c | 1 +
+ drivers/mmc/host/sdhci-pltfm.c | 1 +
+ drivers/mmc/host/sdhci-spear.c | 1 +
+ drivers/mmc/host/sdhci.c | 1 +
+ drivers/mmc/host/sdricoh_cs.c | 1 +
+ drivers/mmc/host/sh_mmcif.c | 1 +
+ drivers/mmc/host/sh_mobile_sdhi.c | 1 +
+ drivers/mmc/host/tifm_sd.c | 1 +
+ drivers/mmc/host/via-sdmmc.c | 1 +
+ drivers/mtd/ar7part.c | 1 +
+ drivers/mtd/cmdlinepart.c | 1 +
+ drivers/mtd/lpddr/lpddr_cmds.c | 1 +
+ drivers/mtd/mtdblock_ro.c | 1 +
+ drivers/mtd/mtdsuper.c | 1 +
+ drivers/mtd/nand/cafe_nand.c | 1 +
+ drivers/mtd/nand/diskonchip.c | 1 +
+ drivers/mtd/nand/nand_bbt.c | 1 +
+ drivers/mtd/nand/sm_common.c | 1 +
+ drivers/mtd/onenand/onenand_bbt.c | 1 +
+ drivers/mtd/redboot.c | 1 +
+ drivers/mtd/rfd_ftl.c | 1 +
+ drivers/mtd/ubi/vmt.c | 1 +
+ drivers/net/mlx4/alloc.c | 1 +
+ drivers/net/mlx4/catas.c | 1 +
+ drivers/net/mlx4/cmd.c | 1 +
+ drivers/net/mlx4/cq.c | 1 +
+ drivers/net/mlx4/eq.c | 1 +
+ drivers/net/mlx4/fw.c | 1 +
+ drivers/net/mlx4/intf.c | 1 +
+ drivers/net/mlx4/mr.c | 1 +
+ drivers/net/mlx4/pd.c | 1 +
+ drivers/net/mlx4/port.c | 1 +
+ drivers/net/mlx4/qp.c | 1 +
+ drivers/net/mlx4/srq.c | 1 +
+ drivers/net/phy/realtek.c | 1 +
+ drivers/net/wireless/b43/pcmcia.c | 1 +
+ drivers/of/of_pci.c | 1 +
+ drivers/of/of_spi.c | 1 +
+ drivers/pci/hotplug-pci.c | 1 +
+ drivers/pci/hotplug/pciehp_acpi.c | 1 +
+ drivers/pci/hotplug/pcihp_slot.c | 1 +
+ drivers/pci/hotplug/rpadlpar_core.c | 1 +
+ drivers/pci/htirq.c | 1 +
+ drivers/pci/iov.c | 1 +
+ drivers/pci/irq.c | 1 +
+ drivers/pci/msi.c | 1 +
+ drivers/pci/pci-sysfs.c | 1 +
+ drivers/pci/quirks.c | 1 +
+ drivers/pci/rom.c | 1 +
+ drivers/pci/setup-res.c | 1 +
+ drivers/pci/slot.c | 1 +
+ drivers/pci/vpd.c | 1 +
+ drivers/platform/x86/intel_scu_ipc.c | 1 +
+ drivers/platform/x86/msi-wmi.c | 1 +
+ drivers/platform/x86/wmi.c | 1 +
+ drivers/power/max17042_battery.c | 1 +
+ drivers/power/max8903_charger.c | 1 +
+ drivers/power/power_supply_sysfs.c | 1 +
+ drivers/ps3/ps3stor_lib.c | 1 +
+ drivers/ps3/sys-manager-core.c | 1 +
+ drivers/rapidio/switches/idt_gen2.c | 1 +
+ drivers/regulator/88pm8607.c | 1 +
+ drivers/regulator/ab8500.c | 1 +
+ drivers/regulator/bq24022.c | 1 +
+ drivers/regulator/da903x.c | 1 +
+ drivers/regulator/dummy.c | 1 +
+ drivers/regulator/fixed.c | 1 +
+ drivers/regulator/lp3971.c | 1 +
+ drivers/regulator/lp3972.c | 1 +
+ drivers/regulator/max8925-regulator.c | 1 +
+ drivers/regulator/max8997.c | 1 +
+ drivers/regulator/mc13783-regulator.c | 1 +
+ drivers/regulator/mc13892-regulator.c | 1 +
+ drivers/regulator/mc13xxx-regulator-core.c | 1 +
+ drivers/regulator/tps6586x-regulator.c | 1 +
+ drivers/regulator/userspace-consumer.c | 1 +
+ drivers/regulator/virtual.c | 1 +
+ drivers/regulator/wm8400-regulator.c | 1 +
+ drivers/rtc/interface.c | 1 +
+ drivers/rtc/rtc-dm355evm.c | 1 +
+ drivers/rtc/rtc-ds1305.c | 1 +
+ drivers/rtc/rtc-ds1511.c | 1 +
+ drivers/rtc/rtc-ds1553.c | 1 +
+ drivers/rtc/rtc-ds1672.c | 1 +
+ drivers/rtc/rtc-ds1742.c | 1 +
+ drivers/rtc/rtc-em3027.c | 1 +
+ drivers/rtc/rtc-isl12022.c | 1 +
+ drivers/rtc/rtc-mv.c | 1 +
+ drivers/rtc/rtc-pcf2123.c | 1 +
+ drivers/rtc/rtc-pcf8563.c | 1 +
+ drivers/rtc/rtc-rs5c348.c | 1 +
+ drivers/rtc/rtc-rs5c372.c | 1 +
+ drivers/rtc/rtc-stk17ta8.c | 1 +
+ drivers/rtc/rtc-x1205.c | 1 +
+ drivers/scsi/aacraid/aachba.c | 1 +
+ drivers/scsi/bfa/bfad_debugfs.c | 1 +
+ drivers/scsi/bfa/bfad_im.c | 2 +
+ drivers/scsi/device_handler/scsi_dh.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_alua.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_emc.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 +
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 1 +
+ drivers/scsi/libfc/fc_disc.c | 1 +
+ drivers/scsi/libfc/fc_elsct.c | 1 +
+ drivers/scsi/libfc/fc_exch.c | 1 +
+ drivers/scsi/libfc/fc_libfc.c | 1 +
+ drivers/scsi/libfc/fc_lport.c | 1 +
+ drivers/scsi/libfc/fc_npiv.c | 1 +
+ drivers/scsi/libfc/fc_rport.c | 1 +
+ drivers/scsi/libsas/sas_scsi_host.c | 1 +
+ drivers/scsi/libsas/sas_task.c | 1 +
+ drivers/scsi/libsrp.c | 1 +
+ drivers/scsi/lpfc/lpfc_attr.c | 1 +
+ drivers/scsi/lpfc/lpfc_debugfs.c | 1 +
+ drivers/scsi/lpfc/lpfc_init.c | 1 +
+ drivers/scsi/lpfc/lpfc_scsi.c | 1 +
+ drivers/scsi/megaraid/megaraid_mbox.c | 1 +
+ drivers/scsi/osd/osd_initiator.c | 1 +
+ drivers/scsi/ps3rom.c | 1 +
+ drivers/scsi/scsi_lib.c | 1 +
+ drivers/scsi/scsi_lib_dma.c | 1 +
+ drivers/scsi/scsi_pm.c | 1 +
+ drivers/scsi/sr_ioctl.c | 1 +
+ drivers/sh/intc/virq.c | 1 +
+ drivers/spi/spi-altera.c | 1 +
+ drivers/spi/spi-bitbang.c | 1 +
+ drivers/spi/spi-butterfly.c | 1 +
+ drivers/spi/spi-dw-mmio.c | 1 +
+ drivers/spi/spi-dw-pci.c | 1 +
+ drivers/spi/spi-dw.c | 1 +
+ drivers/spi/spi-gpio.c | 1 +
+ drivers/spi/spi-oc-tiny.c | 1 +
+ drivers/spi/spi-pxa2xx-pci.c | 1 +
+ drivers/spi/spi-sh-msiof.c | 1 +
+ drivers/spi/spi-ti-ssp.c | 1 +
+ drivers/spi/spi-tle62x0.c | 1 +
+ drivers/spi/spi-txx9.c | 1 +
+ drivers/spi/spi.c | 1 +
+ drivers/ssb/b43_pci_bridge.c | 1 +
+ drivers/ssb/driver_chipcommon.c | 1 +
+ drivers/ssb/driver_chipcommon_pmu.c | 1 +
+ drivers/ssb/driver_pcicore.c | 1 +
+ drivers/ssb/embedded.c | 1 +
+ drivers/ssb/main.c | 1 +
+ drivers/ssb/pcihost_wrapper.c | 1 +
+ drivers/staging/altera-stapl/altera.c | 1 +
+ drivers/staging/brcm80211/brcmutil/wifi.c | 1 +
+ drivers/staging/dt3155v4l/dt3155v4l.c | 2 +
+ drivers/staging/iio/accel/adis16201_core.c | 1 +
+ drivers/staging/iio/accel/adis16203_core.c | 1 +
+ drivers/staging/iio/accel/adis16204_core.c | 1 +
+ drivers/staging/iio/accel/adis16209_core.c | 1 +
+ drivers/staging/iio/accel/adis16220_core.c | 1 +
+ drivers/staging/iio/accel/adis16240_core.c | 1 +
+ drivers/staging/iio/accel/kxsd9.c | 1 +
+ drivers/staging/iio/accel/lis3l02dq_core.c | 1 +
+ drivers/staging/iio/accel/sca3000_core.c | 1 +
+ drivers/staging/iio/adc/ad7150.c | 1 +
+ drivers/staging/iio/adc/ad7152.c | 1 +
+ drivers/staging/iio/adc/ad7291.c | 1 +
+ drivers/staging/iio/adc/ad7298_core.c | 1 +
+ drivers/staging/iio/adc/ad7314.c | 1 +
+ drivers/staging/iio/adc/ad7476_core.c | 1 +
+ drivers/staging/iio/adc/ad7606_core.c | 1 +
+ drivers/staging/iio/adc/ad7745.c | 1 +
+ drivers/staging/iio/adc/ad7780.c | 1 +
+ drivers/staging/iio/adc/ad7816.c | 1 +
+ drivers/staging/iio/adc/ad7887_core.c | 1 +
+ drivers/staging/iio/adc/ad799x_core.c | 1 +
+ drivers/staging/iio/adc/adt7310.c | 1 +
+ drivers/staging/iio/adc/adt7410.c | 1 +
+ drivers/staging/iio/adc/adt75.c | 1 +
+ drivers/staging/iio/adc/max1363_core.c | 1 +
+ drivers/staging/iio/addac/adt7316-i2c.c | 1 +
+ drivers/staging/iio/addac/adt7316.c | 1 +
+ drivers/staging/iio/dac/ad5446.c | 1 +
+ drivers/staging/iio/dac/ad5504.c | 1 +
+ drivers/staging/iio/dac/ad5624r_spi.c | 1 +
+ drivers/staging/iio/dac/ad5686.c | 1 +
+ drivers/staging/iio/dac/ad5791.c | 1 +
+ drivers/staging/iio/dds/ad5930.c | 1 +
+ drivers/staging/iio/dds/ad9832.c | 1 +
+ drivers/staging/iio/dds/ad9834.c | 1 +
+ drivers/staging/iio/dds/ad9850.c | 1 +
+ drivers/staging/iio/dds/ad9852.c | 1 +
+ drivers/staging/iio/dds/ad9910.c | 1 +
+ drivers/staging/iio/dds/ad9951.c | 1 +
+ drivers/staging/iio/gyro/adis16060_core.c | 1 +
+ drivers/staging/iio/gyro/adis16080_core.c | 1 +
+ drivers/staging/iio/gyro/adis16130_core.c | 1 +
+ drivers/staging/iio/gyro/adis16260_core.c | 1 +
+ drivers/staging/iio/gyro/adxrs450_core.c | 1 +
+ drivers/staging/iio/imu/adis16400_core.c | 1 +
+ drivers/staging/iio/industrialio-ring.c | 1 +
+ drivers/staging/iio/light/tsl2583.c | 1 +
+ drivers/staging/iio/meter/ade7753.c | 1 +
+ drivers/staging/iio/meter/ade7754.c | 1 +
+ drivers/staging/iio/meter/ade7758_core.c | 1 +
+ drivers/staging/iio/meter/ade7759.c | 1 +
+ drivers/staging/iio/meter/ade7854-i2c.c | 1 +
+ drivers/staging/iio/meter/ade7854-spi.c | 1 +
+ drivers/staging/iio/meter/ade7854.c | 1 +
+ drivers/staging/iio/resolver/ad2s120x.c | 1 +
+ drivers/staging/iio/resolver/ad2s1210.c | 1 +
+ drivers/staging/iio/resolver/ad2s90.c | 1 +
+ drivers/staging/iio/trigger.h | 1 +
+ .../staging/intel_sst/intel_sst_drv_interface.c | 1 +
+ drivers/staging/line6/audio.c | 1 +
+ drivers/staging/sm7xx/smtcfb.c | 2 +
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 +
+ drivers/staging/usbip/stub_dev.c | 1 +
+ drivers/staging/usbip/stub_main.c | 1 +
+ drivers/staging/usbip/usbip_event.c | 1 +
+ drivers/tty/hvc/hvc_iseries.c | 1 +
+ drivers/tty/hvc/hvc_vio.c | 1 +
+ drivers/tty/serial/jsm/jsm_driver.c | 2 +-
+ drivers/tty/serial/kgdboc.c | 1 +
+ drivers/tty/serial/max3100.c | 1 +
+ drivers/tty/serial/max3107-aava.c | 1 +
+ drivers/tty/serial/max3107.c | 1 +
+ drivers/tty/serial/nwpserial.c | 1 +
+ drivers/tty/serial/timbuart.c | 1 +
+ drivers/tty/serial/xilinx_uartps.c | 1 +
+ drivers/tty/vt/vc_screen.c | 1 +
+ drivers/uio/uio_pdrv.c | 1 +
+ drivers/uio/uio_pdrv_genirq.c | 1 +
+ drivers/usb/c67x00/c67x00-drv.c | 1 +
+ drivers/usb/core/driver.c | 1 +
+ drivers/usb/core/notify.c | 1 +
+ drivers/usb/gadget/cdc2.c | 1 +
+ drivers/usb/gadget/composite.c | 1 +
+ drivers/usb/gadget/dbgp.c | 1 +
+ drivers/usb/gadget/f_fs.c | 1 +
+ drivers/usb/gadget/f_obex.c | 1 +
+ drivers/usb/gadget/f_sourcesink.c | 1 +
+ drivers/usb/gadget/file_storage.c | 1 +
+ drivers/usb/gadget/fusb300_udc.c | 1 +
+ drivers/usb/gadget/gmidi.c | 1 +
+ drivers/usb/gadget/u_serial.c | 1 +
+ drivers/usb/host/isp1760-if.c | 1 +
+ drivers/usb/host/pci-quirks.c | 1 +
+ drivers/usb/host/whci/debug.c | 1 +
+ drivers/usb/host/whci/hcd.c | 1 +
+ drivers/usb/host/xhci-hub.c | 1 +
+ drivers/usb/host/xhci-pci.c | 1 +
+ drivers/usb/mon/mon_bin.c | 1 +
+ drivers/usb/mon/mon_stat.c | 1 +
+ drivers/usb/mon/mon_text.c | 1 +
+ drivers/usb/otg/gpio_vbus.c | 1 +
+ drivers/usb/otg/otg.c | 1 +
+ drivers/usb/otg/ulpi.c | 1 +
+ drivers/usb/serial/aircable.c | 1 +
+ drivers/usb/serial/qcserial.c | 1 +
+ drivers/usb/storage/option_ms.c | 1 +
+ drivers/usb/storage/protocol.c | 1 +
+ drivers/usb/storage/sierra_ms.c | 1 +
+ drivers/usb/storage/transport.c | 1 +
+ drivers/usb/storage/uas.c | 1 +
+ drivers/usb/wusbcore/devconnect.c | 1 +
+ drivers/usb/wusbcore/mmc.c | 1 +
+ drivers/usb/wusbcore/rh.c | 1 +
+ drivers/usb/wusbcore/security.c | 1 +
+ drivers/usb/wusbcore/wa-hc.c | 1 +
+ drivers/usb/wusbcore/wa-rpipe.c | 1 +
+ drivers/usb/wusbcore/wa-xfer.c | 1 +
+ drivers/uwb/est.c | 1 +
+ drivers/uwb/i1480/dfu/dfu.c | 1 +
+ drivers/uwb/ie.c | 1 +
+ drivers/uwb/lc-dev.c | 2 +
+ drivers/uwb/neh.c | 1 +
+ drivers/uwb/pal.c | 1 +
+ drivers/uwb/radio.c | 1 +
+ drivers/uwb/reset.c | 1 +
+ drivers/uwb/rsv.c | 1 +
+ drivers/uwb/scan.c | 1 +
+ drivers/uwb/umc-bus.c | 1 +
+ drivers/uwb/umc-dev.c | 1 +
+ drivers/uwb/umc-drv.c | 1 +
+ drivers/uwb/whci.c | 1 +
+ drivers/video/backlight/88pm860x_bl.c | 1 +
+ drivers/video/backlight/adp5520_bl.c | 1 +
+ drivers/video/backlight/ams369fg06.c | 1 +
+ drivers/video/backlight/da903x_bl.c | 1 +
+ drivers/video/backlight/l4f00242t03.c | 1 +
+ drivers/video/backlight/ld9040.c | 1 +
+ drivers/video/backlight/lms283gf05.c | 1 +
+ drivers/video/backlight/max8925_bl.c | 1 +
+ drivers/video/backlight/s6e63m0.c | 1 +
+ drivers/video/backlight/wm831x_bl.c | 1 +
+ drivers/video/carminefb.c | 1 +
+ drivers/video/cobalt_lcdfb.c | 1 +
+ drivers/video/fb_ddc.c | 3 +-
+ drivers/video/fb_notify.c | 1 +
+ drivers/video/mb862xx/mb862xx-i2c.c | 1 +
+ drivers/video/mb862xx/mb862xxfbdrv.c | 1 +
+ drivers/video/savage/savagefb_accel.c | 1 +
+ drivers/video/sh_mipi_dsi.c | 1 +
+ drivers/video/sh_mobile_lcdcfb.c | 1 +
+ drivers/video/via/via-gpio.c | 1 +
+ drivers/video/w100fb.c | 1 +
+ drivers/virtio/virtio.c | 1 +
+ drivers/virtio/virtio_balloon.c | 1 +
+ drivers/virtio/virtio_ring.c | 1 +
+ drivers/w1/w1_family.c | 1 +
+ drivers/xen/balloon.c | 1 +
+ drivers/xen/manage.c | 1 +
+ drivers/xen/swiotlb-xen.c | 1 +
+ drivers/xen/xen-pciback/conf_space.c | 1 +
+ drivers/xen/xen-selfballoon.c | 2 +
+ drivers/xen/xenbus/xenbus_client.c | 1 +
+ drivers/xen/xenbus/xenbus_probe.c | 1 +
+ drivers/xen/xenbus/xenbus_probe_backend.c | 1 +
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
+ fs/bio-integrity.c | 1 +
+ fs/exofs/super.c | 1 +
+ fs/gfs2/ops_fstype.c | 1 +
+ fs/ioprio.c | 1 +
+ fs/jfs/jfs_logmgr.c | 1 +
+ fs/logfs/super.c | 1 +
+ fs/nfsd/nfssvc.c | 1 +
+ fs/proc/vmcore.c | 1 +
+ include/acpi/platform/aclinux.h | 2 +-
+ include/drm/drmP.h | 3 +-
+ include/linux/bcma/bcma.h | 7 +-
+ include/linux/blkdev.h | 2 +-
+ include/linux/cpuidle.h | 3 +-
+ include/linux/crypto.h | 6 --
+ include/linux/device.h | 15 ++-
+ include/linux/device_cgroup.h | 1 -
+ include/linux/export.h | 89 ++++++++++++++++++++
+ include/linux/firmware.h | 2 +-
+ include/linux/ftrace.h | 2 +-
+ include/linux/gameport.h | 17 ++--
+ include/linux/hid.h | 9 +-
+ include/linux/i2c.h | 10 +-
+ include/linux/ipmi.h | 3 +-
+ include/linux/ipmi_smi.h | 1 -
+ include/linux/mdio-bitbang.h | 3 +-
+ include/linux/module.h | 68 +---------------
+ include/linux/mtd/mtd.h | 3 +-
+ include/linux/of_platform.h | 1 -
+ include/linux/pci_hotplug.h | 10 +--
+ include/linux/pm_runtime.h | 1 +
+ include/linux/regulator/driver.h | 1 +
+ include/linux/serio.h | 20 +++--
+ include/linux/ssb/ssb.h | 7 +-
+ include/linux/stop_machine.h | 1 +
+ include/linux/sunrpc/svc_xprt.h | 3 +-
+ include/linux/sysdev.h | 1 -
+ include/linux/textsearch.h | 3 +-
+ include/linux/uio_driver.h | 12 ++--
+ include/linux/usb.h | 9 +-
+ include/linux/uwb.h | 1 +
+ include/linux/uwb/umc.h | 7 +-
+ include/linux/vermagic.h | 1 -
+ include/linux/vlynq.h | 3 +-
+ include/media/saa7146.h | 3 +-
+ include/media/v4l2-int-device.h | 3 +-
+ include/net/inet_timewait_sock.h | 1 -
+ include/net/lib80211.h | 3 +-
+ include/net/sch_generic.h | 1 -
+ include/net/sock.h | 2 +-
+ include/sound/core.h | 2 +-
+ include/trace/define_trace.h | 2 +-
+ include/trace/events/module.h | 2 +-
+ include/xen/xenbus.h | 1 +
+ kernel/async.c | 2 +-
+ kernel/audit.c | 2 +-
+ kernel/auditsc.c | 2 +-
+ kernel/capability.c | 2 +-
+ kernel/cgroup_freezer.c | 2 +-
+ kernel/compat.c | 1 +
+ kernel/cpu.c | 2 +-
+ kernel/cpuset.c | 2 +-
+ kernel/crash_dump.c | 2 +-
+ kernel/cred.c | 2 +-
+ kernel/debug/kdb/kdb_debugger.c | 1 +
+ kernel/dma.c | 2 +-
+ kernel/events/core.c | 1 +
+ kernel/exit.c | 3 +-
+ kernel/fork.c | 3 +-
+ kernel/freezer.c | 2 +-
+ kernel/futex.c | 2 +-
+ kernel/groups.c | 2 +-
+ kernel/hrtimer.c | 2 +-
+ kernel/hung_task.c | 2 +-
+ kernel/irq_work.c | 4 +-
+ kernel/jump_label.c | 2 +-
+ kernel/kfifo.c | 2 +-
+ kernel/kprobes.c | 2 +-
+ kernel/ksysfs.c | 2 +-
+ kernel/kthread.c | 2 +-
+ kernel/latencytop.c | 2 +-
+ kernel/lockdep.c | 2 +-
+ kernel/lockdep_proc.c | 2 +-
+ kernel/module.c | 2 +-
+ kernel/mutex-debug.c | 2 +-
+ kernel/mutex.c | 2 +-
+ kernel/notifier.c | 2 +-
+ kernel/nsproxy.c | 2 +-
+ kernel/padata.c | 2 +-
+ kernel/params.c | 4 +-
+ kernel/pid.c | 2 +-
+ kernel/posix-timers.c | 2 +-
+ kernel/power/hibernate.c | 1 +
+ kernel/power/main.c | 1 +
+ kernel/power/suspend.c | 2 +
+ kernel/printk.c | 2 +-
+ kernel/profile.c | 2 +-
+ kernel/ptrace.c | 2 +-
+ kernel/range.c | 2 +-
+ kernel/rcupdate.c | 2 +-
+ kernel/rcutiny.c | 4 +-
+ kernel/rcutorture.c | 3 +-
+ kernel/rcutree.c | 2 +-
+ kernel/rcutree_trace.c | 3 +-
+ kernel/relay.c | 2 +-
+ kernel/resource.c | 2 +-
+ kernel/rtmutex-debug.c | 2 +-
+ kernel/rtmutex-tester.c | 2 +-
+ kernel/rtmutex.c | 2 +-
+ kernel/rwsem.c | 2 +-
+ kernel/sched.c | 2 +-
+ kernel/sched_clock.c | 2 +-
+ kernel/semaphore.c | 2 +-
+ kernel/signal.c | 2 +-
+ kernel/smp.c | 2 +-
+ kernel/softirq.c | 2 +-
+ kernel/spinlock.c | 2 +-
+ kernel/srcu.c | 2 +-
+ kernel/stacktrace.c | 2 +-
+ kernel/stop_machine.c | 2 +-
+ kernel/sys.c | 3 +-
+ kernel/sysctl.c | 2 +-
+ kernel/time.c | 2 +-
+ kernel/time/posix-clock.c | 1 +
+ kernel/timer.c | 2 +-
+ kernel/trace/blktrace.c | 1 +
+ kernel/trace/ftrace.c | 1 +
+ kernel/trace/trace_syscalls.c | 1 +
+ kernel/up.c | 2 +-
+ kernel/user-return-notifier.c | 2 +-
+ kernel/user.c | 2 +-
+ kernel/user_namespace.c | 2 +-
+ kernel/utsname.c | 2 +-
+ kernel/utsname_sysctl.c | 2 +-
+ kernel/wait.c | 2 +-
+ kernel/watchdog.c | 3 +-
+ kernel/workqueue.c | 2 +-
+ lib/dma-debug.c | 1 +
+ lib/raid6/algos.c | 1 +
+ lib/raid6/mktables.c | 1 +
+ lib/raid6/recov.c | 1 +
+ mm/fremap.c | 1 -
+ mm/memcontrol.c | 1 +
+ mm/memory-failure.c | 1 +
+ mm/mmzone.c | 1 -
+ mm/quicklist.c | 1 -
+ mm/sparse-vmemmap.c | 1 -
+ mm/swap_state.c | 1 -
+ mm/swapfile.c | 1 -
+ net/caif/cfpkt_skbuff.c | 1 +
+ net/netfilter/ipset/pfxlen.c | 1 +
+ net/rfkill/input.c | 1 +
+ security/selinux/netlink.c | 1 +
+ sound/core/control.c | 1 +
+ sound/core/device.c | 1 +
+ sound/core/hwdep.c | 1 +
+ sound/core/info.c | 1 +
+ sound/core/info_oss.c | 1 +
+ sound/core/init.c | 1 +
+ sound/core/isadma.c | 1 +
+ sound/core/jack.c | 1 +
+ sound/core/memory.c | 1 +
+ sound/core/misc.c | 1 +
+ sound/core/oss/mixer_oss.c | 1 +
+ sound/core/rawmidi.c | 1 +
+ sound/core/seq/oss/seq_oss.c | 2 +-
+ sound/core/seq/oss/seq_oss_init.c | 2 +-
+ sound/core/seq/oss/seq_oss_synth.c | 1 +
+ sound/core/seq/seq.c | 2 +-
+ sound/core/seq/seq_clientmgr.c | 1 +
+ sound/core/seq/seq_device.c | 1 +
+ sound/core/seq/seq_dummy.c | 2 +-
+ sound/core/seq/seq_info.c | 1 +
+ sound/core/seq/seq_lock.c | 1 +
+ sound/core/seq/seq_memory.c | 1 +
+ sound/core/seq/seq_midi.c | 2 +-
+ sound/core/seq/seq_midi_emul.c | 1 +
+ sound/core/seq/seq_midi_event.c | 1 +
+ sound/core/seq/seq_ports.c | 1 +
+ sound/core/seq/seq_system.c | 1 +
+ sound/core/seq/seq_virmidi.c | 1 +
+ sound/core/sound.c | 2 +-
+ sound/core/sound_oss.c | 1 +
+ sound/core/timer.c | 2 +-
+ sound/core/vmaster.c | 1 +
+ sound/drivers/mpu401/mpu401.c | 2 +-
+ sound/drivers/mpu401/mpu401_uart.c | 1 +
+ sound/drivers/mtpav.c | 1 +
+ sound/drivers/mts64.c | 1 +
+ sound/drivers/opl3/opl3_lib.c | 1 +
+ sound/drivers/opl3/opl3_oss.c | 1 +
+ sound/drivers/opl3/opl3_seq.c | 1 +
+ sound/drivers/opl3/opl3_synth.c | 1 +
+ sound/drivers/opl4/opl4_lib.c | 1 +
+ sound/drivers/opl4/opl4_proc.c | 1 +
+ sound/drivers/opl4/opl4_seq.c | 1 +
+ sound/drivers/portman2x4.c | 1 +
+ sound/drivers/serial-u16550.c | 2 +-
+ sound/drivers/virmidi.c | 2 +-
+ sound/firewire/iso-resources.c | 1 +
+ sound/firewire/packets-buffer.c | 1 +
+ sound/i2c/i2c.c | 1 +
+ sound/i2c/other/ak4xxx-adda.c | 1 +
+ sound/i2c/other/pt2258.c | 1 +
+ sound/i2c/other/tea575x-tuner.c | 1 +
+ sound/i2c/tea6330t.c | 1 +
+ sound/isa/sb/emu8000.c | 1 +
+ sound/isa/sb/emu8000_callback.c | 1 +
+ sound/isa/sb/emu8000_patch.c | 1 +
+ sound/isa/sb/emu8000_synth.c | 1 +
+ sound/isa/wavefront/wavefront_fx.c | 1 +
+ sound/isa/wavefront/wavefront_synth.c | 1 +
+ sound/pci/als4000.c | 2 +-
+ sound/pci/asihpi/hpioctl.c | 1 +
+ sound/pci/ctxfi/xfi.c | 1 +
+ sound/pci/oxygen/oxygen_io.c | 1 +
+ sound/soc/tegra/tegra_asoc_utils.c | 1 +
+ sound/synth/emux/emux.c | 1 +
+ sound/synth/emux/emux_oss.c | 1 +
+ sound/synth/emux/emux_seq.c | 2 +-
+ sound/synth/emux/emux_synth.c | 1 +
+ sound/synth/emux/soundfont.c | 1 +
+ sound/synth/util_mem.c | 1 +
+ sound/usb/6fire/firmware.c | 1 +
+ sound/usb/midi.c | 1 +
+ virt/kvm/iommu.c | 2 +
+ 1151 files changed, 1267 insertions(+), 428 deletions(-)
+ create mode 100644 include/linux/export.h
+$ git am -3 ../patches/0001-Partial-revert-of-f7f927183dba.patch
+Applying: Partial revert of f7f927183dba
+$ git am -3 ../patches/0001-Partial-revert-of-commit-d03b684f1773.patch
+Applying: Partial revert of commit d03b684f1773
+$ git am -3 ../patches/0001-kxtj9-explictly-include-module.h.patch
+Applying: kxtj9: explictly include module.h
+$ git am -3 ../patches/0001-include-export.h-to-use-EXPORT_SYMBOL.patch
+Applying: include export.h to use EXPORT_SYMBOL
+$ git am -3 ../patches/0001-ov5642-include-module.h-for-its-facilities.patch
+Applying: ov5642: include module.h for its facilities
+$ git am -3 ../patches/0001-ir-raw-include-kmod.h-for-request_module.patch
+Applying: ir-raw: include kmod.h for request_module
+$ git am -3 ../patches/0001-ir-mce_kbd-decoder-include-module.h-for-its-faciliti.patch
+Applying: ir-mce_kbd-decoder: include module.h for its facilities
+$ 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: kernel/fork.c:267: error: implicit declaration of function
+Applying: WARNING: line over 80 characters
+Applying: arch/cris/arch-v10/drivers/sync_serial.c:628: error: 'ret' undeclared (first use in this function)
+Applying: arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_serial_ioctl'
+Applying: arch/cris/arch-v10/kernel/irq.c:239: error: implicit declaration of function 'kgdb_init'
+Applying: There's a code path in pmcraid that can be reached via device ioctl that
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: The out_msi_disable label should be before cleanup_nomem to additionally
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Most smartarrays tolerate it, but a few new ones don't.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: My load tests on PowerPC freeze within minutes in __slab_free(). I
+Applying: The parameter's origin type is long. On an i386 architecture, it can
+Applying: kernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t'
+Applying: It's about time to revert 16d752397301b9 ("thermal: Create
+Applying: We'll soon need to reuse it.
+Applying: THERMAL_HWMON is implemented inside the thermal_sys driver and has no
+Applying: b552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of
+Applying: Linux supports some optional features, but it should notify the BIOS about
+Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
+Applying: This makes the iris driver use the platform API, so it is properly exposed
+Applying: - remove commented-out code
+Applying: There was one code block that I commented to be able to test the patch dnd
+Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
+Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+Removing drivers/leds/leds-alix2.c
+Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: In response to new device tree code in the kernel, OLPC will start using
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Move these definitions into the relevant header file. This was requested
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+CONFLICT (delete/modify): arch/x86/platform/olpc/olpc-xo1.c deleted in HEAD and modified in Move these definitions into the relevant header file. This was requested. Version Move these definitions into the relevant header file. This was requested of arch/x86/platform/olpc/olpc-xo1.c left in tree.
+Auto-merging include/linux/cs5535.h
+CONFLICT (content): Merge conflict in include/linux/cs5535.h
+Failed to merge in the changes.
+Patch failed at 0025 Move these definitions into the relevant header file. This was requested
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: Based on earlier review comments, we'll no longer try to stick all of our
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+error: refusing to lose untracked file at 'arch/x86/platform/olpc/olpc-xo1-pm.c'
+CONFLICT (rename/delete): Rename arch/x86/platform/olpc/olpc-xo1.c->arch/x86/platform/olpc/olpc-xo1-pm.c in Based on earlier review comments, we'll no longer try to stick all of our and deleted in HEAD
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/x86/platform/olpc/Makefile
+CONFLICT (content): Merge conflict in arch/x86/platform/olpc/Makefile
+Failed to merge in the changes.
+Patch failed at 0026 Based on earlier review comments, we'll no longer try to stick all of our
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: Add code needed for basic suspend/resume of the XO-1 laptop. Based on
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/olpc.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/olpc.h
+Auto-merging arch/x86/platform/olpc/Makefile
+CONFLICT (content): Merge conflict in arch/x86/platform/olpc/Makefile
+Auto-merging include/linux/cs5535.h
+Failed to merge in the changes.
+Patch failed at 0027 Add code needed for basic suspend/resume of the XO-1 laptop. Based on
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: The System Control Interrupt is used in the OLPC XO-1 to control various
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/platform/olpc/Makefile
+CONFLICT (content): Merge conflict in arch/x86/platform/olpc/Makefile
+Auto-merging arch/x86/platform/olpc/olpc-xo1-sci.c
+CONFLICT (add/add): Merge conflict in arch/x86/platform/olpc/olpc-xo1-sci.c
+Auto-merging include/linux/cs5535.h
+CONFLICT (content): Merge conflict in include/linux/cs5535.h
+Failed to merge in the changes.
+Patch failed at 0028 The System Control Interrupt is used in the OLPC XO-1 to control various
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: Update the EC SCI masks with recent additions.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/platform/olpc/olpc.c
+CONFLICT (content): Merge conflict in arch/x86/platform/olpc/olpc.c
+Failed to merge in the changes.
+Patch failed at 0029 Update the EC SCI masks with recent additions.
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: The EC in the OLPC XO-1 delivers GPE events to provide various
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/x86/platform/olpc/olpc-xo1-sci.c
+CONFLICT (content): Merge conflict in arch/x86/platform/olpc/olpc-xo1-sci.c
+Auto-merging include/linux/cs5535.h
+Failed to merge in the changes.
+Patch failed at 0030 The EC in the OLPC XO-1 delivers GPE events to provide various
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: Configure the XO-1's lid switch GPIO to trigger an SCI interrupt, and
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/x86/platform/olpc/olpc-xo1-sci.c
+CONFLICT (content): Merge conflict in arch/x86/platform/olpc/olpc-xo1-sci.c
+Failed to merge in the changes.
+Patch failed at 0031 Configure the XO-1's lid switch GPIO to trigger an SCI interrupt, and
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: EC events indicate change in AC power connectivity, battery state of
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Failed to merge in the changes.
+Patch failed at 0032 EC events indicate change in AC power connectivity, battery state of
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: Add a driver to configure the XO-1 RTC via CS5536 MSRs, to be used as a
+Using index info to reconstruct a base tree...
+<stdin>:54: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/platform/olpc/olpc-xo1-rtc.c
+CONFLICT (add/add): Merge conflict in arch/x86/platform/olpc/olpc-xo1-rtc.c
+Failed to merge in the changes.
+Patch failed at 0033 Add a driver to configure the XO-1 RTC via CS5536 MSRs, to be used as a
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: Add a driver for the ACPI-based EC event interface found on the OLPC
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/x86/platform/olpc/olpc-xo15-sci.c
+CONFLICT (add/add): Merge conflict in arch/x86/platform/olpc/olpc-xo15-sci.c
+Failed to merge in the changes.
+Patch failed at 0034 Add a driver for the ACPI-based EC event interface found on the OLPC
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f35a234 Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: Don't allow everybody to use a modem.
+Applying: The address limit is already set in flush_old_exec() so this
+Applying: A call to va_copy() should always be followed by a call to va_end() in the
+Applying: Don't dereference em if it's NULL or an error pointer.
+Applying: The buffer 'sc.cpu_mask' is a kernel buffer. If bitmap_parse is used
+Applying: The camera there identifies itself as being manufactured by Cheng Uei
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: fb_set_suspend() must be called with the console semaphore held, which
+Applying: Unless I'm very much missing something these tests are intended to check
+Applying: The address limit is already set in flush_old_exec() so this
+Applying: The address limit is already set in flush_old_exec() so this
+Applying: Mike McLagan hasn't contributed in many years and his email bounces.
+Applying: proc_fork_connector() uses ->real_parent lockless. This is not safe if
+Applying: backlight_device_register() returns ERR_PTR() on error.
+Applying: 1. current implementation tests wrong value for setting aat2870_bl->max_current.
+Applying: i386 allmodconfig:
+Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
+Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
+Applying: The address limit is already set in flush_old_exec() so those calls to
+Applying: When do pci remove/rescan on system that have more iommus, got
+Applying: The current implementation of dmi_name_in_vendors() is an invitation to
+Applying: fix comment layout
+Applying: The address limit is already set in flush_old_exec() so those calls to
+Applying: For headers that get exported to userland and make use of u32 style
+Applying: Fix sparse warnings of right shift bigger than source value size:
+Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
+Applying: brd_make_request() always returns 0, which doesn't make much sense.
+Applying: Remove the (unsigned long long) cast in diskstats_show() and adjusts the
+Applying: The report has an ISO which has a very long manufacturer ID. It seems
+Applying: The address limit is already set in flush_old_exec() so this assignment of
+Applying: x86_64 allmodconfig:
+Applying: alpha allmodconfig:
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/staging/dt3155v4l/dt3155v4l.c
+CONFLICT (content): Merge conflict in drivers/staging/dt3155v4l/dt3155v4l.c
+Failed to merge in the changes.
+Patch failed at 0065 alpha allmodconfig:
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --continue
+Applying: alpha allmodconfig:
+Applying: alpha allmodconfig:
+Applying: alpha allmodconfig:
+Applying: Cc: Greg KH <greg@kroah.com>
+Applying: Use the nice enumerated constant.
+Applying: A patchset to extend tmpfs to MAX_LFS_FILESIZE by abandoning its peculiar
+Applying: If swap entries are to be stored along with struct page pointers in a
+Applying: The maximum size of a shmem/tmpfs file has been limited by the maximum
+Applying: While it's at its least, make a number of boring nitpicky cleanups to
+Applying: Bring truncate.c's code for truncate_inode_pages_range() inline into
+Applying: Disable the toy swapping implementation in shmem_writepage() - it's hard
+Applying: Convert shmem_unuse_inode() to use a lockless gang lookup of the radix
+Applying: Convert shmem_getpage_gfp(), the engine-room of shmem, to expect page or
+Applying: Remove mem_cgroup_shmem_charge_fallback(): it was only required when we
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/linux/memcontrol.h
+Auto-merging mm/memcontrol.c
+Applying: Convert shmem_writepage() to use shmem_delete_from_page_cache() to use
+Applying: But we've not yet removed the old swp_entry_t i_direct[16] from
+Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
+Applying: Fix NULL dereference I introduced in mincore_page().
+Applying: Expand the fs/Kconfig "help" info to clarify why it's a bad idea to
+Applying: Expand the fs/Kconfig "help" info to clarify why you might need to select
+Applying: Dev_opp initial value shoule be ERR_PTR(), IS_ERR() is used to check
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: The address limit is already set in flush_old_exec() so this
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: smp_call_function() only lets all other CPUs execute a specific function,
+Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
+Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
+Applying: Strict user copy checks are only really supported on x86_32 even though
+Applying: The help text for this config is duplicated across the x86, parisc, and
+Applying: The code checks the correctness of the parameters, but unconditionally
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/rtc/interface.c
+CONFLICT (content): Merge conflict in drivers/rtc/interface.c
+Failed to merge in the changes.
+Patch failed at 0092 The code checks the correctness of the parameters, but unconditionally
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 4df97ff The help text for this config is duplicated across the x86, parisc, and
+Applying: Due to the hrtimer self rearming mode a user can DoS the machine simply
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Ben reported a lockup related to rtc. The lockup happens due to:
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Each memory cgroup has a 'swappiness' value which can be accessed by
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/linux/swap.h
+CONFLICT (content): Merge conflict in include/linux/swap.h
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Auto-merging mm/vmscan.c
+CONFLICT (content): Merge conflict in mm/vmscan.c
+Failed to merge in the changes.
+Patch failed at 0095 Each memory cgroup has a 'swappiness' value which can be accessed by
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 4df97ff The help text for this config is duplicated across the x86, parisc, and
+Applying: In mm/memcontrol.c, there are many lru stat functions as..
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: mm/vmscan.c: In function 'zone_nr_lru_pages':
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: 867578cb ("memcg: fix oom kill behavior") introduced oom_lock counter
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Failed to merge in the changes.
+Patch failed at 0099 867578cb ("memcg: fix oom kill behavior") introduced oom_lock counter
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 7365aef Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: memcg_oom_mutex is used to protect memcg OOM path and eventfd interface
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: 246e87a ("memcg: fix get_scan_count() for small targets") fixes the
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: 22a668d7 ("memcg: fix behavior under memory.limit equals to memsw.limit")
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: The commit log of 0ae5e89 ("memcg: count the soft_limit reclaim in...")
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: drain_all_stock_async tries to optimize a work to be done on the work
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Failed to merge in the changes.
+Patch failed at 0104 drain_all_stock_async tries to optimize a work to be done on the work
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 7365aef Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: Currently we have two ways how to drain per-CPU caches for charges.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Failed to merge in the changes.
+Patch failed at 0105 Currently we have two ways how to drain per-CPU caches for charges.
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 7365aef Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: We are checking whether a given two groups are same or at least in the
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: percpu_charge_mutex protects from multiple simultaneous per-cpu charge
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: [This patch has already been accepted as 0ac0c0d but later reverted
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/linux/nodemask.h
+CONFLICT (content): Merge conflict in include/linux/nodemask.h
+Auto-merging kernel/fork.c
+CONFLICT (content): Merge conflict in kernel/fork.c
+Failed to merge in the changes.
+Patch failed at 0108 [This patch has already been accepted as 0ac0c0d but later reverted
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 7365aef Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: fix CONFIG_NUMA=y, MAX_NUMNODES>1 build
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Kosaki Motohiro raised a concern that copy_process is hot path and we do
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging kernel/cpuset.c
+CONFLICT (content): Merge conflict in kernel/cpuset.c
+Failed to merge in the changes.
+Patch failed at 0110 Kosaki Motohiro raised a concern that copy_process is hot path and we do
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 7365aef Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: make David happy
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Applying: No need to declare show_regs() in ptrace.h, sched.h does this.
+Applying: sys_ssetmask(), sys_rt_sigsuspend() and compat_sys_rt_sigsuspend()
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: If we don't know the file corresponding to the binary (i.e. exe_file is
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging fs/exec.c
+CONFLICT (content): Merge conflict in fs/exec.c
+Failed to merge in the changes.
+Patch failed at 0115 If we don't know the file corresponding to the binary (i.e. exe_file is
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 6a9e57b No need to declare show_regs() in ptrace.h, sched.h does this.
+Applying: Change every occurence of / in comm and hostname to !. If the process
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: do_coredump() assumes that if format_corename() fails it should return
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Signed-off-by: Daniel Rebelo de Oliveira <psykon@gmail.com>
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: a8bef8ff ("mm: migration: avoid race between shift_arg_pages() and
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Currently, search_binary_handler() tries to load binary loader module
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: If CONFIG_MODULES=n, it makes no sense to retry the list of binary formats
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: acct_arg_size() takes ->page_table_lock around add_mm_counter() if
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: If new_inode fails to allocate an inode we need only to return with NULL.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging ipc/mqueue.c
+CONFLICT (content): Merge conflict in ipc/mqueue.c
+Failed to merge in the changes.
+Patch failed at 0123 If new_inode fails to allocate an inode we need only to return with NULL.
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 6a9e57b No need to declare show_regs() in ptrace.h, sched.h does this.
+Applying: We return ENOMEM from mqueue_get_inode even when we have enough memory.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Add support for the shm_rmid_forced sysctl. If set to 1, all
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging Documentation/sysctl/kernel.txt
+CONFLICT (content): Merge conflict in Documentation/sysctl/kernel.txt
+Auto-merging include/linux/ipc_namespace.h
+CONFLICT (content): Merge conflict in include/linux/ipc_namespace.h
+Auto-merging include/linux/shm.h
+CONFLICT (content): Merge conflict in include/linux/shm.h
+Auto-merging ipc/ipc_sysctl.c
+CONFLICT (content): Merge conflict in ipc/ipc_sysctl.c
+Auto-merging ipc/shm.c
+CONFLICT (content): Merge conflict in ipc/shm.c
+Failed to merge in the changes.
+Patch failed at 0125 Add support for the shm_rmid_forced sysctl. If set to 1, all
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 6a9e57b No need to declare show_regs() in ptrace.h, sched.h does this.
+Applying: fix documentation, per Randy
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: include/linux/shm.h: In function 'exit_shm':
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: readability/conventionality tweaks
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: shm_may_destroy() and ipc_namespace.shm_forced_rmid lack comments.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/linux/ipc_namespace.h
+CONFLICT (content): Merge conflict in include/linux/ipc_namespace.h
+Auto-merging ipc/shm.c
+CONFLICT (content): Merge conflict in ipc/shm.c
+Failed to merge in the changes.
+Patch failed at 0129 shm_may_destroy() and ipc_namespace.shm_forced_rmid lack comments.
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 6a9e57b No need to declare show_regs() in ptrace.h, sched.h does this.
+Applying: - fix shm_rmid_forced/shm_forced_rmid confusion
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Cc: "Eric W. Biederman" <ebiederm@xmission.com>
+Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
+Applying: Update kernel-parameters.txt to point users to the authoritative comment
+Applying: Parameter offset_in_page in edac_mc_handle_ce() should mask the higher
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: When kernel BUG or oops occurs, ChromeOS intends to panic and immediately
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Don't force output if you intend to reboot immediately.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: With the arrival of concurrency-managed workqueues there is no need for
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/misc/vmw_balloon.c
+CONFLICT (content): Merge conflict in drivers/misc/vmw_balloon.c
+Failed to merge in the changes.
+Patch failed at 0137 With the arrival of concurrency-managed workqueues there is no need for
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f03ac9c Update kernel-parameters.txt to point users to the authoritative comment
+Applying: fix comment layout & grammar
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Use generic module parameters instead of platform data, if platform data
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/char/ramoops.c
+CONFLICT (content): Merge conflict in drivers/char/ramoops.c
+Failed to merge in the changes.
+Patch failed at 0139 Use generic module parameters instead of platform data, if platform data
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f03ac9c Update kernel-parameters.txt to point users to the authoritative comment
+Applying: ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Add new line to each print.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/char/ramoops.c
+CONFLICT (content): Merge conflict in drivers/char/ramoops.c
+Failed to merge in the changes.
+Patch failed at 0141 Add new line to each print.
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f03ac9c Update kernel-parameters.txt to point users to the authoritative comment
+Applying: The platform driver currently allows setting the mem_size and mem_address.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/char/ramoops.c
+CONFLICT (content): Merge conflict in drivers/char/ramoops.c
+Auto-merging include/linux/ramoops.h
+CONFLICT (content): Merge conflict in include/linux/ramoops.h
+Failed to merge in the changes.
+Patch failed at 0142 The platform driver currently allows setting the mem_size and mem_address.
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at f03ac9c Update kernel-parameters.txt to point users to the authoritative comment
+Applying: The size of the dump is currently set using the RECORD_SIZE macro which is
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: While ramoops writes to ram, accessing the dump requires using /dev/mem
+Applying: No need to include linux/kallsyms.h.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: should_fail_srandom() does not exist.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Minor cosmetic changes for simple attribute of stacktrace_depth:
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging lib/fault-inject.c
+CONFLICT (content): Merge conflict in lib/fault-inject.c
+Failed to merge in the changes.
+Patch failed at 0147 Minor cosmetic changes for simple attribute of stacktrace_depth:
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at ec84635 While ramoops writes to ram, accessing the dump requires using /dev/mem
+Applying: Use debugfs_remove_recursive() to simplify initialization and
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging mm/failslab.c
+CONFLICT (content): Merge conflict in mm/failslab.c
+Auto-merging mm/page_alloc.c
+CONFLICT (content): Merge conflict in mm/page_alloc.c
+Failed to merge in the changes.
+Patch failed at 0148 Use debugfs_remove_recursive() to simplify initialization and
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at ec84635 While ramoops writes to ram, accessing the dump requires using /dev/mem
+Applying: Now cleanup_fault_attr_dentries() recursively removes a directory, So we
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: Now cleanup_fault_attr_dentries() recursively removes a directory, So we
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: This changes should_fail_request() to more usable wrapper function of
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: The majority of architectures implement ext2 atomic bitops as
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: This allows us to move duplicated code in <asm/atomic.h>
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/asm-generic/atomic.h
+CONFLICT (content): Merge conflict in include/asm-generic/atomic.h
+Auto-merging include/linux/atomic.h
+CONFLICT (content): Merge conflict in include/linux/atomic.h
+Auto-merging include/linux/crypto.h
+CONFLICT (content): Merge conflict in include/linux/crypto.h
+Auto-merging include/net/lib80211.h
+CONFLICT (content): Merge conflict in include/net/lib80211.h
+Failed to merge in the changes.
+Patch failed at 0153 This allows us to move duplicated code in <asm/atomic.h>
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at ec84635 While ramoops writes to ram, accessing the dump requires using /dev/mem
+Applying: This is in preparation for more generic atomic
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: After changing all consumers of atomics to include
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: This clarifies the differences between <linux/atomic.h> and
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: We already declared inc/dec helpers, so we don't need to call the
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Applying: The atomic helpers are supposed to take an atomic_t pointer, not a random
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/asm-generic/atomic.h
+CONFLICT (content): Merge conflict in include/asm-generic/atomic.h
+Failed to merge in the changes.
+Patch failed at 0158 The atomic helpers are supposed to take an atomic_t pointer, not a random
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at ec84635 While ramoops writes to ram, accessing the dump requires using /dev/mem
+Applying: Since arches are expected to implement this guy, add a common version for
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/asm-generic/atomic.h
+Applying: Only a few core funcs need to be implemented for SMP systems, so allow the
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging include/asm-generic/atomic.h
+CONFLICT (content): Merge conflict in include/asm-generic/atomic.h
+Failed to merge in the changes.
+Patch failed at 0160 Only a few core funcs need to be implemented for SMP systems, so allow the
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To restore the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --skip
+HEAD is now at 9ae0dfa Since arches are expected to implement this guy, add a common version for
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm
+From ../rebase-tmp
+ + 49472be...9ae0dfa akpm -> akpm (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm
+$ git merge --no-ff akpm
+Removing arch/sparc/lib/usercopy.c
+Removing drivers/leds/leds-alix2.c
+Merge made by recursive.
+ Documentation/feature-removal-schedule.txt | 9 -
+ Documentation/frv/booting.txt | 13 +-
+ Documentation/kernel-parameters.txt | 1 +
+ Documentation/m68k/kernel-options.txt | 14 +
+ MAINTAINERS | 3 +-
+ arch/arm/include/asm/processor.h | 1 -
+ arch/arm/mach-ux500/mbox-db5500.c | 2 +-
+ arch/cris/arch-v10/drivers/sync_serial.c | 6 +-
+ arch/cris/arch-v10/kernel/irq.c | 3 +
+ arch/cris/include/asm/thread_info.h | 6 +-
+ arch/ia64/include/asm/processor.h | 1 -
+ arch/parisc/Kconfig | 1 +
+ arch/parisc/Kconfig.debug | 14 -
+ arch/parisc/include/asm/processor.h | 2 -
+ arch/parisc/kernel/process.c | 1 -
+ arch/s390/Kconfig | 1 +
+ arch/s390/Kconfig.debug | 14 -
+ arch/s390/include/asm/processor.h | 2 -
+ arch/s390/lib/Makefile | 1 -
+ arch/sparc/kernel/process_32.c | 3 +-
+ arch/sparc/kernel/process_64.c | 3 -
+ arch/sparc/lib/Makefile | 1 -
+ arch/sparc/lib/usercopy.c | 8 -
+ arch/tile/Kconfig | 8 +-
+ arch/tile/include/asm/uaccess.h | 7 +-
+ arch/tile/lib/uaccess.c | 8 -
+ arch/unicore32/include/asm/processor.h | 1 -
+ arch/x86/Kconfig | 15 +
+ arch/x86/Kconfig.debug | 14 -
+ arch/x86/include/asm/uaccess_64.h | 12 +-
+ arch/x86/kernel/e820.c | 59 +-
+ arch/x86/lib/usercopy_32.c | 6 -
+ arch/x86/mm/mmap.c | 4 +-
+ arch/x86/platform/Makefile | 1 +
+ arch/x86/platform/geode/Makefile | 1 +
+ arch/x86/platform/geode/alix.c | 141 +++
+ arch/x86/platform/iris/iris.c | 67 +-
+ block/genhd.c | 8 +-
+ drivers/acpi/osl.c | 8 +-
+ drivers/block/brd.c | 2 +-
+ drivers/block/drbd/drbd_nl.c | 4 +-
+ drivers/cdrom/cdrom.c | 8 +-
+ drivers/char/ramoops.c | 113 ++-
+ drivers/connector/cn_proc.c | 8 +-
+ drivers/firmware/dmi_scan.c | 6 +-
+ drivers/idle/intel_idle.c | 59 +-
+ drivers/iommu/dmar.c | 7 +-
+ drivers/iommu/intel-iommu.c | 177 ++++-
+ drivers/leds/Kconfig | 8 -
+ drivers/leds/Makefile | 1 -
+ drivers/leds/leds-alix2.c | 239 -----
+ drivers/pci/probe.c | 8 +-
+ drivers/platform/x86/acerhdf.c | 1 +
+ drivers/scsi/aacraid/commctrl.c | 1 +
+ drivers/scsi/megaraid.c | 8 +-
+ drivers/staging/dt3155v4l/dt3155v4l.c | 1 +
+ drivers/staging/solo6x10/core.c | 1 +
+ drivers/staging/solo6x10/enc.c | 1 +
+ drivers/staging/solo6x10/g723.c | 1 +
+ drivers/staging/solo6x10/p2m.c | 1 +
+ drivers/staging/speakup/devsynth.c | 5 +-
+ drivers/thermal/Kconfig | 8 +-
+ drivers/thermal/thermal_sys.c | 142 ++-
+ drivers/video/backlight/Kconfig | 2 +-
+ drivers/video/backlight/aat2870_bl.c | 8 +-
+ drivers/video/fbmem.c | 24 +-
+ fs/Kconfig | 15 +-
+ fs/btrfs/inode.c | 3 +-
+ fs/ext4/ext4.h | 7 +-
+ fs/ext4/ialloc.c | 4 +-
+ fs/ocfs2/ocfs2.h | 47 +
+ fs/ocfs2/quota_local.c | 10 +-
+ fs/stack.c | 5 +-
+ include/asm-generic/atomic.h | 16 +
+ include/linux/acpi.h | 1 -
+ include/linux/dmar.h | 5 +
+ include/linux/jiffies.h | 2 +-
+ include/linux/memcontrol.h | 8 -
+ include/linux/mfd/aat2870.h | 2 +-
+ include/linux/radix-tree.h | 36 +-
+ include/linux/shmem_fs.h | 17 +-
+ include/linux/swapops.h | 23 +
+ include/linux/thermal.h | 22 -
+ include/scsi/scsi_netlink.h | 2 +-
+ init/do_mounts.c | 40 +-
+ init/main.c | 2 +-
+ ipc/shm.c | 2 +-
+ kernel/audit.c | 5 +-
+ kernel/irq/generic-chip.c | 4 +-
+ kernel/kprobes.c | 2 +-
+ kernel/time.c | 2 +-
+ lib/Kconfig.debug | 18 +
+ lib/Makefile | 1 +
+ lib/radix-tree.c | 29 +-
+ {arch/s390/lib => lib}/usercopy.c | 0
+ mm/filemap.c | 74 +-
+ mm/memcontrol.c | 68 +--
+ mm/mincore.c | 10 +-
+ mm/shmem.c | 1517 ++++++++++------------------
+ mm/slab.c | 2 +-
+ mm/slub.c | 1 +
+ mm/swapfile.c | 20 +-
+ mm/truncate.c | 8 +
+ 103 files changed, 1630 insertions(+), 1714 deletions(-)
+ delete mode 100644 arch/sparc/lib/usercopy.c
+ create mode 100644 arch/x86/platform/geode/Makefile
+ create mode 100644 arch/x86/platform/geode/alix.c
+ delete mode 100644 drivers/leds/leds-alix2.c
+ rename {arch/s390/lib => lib}/usercopy.c (100%)
+$ git am -3 ../patches/0001-pci-of-include-export.h-for-EXPORT_SYMBOL_GPL.patch
+Applying: pci/of: include export.h for EXPORT_SYMBOL_GPL
+$ git am -3 ../patches/0001-powerpc32-include-export.h-for-EXPORT_SYMBOL.patch
+Applying: powerpc32: include export.h for EXPORT_SYMBOL
+$ git am -3 ../patches/0001-ksysfs-include-sta.h-for-S_IRUGO.patch
+Applying: ksysfs: include stat.h for S_IRUGO
+$ git am -3 ../patches/0001-powerpc-44x-include-export.h-for-EXPORT_SYMBOL.patch
+Applying: powerpc/44x: include export.h for EXPORT_SYMBOL
+$ git am -3 ../patches/0001-dmaengine.h-needs-bitmap.h.patch
+Applying: dmaengine.h needs bitmap.h
projects / karo-tx-linux.git / commitdiff