--- /dev/null
+$ date
+Thu Aug 4 10:42:06 EST 2011
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at c027a47 oom: task->mm == NULL doesn't mean the memory was freed
+Merging origin/master
+$ git merge origin/master
+Updating c027a47..ed8f373
+Fast-forward
+ Documentation/device-mapper/dm-crypt.txt | 21 +-
+ Documentation/device-mapper/dm-flakey.txt | 48 ++-
+ Documentation/device-mapper/dm-raid.txt | 138 ++++---
+ MAINTAINERS | 1 +
+ drivers/input/serio/xilinx_ps2.c | 2 +-
+ drivers/md/Kconfig | 5 +-
+ drivers/md/dm-crypt.c | 62 +++-
+ drivers/md/dm-flakey.c | 270 +++++++++++--
+ drivers/md/dm-io.c | 29 ++-
+ drivers/md/dm-ioctl.c | 89 +++--
+ drivers/md/dm-kcopyd.c | 42 ++-
+ drivers/md/dm-log-userspace-base.c | 3 +-
+ drivers/md/dm-log.c | 32 +-
+ drivers/md/dm-mpath.c | 147 ++-----
+ drivers/md/dm-raid.c | 621 ++++++++++++++++++++++++++---
+ drivers/md/dm-snap-persistent.c | 80 ++--
+ drivers/md/dm-snap.c | 84 +++-
+ drivers/md/dm-table.c | 155 ++++++--
+ drivers/md/dm.c | 75 ++++-
+ drivers/md/dm.h | 2 +
+ drivers/of/address.c | 2 +-
+ drivers/of/base.c | 7 +-
+ drivers/spi/spi-pl022.c | 11 +-
+ drivers/watchdog/Kconfig | 3 -
+ drivers/watchdog/nv_tco.c | 8 +
+ drivers/watchdog/shwdt.c | 2 +-
+ fs/btrfs/Makefile | 4 +-
+ fs/btrfs/acl.c | 17 -
+ fs/btrfs/compression.c | 14 +-
+ fs/btrfs/ctree.h | 30 +-
+ fs/btrfs/dir-item.c | 30 +--
+ fs/btrfs/extent-tree.c | 45 ++-
+ fs/btrfs/extent_io.c | 139 ++-----
+ fs/btrfs/extent_io.h | 20 +-
+ fs/btrfs/extent_map.c | 155 +++-----
+ fs/btrfs/file-item.c | 7 +-
+ fs/btrfs/file.c | 21 +-
+ fs/btrfs/inode.c | 98 +++--
+ fs/btrfs/ioctl.c | 3 +-
+ fs/btrfs/ref-cache.c | 68 ----
+ fs/btrfs/ref-cache.h | 52 ---
+ fs/btrfs/root-tree.c | 5 +-
+ fs/btrfs/transaction.c | 65 +---
+ fs/btrfs/tree-log.c | 12 +-
+ fs/btrfs/volumes.c | 12 +-
+ include/linux/device-mapper.h | 43 ++
+ include/linux/dm-ioctl.h | 4 +-
+ include/linux/dm-kcopyd.h | 15 +
+ include/linux/of.h | 15 +-
+ sound/core/pcm_compat.c | 2 +-
+ sound/core/rtctimer.c | 2 +-
+ sound/pci/asihpi/hpidspcd.c | 9 +-
+ sound/pci/asihpi/hpioctl.c | 19 +-
+ sound/pci/rme9652/hdspm.c | 109 +++++-
+ sound/soc/txx9/txx9aclc.c | 1 +
+ 55 files changed, 1986 insertions(+), 969 deletions(-)
+ delete mode 100644 fs/btrfs/ref-cache.c
+ delete mode 100644 fs/btrfs/ref-cache.h
+Merging fixes/fixes
+$ git merge fixes/fixes
+Merge made by recursive.
+ drivers/char/tpm/tpm_tis.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+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
+Merge made by recursive.
+ arch/sparc/include/asm/elf_64.h | 65 ++++++++---------
+ arch/sparc/kernel/cpu.c | 1 +
+ arch/sparc/kernel/kernel.h | 6 ++
+ arch/sparc/kernel/setup_64.c | 149 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 185 insertions(+), 36 deletions(-)
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net-current/master
+$ git merge net-current/master
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ Documentation/networking/bonding.txt | 2 +-
+ MAINTAINERS | 10 +-
+ drivers/connector/cn_proc.c | 8 +-
+ drivers/net/bnx2x/bnx2x_cmn.c | 10 ++-
+ drivers/net/bnx2x/bnx2x_hsi.h | 2 +
+ drivers/net/bnx2x/bnx2x_link.c | 218 +++++++++++++++++++++++-----------
+ drivers/net/bnx2x/bnx2x_link.h | 3 +-
+ drivers/net/bnx2x/bnx2x_reg.h | 6 +-
+ drivers/net/niu.c | 4 +-
+ drivers/net/r8169.c | 28 +++++
+ drivers/net/sis190.c | 12 ++-
+ include/net/cipso_ipv4.h | 2 +-
+ include/net/netlabel.h | 2 +-
+ net/atm/br2684.c | 2 -
+ net/core/skbuff.c | 17 +++-
+ net/ipv4/igmp.c | 2 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 1 +
+ net/netlabel/Makefile | 2 -
+ net/netlabel/netlabel_addrlist.c | 2 +-
+ net/netlabel/netlabel_addrlist.h | 2 +-
+ net/netlabel/netlabel_cipso_v4.c | 2 +-
+ net/netlabel/netlabel_cipso_v4.h | 2 +-
+ net/netlabel/netlabel_domainhash.c | 2 +-
+ net/netlabel/netlabel_domainhash.h | 2 +-
+ net/netlabel/netlabel_kapi.c | 2 +-
+ net/netlabel/netlabel_mgmt.c | 2 +-
+ net/netlabel/netlabel_mgmt.h | 2 +-
+ net/netlabel/netlabel_unlabeled.c | 2 +-
+ net/netlabel/netlabel_unlabeled.h | 2 +-
+ net/netlabel/netlabel_user.c | 2 +-
+ net/netlabel/netlabel_user.h | 2 +-
+ net/sched/sch_sfq.c | 7 +-
+ net/sunrpc/xprt.c | 1 +
+ net/xfrm/xfrm_algo.c | 4 +-
+ security/selinux/hooks.c | 2 +-
+ security/selinux/include/netif.h | 2 +-
+ security/selinux/include/netlabel.h | 2 +-
+ security/selinux/include/netnode.h | 2 +-
+ security/selinux/include/netport.h | 2 +-
+ security/selinux/netif.c | 2 +-
+ security/selinux/netlabel.c | 2 +-
+ security/selinux/netnode.c | 2 +-
+ security/selinux/netport.c | 2 +-
+ security/selinux/selinuxfs.c | 2 +-
+ security/selinux/ss/ebitmap.c | 2 +-
+ security/selinux/ss/mls.c | 2 +-
+ security/selinux/ss/mls.h | 2 +-
+ security/selinux/ss/policydb.c | 2 +-
+ security/selinux/ss/services.c | 2 +-
+ security/smack/smack_lsm.c | 2 +-
+ 50 files changed, 273 insertions(+), 128 deletions(-)
+Merging sound-current/for-linus
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus
+$ git merge pci-current/for-linus
+Merge made by recursive.
+ arch/x86/pci/acpi.c | 9 ++
+ drivers/pci/hotplug/pcihp_slot.c | 45 +----------
+ drivers/pci/pci.c | 67 +++++++++++++++
+ drivers/pci/pci.h | 4 +
+ drivers/pci/probe.c | 146 +++++++++++++++++++++++++++++++++
+ drivers/pci/setup-bus.c | 166 ++++++++++++++++++++++++++-----------
+ drivers/pci/setup-res.c | 152 ++++++++++++++++++++++-------------
+ include/linux/pci.h | 16 ++++-
+ 8 files changed, 453 insertions(+), 152 deletions(-)
+Merging wireless-current/master
+$ git merge wireless-current/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus
+$ git merge usb.current/usb-linus
+Merge made by recursive.
+ drivers/usb/core/config.c | 11 ++--
+ drivers/usb/gadget/Kconfig | 2 +-
+ drivers/usb/gadget/composite.c | 6 ++-
+ drivers/usb/gadget/f_hid.c | 7 +++
+ drivers/usb/gadget/fusb300_udc.c | 101 --------------------------------------
+ drivers/usb/gadget/s3c2410_udc.c | 1 +
+ drivers/usb/host/ehci-omap.c | 16 ++++++
+ drivers/usb/host/pci-quirks.c | 2 +-
+ drivers/usb/host/xhci.c | 19 +++++--
+ drivers/usb/musb/Kconfig | 3 -
+ drivers/usb/musb/musb_gadget.c | 5 ++
+ drivers/usb/musb/tusb6010_omap.c | 2 +-
+ 12 files changed, 56 insertions(+), 119 deletions(-)
+Merging staging.current/staging-linus
+$ git merge staging.current/staging-linus
+Auto-merging drivers/staging/zcache/zcache-main.c
+Merge made by recursive.
+ .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 2 +-
+ drivers/staging/dt3155v4l/dt3155v4l.c | 1 +
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 1 +
+ drivers/staging/gma500/gem_glue.c | 23 +-------------------
+ drivers/staging/gma500/gem_glue.h | 2 -
+ drivers/staging/hv/blkvsc_drv.c | 4 +-
+ drivers/staging/iio/accel/adis16203_core.c | 8 +++++-
+ drivers/staging/iio/accel/adis16204_core.c | 8 +++++-
+ drivers/staging/iio/accel/adis16209_core.c | 8 +++++-
+ drivers/staging/iio/accel/adis16240_core.c | 8 +++++-
+ drivers/staging/iio/gyro/adis16260_core.c | 8 +++++-
+ drivers/staging/nvec/TODO | 6 +++-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 9 ++-----
+ 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/staging/zcache/Makefile | 2 +-
+ drivers/staging/zcache/{zcache.c => zcache-main.c} | 4 +++
+ 20 files changed, 55 insertions(+), 48 deletions(-)
+ rename drivers/staging/zcache/{zcache.c => zcache-main.c} (99%)
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Already up-to-date.
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Merge made by recursive.
+ .../devicetree/bindings/gpio/gpio_keys.txt | 2 +-
+ .../devicetree/bindings/input/fsl-mma8450.txt | 11 +++++++++++
+ drivers/input/keyboard/gpio_keys.c | 2 +-
+ drivers/input/keyboard/lm8323.c | 9 +++++++--
+ drivers/input/keyboard/tegra-kbc.c | 5 +++--
+ drivers/input/misc/kxtj9.c | 1 +
+ drivers/input/misc/mma8450.c | 8 ++++++++
+ drivers/input/mouse/hgpk.c | 1 +
+ drivers/input/touchscreen/ad7879.c | 4 +++-
+ 9 files changed, 36 insertions(+), 7 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/fsl-mma8450.txt
+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 7dd2740] 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-imx/mm-imx25.c' using previous resolution.
+Resolved 'arch/arm/mach-imx/mm-imx31.c' using previous resolution.
+Resolved 'arch/arm/mach-imx/mm-imx35.c' using previous resolution.
+Resolved 'arch/arm/mach-mx5/mm.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-imx/mm-imx25.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx25.c
+Auto-merging arch/arm/mach-imx/mm-imx31.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx31.c
+Auto-merging arch/arm/mach-imx/mm-imx35.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx35.c
+Auto-merging arch/arm/mach-mx5/mm.c
+CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.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 fad3649] 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
+Resolved 'arch/arm/mach-msm/io.c' using previous resolution.
+Auto-merging arch/arm/mach-msm/Makefile
+Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
+Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
+Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+Auto-merging arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
+Auto-merging arch/arm/mach-msm/io.c
+CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3a72a5f] Merge remote-tracking branch 'msm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ 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 8d6caf9] 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
+Already up-to-date.
+Merging m68k/for-next
+$ git merge m68k/for-next
+Already up-to-date.
+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/alchemy/common/platform.c | 2 +-
+ arch/mips/alchemy/common/power.c | 22 ++-
+ 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 +--
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 -
+ 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/lantiq/irq.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/mm/tlbex.c | 3 +-
+ 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-lantiq.c | 9 +-
+ 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 +-
+ 47 files changed, 204 insertions(+), 371 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
+Auto-merging arch/parisc/include/asm/atomic.h
+Merge made by recursive.
+ arch/parisc/include/asm/atomic.h | 4 +-
+ arch/parisc/include/asm/futex.h | 66 ++++++++++++++++++++++++++++++++---
+ arch/parisc/include/asm/unistd.h | 3 +-
+ arch/parisc/kernel/syscall_table.S | 1 +
+ 4 files changed, 65 insertions(+), 9 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/Kconfig | 8 ++--
+ arch/s390/include/asm/ipl.h | 1 +
+ arch/s390/include/asm/lowcore.h | 11 ++++-
+ arch/s390/include/asm/processor.h | 2 -
+ arch/s390/include/asm/system.h | 1 +
+ arch/s390/kernel/asm-offsets.c | 10 ++---
+ arch/s390/kernel/base.S | 36 ++++++++++++++++
+ arch/s390/kernel/compat_signal.c | 43 ++++++--------------
+ 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 | 25 +++++++++++-
+ arch/s390/kernel/signal.c | 61 +++++++++-------------------
+ arch/s390/kernel/smp.c | 24 +++++++----
+ arch/s390/mm/maccess.c | 16 +++++++
+ arch/s390/mm/pgtable.c | 1 +
+ drivers/s390/block/dasd.c | 9 ++--
+ drivers/s390/block/dasd_eckd.c | 9 ++++
+ drivers/s390/block/dasd_proc.c | 4 +-
+ drivers/s390/char/sclp_async.c | 9 +---
+ drivers/s390/cio/qdio.h | 2 +
+ drivers/s390/cio/qdio_debug.c | 12 +----
+ drivers/s390/cio/qdio_main.c | 21 ++++++++-
+ 24 files changed, 337 insertions(+), 141 deletions(-)
+Merging sh/sh-latest
+$ git merge sh/sh-latest
+Merge made by recursive.
+ arch/sh/include/asm/ptrace.h | 2 +-
+ drivers/tty/serial/sh-sci.c | 71 +++++++++++++++++++++++++++++++++++------
+ 2 files changed, 61 insertions(+), 12 deletions(-)
+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/fixmap.h | 6 -
+ 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 +-
+ arch/tile/mm/init.c | 3 +-
+ drivers/char/Kconfig | 11 +
+ drivers/char/Makefile | 2 +
+ drivers/char/tile-srom.c | 481 +++++++++++++++++++++++++++++
+ 46 files changed, 576 insertions(+), 49 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 208dbc4] 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/cifs_dfs_ref.c | 5 +++--
+ fs/cifs/dns_resolve.c | 4 ++--
+ fs/cifs/sess.c | 3 +--
+ fs/cifs/transport.c | 2 ++
+ 4 files changed, 8 insertions(+), 6 deletions(-)
+Merging configfs/linux-next
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev
+$ git merge ext4/dev
+Already up-to-date.
+Merging fatfs/master
+$ git merge fatfs/master
+Already up-to-date.
+Merging fuse/for-next
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master
+$ git merge gfs2/master
+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
+Merge made by recursive.
+ fs/jfs/jfs_umount.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+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 f744349] 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/block_dev.c | 4 ++
+ fs/namei.c | 17 ++++-------
+ include/linux/posix_acl.h | 74 ++++++++++++++++-----------------------------
+ 3 files changed, 36 insertions(+), 59 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
+Already up-to-date.
+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
+Already up-to-date.
+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
+Already up-to-date.
+Merging kbuild/for-next
+$ git merge kbuild/for-next
+Merge made by recursive.
+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
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging arch/s390/Kconfig
+Merge made by recursive.
+ Documentation/acpi/apei/einj.txt | 11 +-
+ Documentation/feature-removal-schedule.txt | 9 -
+ 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 | 43 ++--
+ drivers/acpi/apei/erst-dbg.c | 6 +-
+ drivers/acpi/apei/erst.c | 12 +-
+ drivers/acpi/apei/ghes.c | 431 ++++++++++++++++++++++++++--
+ 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 | 25 ++-
+ 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/sleep.c | 16 +
+ drivers/acpi/sysfs.c | 4 +-
+ drivers/acpi/thermal.c | 2 +-
+ drivers/acpi/video.c | 2 +-
+ drivers/ata/libata-acpi.c | 4 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 2 +-
+ drivers/thermal/Kconfig | 8 +-
+ drivers/thermal/thermal_sys.c | 142 +++++++--
+ 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 | 3 +-
+ include/linux/bitmap.h | 1 +
+ include/linux/genalloc.h | 34 ++-
+ include/linux/llist.h | 126 ++++++++
+ include/linux/mm.h | 1 +
+ include/linux/thermal.h | 22 --
+ lib/Kconfig | 2 +
+ lib/Makefile | 2 +
+ lib/bitmap.c | 2 -
+ lib/genalloc.c | 300 ++++++++++++++++----
+ lib/llist.c | 129 +++++++++
+ mm/memory-failure.c | 92 ++++++
+ 64 files changed, 1523 insertions(+), 267 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 Documentation/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/sh/kernel/idle.c
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 3 +
+ MAINTAINERS | 6 +
+ arch/arm/kernel/process.c | 4 +-
+ arch/sh/kernel/idle.c | 6 +-
+ arch/x86/include/asm/processor.h | 2 -
+ arch/x86/kernel/acpi/cstate.c | 23 +
+ arch/x86/kernel/process.c | 23 -
+ arch/x86/kernel/process_32.c | 4 +-
+ arch/x86/kernel/process_64.c | 4 +-
+ arch/x86/platform/mrst/Makefile | 1 +
+ arch/x86/platform/mrst/pmu.c | 817 +++++++++++++++++++++++++++++++++++
+ arch/x86/platform/mrst/pmu.h | 234 ++++++++++
+ arch/x86/xen/setup.c | 3 +-
+ drivers/cpuidle/cpuidle.c | 50 ++-
+ drivers/cpuidle/cpuidle.h | 1 +
+ drivers/cpuidle/driver.c | 3 +
+ drivers/cpuidle/governor.c | 3 +
+ include/linux/cpuidle.h | 4 +
+ 18 files changed, 1141 insertions(+), 50 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.
+ tools/power/x86/turbostat/turbostat.c | 46 ++++++++++----------
+ .../x86_energy_perf_policy.c | 5 +-
+ 2 files changed, 25 insertions(+), 26 deletions(-)
+Merging cpupowerutils/master
+$ git merge cpupowerutils/master
+Already up-to-date.
+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
+Already up-to-date.
+Merging iscsi-target/for-next
+$ git merge iscsi-target/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/target/tcm_fc/tfc_cmd.c
+Auto-merging drivers/target/tcm_fc/tfc_io.c
+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 | 33 +++++++-
+ drivers/target/tcm_fc/tcm_fc.h | 5 +
+ drivers/target/tcm_fc/tfc_cmd.c | 1 +
+ drivers/target/tcm_fc/tfc_io.c | 121 +++++++++++++++-----------
+ 9 files changed, 122 insertions(+), 59 deletions(-)
+Merging slave-dma/next
+$ git merge slave-dma/next
+Already up-to-date.
+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
+Auto-merging drivers/net/wireless/ath/ath9k/init.c
+Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c
+Merge made by recursive.
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 +-----
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 6 +-----
+ drivers/net/wireless/ath/ath9k/hw.c | 11 +++++++++--
+ drivers/net/wireless/ath/ath9k/hw.h | 3 ++-
+ drivers/net/wireless/ath/ath9k/init.c | 2 ++
+ drivers/net/wireless/ath/ath9k/pci.c | 27 +++++++++++++++++++++++++++
+ drivers/net/wireless/iwlegacy/iwl-3945.c | 6 +++++-
+ drivers/net/wireless/iwlegacy/iwl-4965.c | 8 ++++++--
+ drivers/net/wireless/iwlwifi/iwl-5000.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-core.h | 2 ++
+ drivers/net/wireless/iwlwifi/iwl-pci.c | 18 +++++++++---------
+ drivers/net/wireless/iwlwifi/iwl-power.c | 3 ++-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 3 +--
+ drivers/net/wireless/rt2x00/rt2x00lib.h | 3 ++-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 5 +++--
+ drivers/net/wireless/rtlwifi/pci.c | 20 +++++++++++---------
+ net/wireless/nl80211.c | 2 +-
+ 17 files changed, 85 insertions(+), 41 deletions(-)
+Merging bluetooth/master
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/hci_core.c
+Auto-merging net/bluetooth/l2cap_core.c
+Merge made by recursive.
+ drivers/bluetooth/ath3k.c | 1 +
+ drivers/bluetooth/btusb.c | 4 +-
+ include/net/bluetooth/l2cap.h | 3 +-
+ net/bluetooth/af_bluetooth.c | 36 +++++-
+ net/bluetooth/bnep/core.c | 11 ++-
+ net/bluetooth/cmtp/core.c | 11 ++-
+ net/bluetooth/hci_conn.c | 14 +-
+ net/bluetooth/hci_core.c | 6 +-
+ net/bluetooth/hidp/core.c | 10 ++-
+ net/bluetooth/l2cap_core.c | 263 ++++++++++++++---------------------------
+ net/bluetooth/l2cap_sock.c | 30 +++---
+ net/bluetooth/rfcomm/core.c | 22 ++--
+ net/bluetooth/rfcomm/sock.c | 28 ++--
+ net/bluetooth/sco.c | 28 ++--
+ 14 files changed, 214 insertions(+), 253 deletions(-)
+Merging mtd/master
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master
+$ git merge l2-mtd/master
+Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution.
+Resolved 'drivers/mtd/maps/pxa2xx-flash.c' using previous resolution.
+Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c
+Auto-merging arch/arm/mach-at91/board-cam60.c
+Auto-merging arch/arm/mach-at91/board-cap9adk.c
+Auto-merging arch/arm/mach-at91/board-kb9202.c
+Auto-merging arch/arm/mach-at91/board-neocore926.c
+Auto-merging arch/arm/mach-at91/board-qil-a9260.c
+Auto-merging arch/arm/mach-at91/board-rm9200dk.c
+Auto-merging arch/arm/mach-at91/board-sam9-l9260.c
+Auto-merging arch/arm/mach-at91/board-sam9260ek.c
+Auto-merging arch/arm/mach-at91/board-sam9261ek.c
+Auto-merging arch/arm/mach-at91/board-sam9263ek.c
+Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
+Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
+Auto-merging arch/arm/mach-at91/board-sam9rlek.c
+Auto-merging arch/arm/mach-at91/board-snapper9260.c
+Auto-merging arch/arm/mach-at91/board-usb-a9260.c
+Auto-merging arch/arm/mach-at91/board-usb-a9263.c
+Auto-merging arch/arm/mach-at91/board-yl-9200.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
+[master bee4051] 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
+Already up-to-date!
+Merge made by recursive.
+Merging sound-asoc/for-next
+$ git merge sound-asoc/for-next
+Merge made by recursive.
+ sound/soc/codecs/sgtl5000.c | 128 ++++++++++++-------------------------------
+ sound/soc/codecs/wm_hubs.c | 3 +-
+ 2 files changed, 36 insertions(+), 95 deletions(-)
+Merging cpufreq/next
+$ git merge cpufreq/next
+Already up-to-date.
+Merging quilt/rr
+$ git merge quilt/rr
+Merge made by recursive.
+ Documentation/virtual/00-INDEX | 3 +
+ Documentation/virtual/lguest/lguest.c | 3 +
+ Documentation/virtual/virtio-spec.txt | 2200 +++++++++++++++++++++++++++++++++
+ arch/x86/lguest/boot.c | 10 +
+ drivers/lguest/core.c | 2 +-
+ 5 files changed, 2217 insertions(+), 1 deletions(-)
+ create mode 100644 Documentation/virtual/virtio-spec.txt
+Merging input/next
+$ git merge input/next
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging drivers/input/misc/Makefile
+Merge made by recursive.
+ drivers/input/misc/Kconfig | 34 +++--
+ drivers/input/misc/Makefile | 3 +-
+ drivers/input/misc/pm8xxx-vibrator.c | 296 ++++++++++++++++++++++++++++++++++
+ 3 files changed, 321 insertions(+), 12 deletions(-)
+ create mode 100644 drivers/input/misc/pm8xxx-vibrator.c
+Merging input-mt/next
+$ git merge input-mt/next
+Already up-to-date.
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 9 +-
+ block/Kconfig | 10 ++
+ block/Makefile | 1 +
+ block/blk-throttle.c | 4 +-
+ block/bsg-lib.c | 298 +++++++++++++++++++++++++++++++++++
+ block/cfq-iosched.c | 3 +
+ block/genhd.c | 8 +-
+ drivers/block/Kconfig | 15 ++
+ drivers/block/drbd/drbd_nl.c | 4 +-
+ drivers/block/loop.c | 297 ++++++++++++++++++++++++-----------
+ drivers/cdrom/cdrom.c | 8 +-
+ include/linux/blkdev.h | 4 +
+ include/linux/bsg-lib.h | 73 +++++++++
+ include/linux/loop.h | 5 +-
+ include/linux/miscdevice.h | 1 +
+ 15 files changed, 636 insertions(+), 104 deletions(-)
+ create mode 100644 block/bsg-lib.c
+ create mode 100644 include/linux/bsg-lib.h
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Merge made by recursive.
+ Documentation/device-mapper/persistent-data.txt | 84 +
+ Documentation/device-mapper/thin-provisioning.txt | 274 +++
+ drivers/md/Kconfig | 9 +
+ drivers/md/Makefile | 3 +
+ drivers/md/dm-kcopyd.c | 31 +-
+ drivers/md/dm-table.c | 22 +
+ drivers/md/dm-thin-metadata.c | 1373 ++++++++++++
+ drivers/md/dm-thin-metadata.h | 165 ++
+ drivers/md/dm-thin.c | 2207 ++++++++++++++++++++
+ drivers/md/dm.c | 1 +
+ drivers/md/persistent-data/Kconfig | 7 +
+ drivers/md/persistent-data/Makefile | 9 +
+ drivers/md/persistent-data/dm-block-manager.c | 985 +++++++++
+ drivers/md/persistent-data/dm-block-manager.h | 134 ++
+ drivers/md/persistent-data/dm-btree-internal.h | 133 ++
+ drivers/md/persistent-data/dm-btree-remove.c | 571 +++++
+ drivers/md/persistent-data/dm-btree-spine.c | 222 ++
+ drivers/md/persistent-data/dm-btree.c | 858 ++++++++
+ drivers/md/persistent-data/dm-btree.h | 158 ++
+ .../persistent-data/dm-persistent-data-internal.h | 20 +
+ drivers/md/persistent-data/dm-space-map-common.h | 94 +
+ drivers/md/persistent-data/dm-space-map-disk.c | 663 ++++++
+ drivers/md/persistent-data/dm-space-map-disk.h | 25 +
+ drivers/md/persistent-data/dm-space-map-metadata.c | 956 +++++++++
+ drivers/md/persistent-data/dm-space-map-metadata.h | 33 +
+ drivers/md/persistent-data/dm-space-map.h | 118 ++
+ .../md/persistent-data/dm-transaction-manager.c | 414 ++++
+ .../md/persistent-data/dm-transaction-manager.h | 130 ++
+ include/linux/device-mapper.h | 18 +-
+ include/linux/dm-kcopyd.h | 4 +
+ 30 files changed, 9712 insertions(+), 9 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
+Already up-to-date.
+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 2b5287b] Merge remote-tracking branch 'leds/for-mm'
+$ git diff -M --stat --summary HEAD^..
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Already up-to-date.
+Merging mmc/mmc-next
+$ git merge mmc/mmc-next
+Resolved 'drivers/mmc/host/sdhci-esdhc-imx.c' using previous resolution.
+Auto-merging drivers/mmc/host/dw_mmc.c
+Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-esdhc-imx.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8bb109d] Merge remote-tracking branch 'mmc/mmc-next'
+$ git diff -M --stat --summary HEAD^..
+ 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/dw_mmc.c | 2 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 43 ++++++++++++++++++++++------
+ drivers/mmc/host/sdhci-pxav3.c | 3 +-
+ drivers/mmc/host/sdhci-s3c.c | 4 ++
+ drivers/mmc/host/sdhci.c | 53 +++++++++++++++------------------
+ drivers/mmc/host/tmio_mmc.c | 2 -
+ 10 files changed, 109 insertions(+), 70 deletions(-)
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Merge made by recursive.
+Merging slab/for-next
+$ git merge slab/for-next
+Already up-to-date!
+Merge made by recursive.
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Merge made by recursive.
+ drivers/md/md.c | 12 +++++++++++-
+ drivers/md/raid5.c | 6 ++----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+Merging mfd/for-next
+$ git merge mfd/for-next
+Already up-to-date.
+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
+Already up-to-date.
+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
+Recorded preimage for 'drivers/watchdog/nv_tco.c'
+Auto-merging drivers/watchdog/nv_tco.c
+CONFLICT (content): Merge conflict in drivers/watchdog/nv_tco.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/watchdog/nv_tco.c'.
+[master 085eca5] Merge remote-tracking branch 'watchdog/master'
+$ git diff -M --stat --summary HEAD^..
+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
+Merge made by recursive.
+ drivers/of/base.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/of/fdt.c | 4 +-
+ include/linux/of.h | 8 +++
+ include/linux/of_fdt.h | 1 -
+ 4 files changed, 141 insertions(+), 2 deletions(-)
+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.
+Merging rcu/rcu/next
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging kvm/linux-next
+$ git merge kvm/linux-next
+Merge made by recursive.
+ arch/x86/kvm/Kconfig | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+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
+Auto-merging arch/x86/xen/setup.c
+Auto-merging drivers/block/Kconfig
+Merge made by recursive.
+ arch/x86/include/asm/io.h | 2 +
+ arch/x86/xen/Makefile | 2 +-
+ arch/x86/xen/setup.c | 10 +-
+ drivers/block/Kconfig | 2 +-
+ drivers/block/xen-blkback/blkback.c | 18 ++--
+ drivers/block/xen-blkback/common.h | 5 +
+ drivers/block/xen-blkback/xenbus.c | 203 +++++++++++++++++++++++++++++++----
+ drivers/block/xen-blkfront.c | 15 ++--
+ drivers/xen/Kconfig | 2 +-
+ 9 files changed, 213 insertions(+), 46 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
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+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
+[master 0559fe5] 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
+Resolved 'drivers/dma/ste_dma40.c' using previous resolution.
+Resolved 'drivers/staging/dt3155v4l/dt3155v4l.c' using previous resolution.
+Auto-merging arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-msm/io.c
+Auto-merging arch/arm/mach-omap2/display.c
+Auto-merging arch/mips/kernel/traps.c
+Auto-merging arch/sparc/kernel/cpu.c
+Auto-merging arch/sparc/kernel/setup_64.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/dma/ipu/ipu_idmac.c
+Auto-merging drivers/dma/ste_dma40.c
+CONFLICT (content): Merge conflict in drivers/dma/ste_dma40.c
+Auto-merging drivers/input/touchscreen/ad7879.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/raid5.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-pxav3.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/cmx270_nand.c
+Auto-merging drivers/mtd/nand/diskonchip.c
+Auto-merging drivers/mtd/nand/nand_bbt.c
+Auto-merging drivers/mtd/nand/omap2.c
+Auto-merging drivers/mtd/onenand/onenand_bbt.c
+Auto-merging drivers/mtd/redboot.c
+Auto-merging drivers/pci/hotplug/pcihp_slot.c
+Auto-merging drivers/pci/setup-res.c
+Auto-merging drivers/pcmcia/pxa2xx_cm_x255.c
+Auto-merging drivers/pcmcia/pxa2xx_cm_x270.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/s390/cio/qdio_debug.c
+Auto-merging drivers/staging/dt3155v4l/dt3155v4l.c
+CONFLICT (content): Merge conflict in drivers/staging/dt3155v4l/dt3155v4l.c
+Auto-merging drivers/staging/iio/accel/adis16203_core.c
+Auto-merging drivers/staging/iio/accel/adis16204_core.c
+Auto-merging drivers/staging/iio/accel/adis16209_core.c
+Auto-merging drivers/staging/iio/accel/adis16240_core.c
+Auto-merging drivers/staging/iio/gyro/adis16260_core.c
+Auto-merging drivers/usb/gadget/composite.c
+Auto-merging drivers/usb/gadget/fusb300_udc.c
+Auto-merging drivers/usb/host/pci-quirks.c
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/video/carminefb.c
+Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c
+Auto-merging drivers/video/msm/mdp.c
+Auto-merging drivers/video/omap2/dss/dispc.c
+Auto-merging drivers/video/omap2/dss/dpi.c
+Auto-merging drivers/video/omap2/dss/dsi.c
+Auto-merging drivers/video/omap2/dss/dss.c
+Auto-merging drivers/video/omap2/dss/rfbi.c
+Auto-merging drivers/video/omap2/dss/sdi.c
+Auto-merging drivers/video/omap2/omapfb/omapfb-ioctl.c
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/cpuidle.h
+Auto-merging include/linux/mtd/mtd.h
+Auto-merging include/linux/regulator/driver.h
+Auto-merging kernel/debug/kdb/kdb_debugger.c
+Auto-merging kernel/resource.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/swapfile.c
+Auto-merging sound/pci/asihpi/hpioctl.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e3c9a82] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/kernel/core_irongate.c | 1 +
+ arch/alpha/kernel/pci-sysfs.c | 1 +
+ arch/alpha/kernel/setup.c | 1 +
+ arch/arm/common/it8152.c | 1 +
+ arch/arm/common/scoop.c | 1 +
+ arch/arm/kernel/armksyms.c | 2 +-
+ arch/arm/kernel/bios32.c | 2 +-
+ arch/arm/kernel/devtree.c | 2 +-
+ arch/arm/kernel/elf.c | 2 +-
+ arch/arm/kernel/io.c | 2 +-
+ arch/arm/kernel/irq.c | 1 -
+ arch/arm/kernel/leds.c | 3 +-
+ arch/arm/kernel/perf_event.c | 2 +-
+ arch/arm/kernel/pj4-cp0.c | 1 -
+ arch/arm/kernel/process.c | 2 +-
+ arch/arm/kernel/ptrace.c | 1 +
+ arch/arm/kernel/return_address.c | 2 +-
+ arch/arm/kernel/setup.c | 2 +-
+ arch/arm/kernel/stacktrace.c | 2 +-
+ arch/arm/kernel/sys_arm.c | 2 +-
+ arch/arm/kernel/time.c | 2 +-
+ arch/arm/kernel/unwind.c | 2 +-
+ arch/arm/kernel/xscale-cp0.c | 1 -
+ arch/arm/mach-at91/cpuidle.c | 1 +
+ arch/arm/mach-bcmring/dma.c | 1 +
+ arch/arm/mach-bcmring/mm.c | 1 +
+ arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
+ arch/arm/mach-davinci/board-dm646x-evm.c | 1 +
+ arch/arm/mach-davinci/cdce949.c | 1 +
+ arch/arm/mach-davinci/cpufreq.c | 1 +
+ arch/arm/mach-davinci/cpuidle.c | 1 +
+ arch/arm/mach-ep93xx/core.c | 1 +
+ arch/arm/mach-exynos4/dev-sysmmu.c | 1 +
+ arch/arm/mach-footbridge/dc21285.c | 1 +
+ arch/arm/mach-imx/mach-mx31lilly.c | 1 +
+ arch/arm/mach-imx/mach-mx31lite.c | 1 +
+ arch/arm/mach-imx/mach-mx31moboard.c | 1 +
+ arch/arm/mach-iop13xx/pci.c | 1 +
+ arch/arm/mach-ixp2000/core.c | 1 +
+ arch/arm/mach-ixp4xx/common-pci.c | 1 +
+ arch/arm/mach-ixp4xx/common.c | 1 +
+ arch/arm/mach-kirkwood/cpuidle.c | 1 +
+ arch/arm/mach-msm/io.c | 1 +
+ arch/arm/mach-netx/xc.c | 1 +
+ arch/arm/mach-omap1/board-ams-delta.c | 1 +
+ arch/arm/mach-omap1/board-sx1.c | 1 +
+ arch/arm/mach-omap1/board-voiceblue.c | 1 +
+ arch/arm/mach-omap1/mailbox.c | 1 +
+ arch/arm/mach-omap2/board-omap3evm.c | 1 +
+ arch/arm/mach-omap2/clockdomain.c | 1 +
+ arch/arm/mach-omap2/display.c | 1 +
+ arch/arm/mach-omap2/gpmc-onenand.c | 1 +
+ arch/arm/mach-omap2/pm.c | 1 +
+ arch/arm/mach-omap2/prcm.c | 1 +
+ arch/arm/mach-omap2/usb-tusb6010.c | 2 +
+ arch/arm/mach-omap2/voltage.c | 1 +
+ arch/arm/mach-orion5x/dns323-setup.c | 2 +-
+ arch/arm/mach-orion5x/pci.c | 1 +
+ arch/arm/mach-pxa/corgi.c | 1 +
+ arch/arm/mach-pxa/poodle.c | 1 +
+ arch/arm/mach-pxa/spitz.c | 1 +
+ arch/arm/mach-s3c2410/mach-h1940.c | 1 +
+ arch/arm/mach-s3c64xx/dev-audio.c | 1 +
+ arch/arm/mach-sa1100/collie.c | 1 +
+ arch/arm/mach-sa1100/jornada720.c | 1 +
+ arch/arm/mach-shmobile/clock.c | 1 +
+ arch/arm/mach-tegra/pcie.c | 1 +
+ arch/arm/mm/fault-armv.c | 1 -
+ arch/arm/mm/init.c | 1 +
+ arch/arm/plat-iop/gpio.c | 1 +
+ arch/arm/plat-iop/time.c | 1 +
+ arch/arm/plat-omap/clock.c | 1 +
+ arch/arm/plat-omap/mailbox.c | 1 +
+ arch/arm/plat-s3c24xx/devs.c | 1 +
+ arch/arm/plat-s5p/dev-ehci.c | 1 +
+ arch/arm/plat-s5p/dev-onenand.c | 2 +
+ arch/arm/plat-samsung/dev-adc.c | 2 +
+ arch/arm/plat-samsung/dev-asocdma.c | 1 +
+ arch/arm/plat-samsung/dev-backlight.c | 1 +
+ arch/arm/plat-samsung/dev-ide.c | 2 +
+ arch/arm/plat-samsung/dev-nand.c | 1 +
+ arch/arm/plat-samsung/dev-pwm.c | 1 +
+ arch/arm/plat-samsung/dev-rtc.c | 1 +
+ arch/arm/plat-samsung/dev-ts.c | 2 +
+ arch/arm/plat-samsung/dev-usb.c | 1 +
+ arch/arm/plat-samsung/dev-wdt.c | 3 +
+ arch/arm/plat-samsung/platformdata.c | 1 +
+ arch/arm/vfp/vfpmodule.c | 1 -
+ arch/avr32/mach-at32ap/clock.c | 1 +
+ arch/avr32/mach-at32ap/cpufreq.c | 1 +
+ arch/avr32/mach-at32ap/intc.c | 1 +
+ arch/avr32/mach-at32ap/pio.c | 1 +
+ arch/avr32/mm/dma-coherent.c | 1 +
+ arch/ia64/hp/common/hwsw_iommu.c | 1 +
+ arch/ia64/kernel/dma-mapping.c | 1 +
+ arch/ia64/kernel/topology.c | 1 +
+ arch/ia64/sn/kernel/io_init.c | 1 +
+ arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 +
+ arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 +
+ arch/ia64/sn/pci/tioca_provider.c | 1 +
+ arch/m68k/atari/time.c | 1 +
+ arch/m68k/kernel/dma_mm.c | 1 +
+ arch/m68k/kernel/dma_no.c | 1 +
+ arch/mips/bcm47xx/gpio.c | 1 +
+ arch/mips/bcm47xx/setup.c | 1 +
+ arch/mips/cavium-octeon/csrc-octeon.c | 1 +
+ arch/mips/cavium-octeon/dma-octeon.c | 1 +
+ arch/mips/cavium-octeon/flash_setup.c | 1 +
+ arch/mips/kernel/8250-platform.c | 1 -
+ arch/mips/kernel/cpu-probe.c | 3 +-
+ arch/mips/kernel/i8253.c | 2 +-
+ arch/mips/kernel/init_task.c | 2 +-
+ arch/mips/kernel/irq-msc01.c | 1 -
+ arch/mips/kernel/irq.c | 1 -
+ arch/mips/kernel/mips-mt.c | 2 +-
+ arch/mips/kernel/mips_ksyms.c | 2 +-
+ arch/mips/kernel/module.c | 1 -
+ arch/mips/kernel/process.c | 2 +-
+ arch/mips/kernel/prom.c | 2 +-
+ arch/mips/kernel/reset.c | 2 +-
+ arch/mips/kernel/rtlx.c | 1 -
+ arch/mips/kernel/setup.c | 2 +-
+ arch/mips/kernel/spinlock_test.c | 2 +-
+ arch/mips/kernel/stacktrace.c | 2 +-
+ arch/mips/kernel/time.c | 2 +-
+ arch/mips/kernel/traps.c | 1 -
+ arch/mips/kernel/unaligned.c | 1 -
+ arch/mips/kernel/vpe.c | 1 -
+ arch/mips/loongson/common/platform.c | 1 +
+ arch/mips/pci/pci-ip27.c | 1 +
+ arch/mips/pci/pci.c | 1 +
+ arch/mips/powertv/pci/fixup-powertv.c | 1 +
+ arch/mips/powertv/powertv-usb.c | 1 +
+ arch/mips/rb532/gpio.c | 1 +
+ arch/mips/rb532/setup.c | 1 +
+ arch/mips/txx9/generic/spi_eeprom.c | 1 +
+ arch/mips/txx9/rbtx4939/setup.c | 1 +
+ arch/mips/vr41xx/common/giu.c | 1 +
+ arch/mips/vr41xx/common/rtc.c | 1 +
+ arch/parisc/kernel/drivers.c | 1 +
+ arch/parisc/kernel/pci-dma.c | 1 +
+ arch/parisc/kernel/setup.c | 1 +
+ arch/parisc/lib/iomap.c | 1 +
+ arch/powerpc/include/asm/lv1call.h | 1 +
+ arch/powerpc/include/asm/machdep.h | 1 +
+ arch/powerpc/include/asm/spu.h | 1 +
+ arch/powerpc/kernel/btext.c | 2 +-
+ arch/powerpc/kernel/clock.c | 2 +-
+ arch/powerpc/kernel/cputable.c | 2 +-
+ arch/powerpc/kernel/crash.c | 1 +
+ arch/powerpc/kernel/dma-iommu.c | 1 +
+ arch/powerpc/kernel/dma.c | 1 +
+ arch/powerpc/kernel/firmware.c | 3 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 1 -
+ arch/powerpc/kernel/ibmebus.c | 2 +
+ arch/powerpc/kernel/init_task.c | 2 +-
+ arch/powerpc/kernel/io-workarounds.c | 1 +
+ arch/powerpc/kernel/io.c | 2 +-
+ arch/powerpc/kernel/iomap.c | 1 +
+ arch/powerpc/kernel/irq.c | 2 +-
+ arch/powerpc/kernel/isa-bridge.c | 1 +
+ arch/powerpc/kernel/kvm.c | 1 +
+ arch/powerpc/kernel/module.c | 1 -
+ arch/powerpc/kernel/of_platform.c | 2 +-
+ arch/powerpc/kernel/paca.c | 2 +-
+ arch/powerpc/kernel/pci-common.c | 1 +
+ arch/powerpc/kernel/pci_32.c | 1 +
+ arch/powerpc/kernel/pci_64.c | 1 +
+ arch/powerpc/kernel/pci_dn.c | 1 +
+ arch/powerpc/kernel/pci_of_scan.c | 1 +
+ arch/powerpc/kernel/pmc.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 2 +-
+ arch/powerpc/kernel/process.c | 2 +-
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kernel/prom_parse.c | 1 -
+ arch/powerpc/kernel/ptrace.c | 1 -
+ arch/powerpc/kernel/rtas.c | 2 +-
+ arch/powerpc/kernel/setup-common.c | 2 +-
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/powerpc/kernel/signal_64.c | 1 -
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kernel/stacktrace.c | 2 +-
+ arch/powerpc/kernel/swsusp_64.c | 1 +
+ arch/powerpc/kernel/sysfs.c | 2 +-
+ arch/powerpc/kernel/time.c | 2 +-
+ arch/powerpc/kernel/vdso.c | 1 -
+ arch/powerpc/kernel/vio.c | 3 +-
+ arch/powerpc/kvm/44x.c | 1 +
+ arch/powerpc/kvm/book3s.c | 1 +
+ arch/powerpc/kvm/book3s_exports.c | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 1 +
+ arch/powerpc/kvm/book3s_hv_builtin.c | 1 +
+ arch/powerpc/kvm/book3s_pr.c | 1 +
+ arch/powerpc/kvm/powerpc.c | 1 -
+ arch/powerpc/lib/checksum_wrappers_64.c | 2 +-
+ arch/powerpc/lib/devres.c | 2 +-
+ arch/powerpc/lib/locks.c | 2 +-
+ arch/powerpc/lib/rheap.c | 2 +-
+ arch/powerpc/mm/dma-noncoherent.c | 1 +
+ arch/powerpc/mm/hash_utils_64.c | 1 +
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/powerpc/mm/mmu_context_hash32.c | 1 +
+ arch/powerpc/mm/mmu_context_hash64.c | 2 +-
+ arch/powerpc/mm/numa.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 1 +
+ arch/powerpc/mm/slice.c | 2 +-
+ arch/powerpc/mm/tlb_hash32.c | 1 +
+ arch/powerpc/mm/tlb_nohash.c | 1 +
+ arch/powerpc/platforms/44x/warp.c | 1 +
+ arch/powerpc/platforms/512x/clock.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_common.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 +
+ arch/powerpc/platforms/83xx/suspend.c | 1 +
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
+ arch/powerpc/platforms/85xx/sbc8548.c | 1 -
+ arch/powerpc/platforms/86xx/gef_gpio.c | 1 +
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 -
+ arch/powerpc/platforms/cell/axon_msi.c | 1 +
+ arch/powerpc/platforms/cell/beat.c | 2 +-
+ arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 -
+ arch/powerpc/platforms/cell/beat_wrapper.h | 1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 +
+ arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 +
+ arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 +
+ arch/powerpc/platforms/cell/cbe_regs.c | 2 +-
+ arch/powerpc/platforms/cell/celleb_setup.c | 1 +
+ arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 +
+ arch/powerpc/platforms/cell/interrupt.c | 2 +-
+ arch/powerpc/platforms/cell/pmu.c | 1 +
+ arch/powerpc/platforms/cell/qpace_setup.c | 1 +
+ arch/powerpc/platforms/cell/setup.c | 1 +
+ arch/powerpc/platforms/cell/smp.c | 1 -
+ arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
+ arch/powerpc/platforms/cell/spu_fault.c | 2 +-
+ arch/powerpc/platforms/cell/spu_manage.c | 2 +-
+ arch/powerpc/platforms/cell/spu_notify.c | 3 +-
+ arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 -
+ arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 -
+ arch/powerpc/platforms/cell/spufs/context.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/coredump.c | 1 -
+ arch/powerpc/platforms/cell/spufs/fault.c | 1 -
+ arch/powerpc/platforms/cell/spufs/file.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 -
+ arch/powerpc/platforms/cell/spufs/sched.c | 1 -
+ arch/powerpc/platforms/cell/spufs/switch.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
+ arch/powerpc/platforms/embedded6xx/holly.c | 1 +
+ arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 +
+ arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +-
+ arch/powerpc/platforms/iseries/iommu.c | 2 +-
+ arch/powerpc/platforms/iseries/ksyms.c | 2 +-
+ arch/powerpc/platforms/iseries/lpardata.c | 1 -
+ arch/powerpc/platforms/iseries/lpevents.c | 2 +-
+ arch/powerpc/platforms/iseries/mf.c | 1 +
+ arch/powerpc/platforms/iseries/pci.c | 1 -
+ arch/powerpc/platforms/iseries/setup.c | 1 +
+ arch/powerpc/platforms/iseries/smp.c | 1 -
+ arch/powerpc/platforms/iseries/vio.c | 2 +-
+ arch/powerpc/platforms/iseries/viopath.c | 2 +-
+ arch/powerpc/platforms/maple/setup.c | 1 +
+ arch/powerpc/platforms/pasemi/cpufreq.c | 1 +
+ arch/powerpc/platforms/pasemi/dma_lib.c | 3 +-
+ arch/powerpc/platforms/pasemi/setup.c | 1 +
+ arch/powerpc/platforms/powermac/backlight.c | 1 +
+ arch/powerpc/platforms/powermac/feature.c | 1 +
+ arch/powerpc/platforms/powermac/low_i2c.c | 2 +-
+ arch/powerpc/platforms/powermac/nvram.c | 2 +-
+ arch/powerpc/platforms/powermac/pic.c | 1 -
+ arch/powerpc/platforms/powermac/setup.c | 1 +
+ arch/powerpc/platforms/ps3/exports.c | 2 -
+ arch/powerpc/platforms/ps3/interrupt.c | 2 +-
+ arch/powerpc/platforms/ps3/mm.c | 2 +-
+ arch/powerpc/platforms/ps3/os-area.c | 1 +
+ arch/powerpc/platforms/ps3/setup.c | 1 +
+ arch/powerpc/platforms/ps3/spu.c | 1 +
+ arch/powerpc/platforms/ps3/system-bus.c | 2 +-
+ arch/powerpc/platforms/pseries/eeh.c | 2 +
+ arch/powerpc/platforms/pseries/eeh_event.c | 1 +
+ arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 +
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 +
+ arch/powerpc/platforms/pseries/hvconsole.c | 3 +-
+ arch/powerpc/platforms/pseries/io_event_irq.c | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 1 +
+ arch/powerpc/platforms/pseries/lpar.c | 1 +
+ arch/powerpc/platforms/pseries/mobility.c | 1 +
+ arch/powerpc/platforms/pseries/pci_dlpar.c | 1 +
+ arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 +
+ arch/powerpc/platforms/pseries/setup.c | 2 +-
+ arch/powerpc/platforms/pseries/smp.c | 1 -
+ arch/powerpc/platforms/pseries/suspend.c | 1 +
+ arch/powerpc/sysdev/bestcomm/sram.c | 2 +-
+ arch/powerpc/sysdev/cpm_common.c | 1 +
+ arch/powerpc/sysdev/dcr.c | 1 +
+ arch/powerpc/sysdev/fsl_gtm.c | 1 +
+ arch/powerpc/sysdev/fsl_lbc.c | 3 +-
+ arch/powerpc/sysdev/fsl_pmc.c | 1 +
+ arch/powerpc/sysdev/fsl_rio.c | 2 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +-
+ arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 +
+ arch/powerpc/sysdev/mpc8xx_pic.c | 1 -
+ arch/powerpc/sysdev/mv64x60_pci.c | 1 +
+ arch/powerpc/sysdev/pmi.c | 1 +
+ arch/powerpc/sysdev/ppc4xx_msi.c | 1 +
+ arch/powerpc/sysdev/qe_lib/gpio.c | 1 +
+ arch/powerpc/sysdev/qe_lib/ucc.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/usb.c | 1 +
+ arch/powerpc/sysdev/rtc_cmos_setup.c | 1 +
+ arch/powerpc/sysdev/scom.c | 1 +
+ arch/powerpc/sysdev/simple_gpio.c | 1 -
+ arch/powerpc/sysdev/tsi108_dev.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 2 +-
+ arch/s390/crypto/sha_common.c | 1 +
+ arch/s390/mm/init.c | 1 +
+ arch/sh/drivers/dma/dma-sysfs.c | 1 +
+ arch/sh/drivers/pci/pci.c | 1 +
+ arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 +
+ arch/sh/kernel/perf_event.c | 1 +
+ arch/sh/kernel/topology.c | 1 +
+ arch/sh/mm/init.c | 1 +
+ arch/sparc/include/asm/termios.h | 1 -
+ arch/sparc/kernel/auxio_32.c | 1 +
+ arch/sparc/kernel/btext.c | 1 -
+ arch/sparc/kernel/central.c | 1 +
+ arch/sparc/kernel/cpu.c | 2 +-
+ arch/sparc/kernel/cpumap.c | 2 +-
+ arch/sparc/kernel/dma.c | 1 -
+ arch/sparc/kernel/ebus.c | 2 +-
+ arch/sparc/kernel/hvapi.c | 2 +-
+ arch/sparc/kernel/idprom.c | 2 +-
+ arch/sparc/kernel/iommu.c | 2 +-
+ arch/sparc/kernel/irq_32.c | 1 +
+ arch/sparc/kernel/irq_64.c | 1 -
+ arch/sparc/kernel/ldc.c | 2 +-
+ arch/sparc/kernel/leon_kernel.c | 1 -
+ arch/sparc/kernel/leon_pci_grpci2.c | 1 -
+ arch/sparc/kernel/nmi.c | 2 +-
+ arch/sparc/kernel/of_device_32.c | 1 -
+ arch/sparc/kernel/of_device_64.c | 3 +-
+ arch/sparc/kernel/of_device_common.c | 2 +-
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/kernel/pci_fire.c | 1 +
+ arch/sparc/kernel/pci_psycho.c | 1 +
+ arch/sparc/kernel/pci_sabre.c | 1 +
+ arch/sparc/kernel/pci_schizo.c | 1 +
+ arch/sparc/kernel/pci_sun4v.c | 1 +
+ arch/sparc/kernel/pcic.c | 1 +
+ arch/sparc/kernel/pcr.c | 3 +-
+ arch/sparc/kernel/pmc.c | 1 +
+ arch/sparc/kernel/power.c | 2 +-
+ arch/sparc/kernel/process_64.c | 2 +-
+ arch/sparc/kernel/prom_32.c | 1 -
+ arch/sparc/kernel/prom_64.c | 1 -
+ arch/sparc/kernel/prom_common.c | 2 +-
+ arch/sparc/kernel/reboot.c | 2 +-
+ arch/sparc/kernel/sbus.c | 1 +
+ arch/sparc/kernel/setup_32.c | 1 +
+ arch/sparc/kernel/setup_64.c | 1 +
+ arch/sparc/kernel/smp_64.c | 2 +-
+ arch/sparc/kernel/sparc_ksyms_64.c | 2 +-
+ arch/sparc/kernel/stacktrace.c | 2 +-
+ arch/sparc/kernel/sys_sparc32.c | 1 -
+ arch/sparc/kernel/sys_sparc_64.c | 2 +-
+ arch/sparc/kernel/time_64.c | 2 +-
+ arch/sparc/kernel/traps_32.c | 1 +
+ arch/sparc/kernel/unaligned_32.c | 1 -
+ arch/sparc/kernel/vio.c | 1 +
+ arch/sparc/kernel/viohs.c | 2 +-
+ arch/sparc/mm/fault_32.c | 1 -
+ arch/sparc/mm/generic_32.c | 1 +
+ arch/sparc/mm/generic_64.c | 1 +
+ arch/sparc/mm/highmem.c | 1 +
+ arch/sparc/mm/hugetlbpage.c | 1 -
+ arch/x86/crypto/aes_glue.c | 1 +
+ arch/x86/crypto/aesni-intel_glue.c | 1 +
+ arch/x86/kernel/cpu/amd.c | 1 +
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 +
+ arch/x86/kernel/devicetree.c | 1 +
+ arch/x86/kernel/e820.c | 1 +
+ arch/x86/kernel/hpet.c | 1 +
+ arch/x86/kernel/irq.c | 1 +
+ arch/x86/kernel/pci-dma.c | 1 +
+ arch/x86/kernel/probe_roms.c | 4 +-
+ arch/x86/kernel/rtc.c | 1 +
+ arch/x86/kernel/smp.c | 1 +
+ arch/x86/kernel/time.c | 1 +
+ arch/x86/kernel/topology.c | 1 +
+ arch/x86/kernel/vsyscall_64.c | 1 +
+ arch/x86/pci/i386.c | 1 +
+ arch/x86/pci/legacy.c | 1 +
+ arch/x86/platform/efi/efi.c | 1 +
+ arch/x86/platform/efi/efi_32.c | 1 +
+ arch/x86/platform/mrst/vrtc.c | 1 +
+ arch/x86/platform/olpc/olpc-xo1-pm.c | 1 +
+ arch/x86/platform/uv/bios_uv.c | 1 +
+ arch/x86/power/cpu.c | 1 +
+ arch/x86/video/fbdev.c | 1 +
+ block/blk-integrity.c | 1 +
+ block/ioctl.c | 1 +
+ crypto/async_tx/async_memcpy.c | 1 +
+ crypto/async_tx/async_pq.c | 1 +
+ crypto/async_tx/async_raid6_recov.c | 1 +
+ crypto/async_tx/async_tx.c | 1 +
+ crypto/async_tx/async_xor.c | 1 +
+ crypto/async_tx/raid6test.c | 1 +
+ crypto/crypto_wq.c | 1 +
+ crypto/md4.c | 1 +
+ crypto/proc.c | 1 +
+ crypto/vmac.c | 1 +
+ crypto/xcbc.c | 1 +
+ drivers/acpi/acpica/hwsleep.c | 1 +
+ drivers/acpi/ec_sys.c | 1 +
+ drivers/acpi/sbshc.c | 1 +
+ drivers/acpi/sysfs.c | 2 +-
+ drivers/ata/libata-eh.c | 1 +
+ drivers/ata/libata-pmp.c | 1 +
+ drivers/ata/libata-scsi.c | 1 +
+ drivers/ata/libata-sff.c | 1 +
+ drivers/base/base.h | 1 +
+ drivers/base/dma-coherent.c | 1 +
+ drivers/base/dma-mapping.c | 1 +
+ drivers/base/hypervisor.c | 1 +
+ drivers/base/power/generic_ops.c | 1 +
+ drivers/base/power/main.c | 1 +
+ drivers/base/power/runtime.c | 1 +
+ drivers/base/power/sysfs.c | 1 +
+ drivers/base/power/trace.c | 1 +
+ drivers/base/power/wakeup.c | 1 +
+ drivers/base/transport_class.c | 1 +
+ drivers/bcma/core.c | 1 +
+ drivers/bcma/driver_chipcommon.c | 1 +
+ drivers/bcma/driver_pci.c | 1 +
+ drivers/bcma/host_pci.c | 1 +
+ drivers/bcma/main.c | 1 +
+ drivers/block/aoe/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/cpufreq/s3c64xx-cpufreq.c | 1 +
+ drivers/crypto/mv_cesa.c | 1 +
+ drivers/dca/dca-core.c | 1 +
+ drivers/dca/dca-sysfs.c | 1 +
+ drivers/dma/intel_mid_dma.c | 1 +
+ drivers/dma/ipu/ipu_idmac.c | 1 +
+ drivers/dma/ste_dma40.c | 1 +
+ drivers/edac/mce_amd_inj.c | 1 +
+ drivers/firewire/core-iso.c | 1 +
+ drivers/firmware/google/gsmi.c | 1 +
+ drivers/firmware/sigma.c | 1 +
+ drivers/gpio/gpio-74x164.c | 1 +
+ drivers/gpio/gpio-ep93xx.c | 1 +
+ drivers/gpio/gpio-mc33880.c | 1 +
+ drivers/gpio/gpio-mcp23s08.c | 1 +
+ drivers/gpio/gpio-ml-ioh.c | 1 +
+ drivers/gpio/gpio-mpc5200.c | 1 +
+ drivers/gpio/gpio-mxc.c | 1 +
+ drivers/gpio/gpio-mxs.c | 1 +
+ drivers/gpio/gpio-pcf857x.c | 1 +
+ drivers/gpio/gpio-pch.c | 1 +
+ drivers/gpio/gpio-xilinx.c | 1 +
+ drivers/gpu/drm/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/busses/i2c-pxa-pci.c | 1 +
+ drivers/i2c/busses/i2c-sh7760.c | 1 +
+ drivers/i2c/busses/i2c-tegra.c | 1 +
+ drivers/i2c/i2c-boardinfo.c | 1 +
+ drivers/ide/buddha.c | 1 +
+ drivers/ide/cmd640.c | 1 +
+ drivers/ide/ide-acpi.c | 1 +
+ drivers/ide/ide-atapi.c | 1 +
+ drivers/ide/ide-disk_proc.c | 1 +
+ drivers/ide/ide-dma-sff.c | 1 +
+ drivers/ide/ide-dma.c | 1 +
+ drivers/ide/ide-eh.c | 1 +
+ drivers/ide/ide-floppy_proc.c | 1 +
+ drivers/ide/ide-io-std.c | 1 +
+ drivers/ide/ide-ioctls.c | 1 +
+ drivers/ide/ide-legacy.c | 1 +
+ drivers/ide/ide-lib.c | 1 +
+ drivers/ide/ide-pnp.c | 1 +
+ drivers/ide/ide-taskfile.c | 1 +
+ drivers/ide/ide-xfer-mode.c | 1 +
+ drivers/ide/macide.c | 1 +
+ drivers/ide/pmac.c | 1 +
+ drivers/ide/q40ide.c | 1 +
+ drivers/ide/setup-pci.c | 1 +
+ drivers/ide/tc86c001.c | 1 +
+ drivers/idle/intel_idle.c | 1 +
+ drivers/infiniband/core/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/nomadik-ske-keypad.c | 1 +
+ drivers/input/keyboard/tnetv107x-keypad.c | 1 +
+ drivers/input/misc/ad714x.c | 1 +
+ drivers/input/misc/adxl34x.c | 1 +
+ drivers/input/misc/ati_remote2.c | 1 +
+ drivers/input/misc/cma3000_d0x.c | 1 +
+ drivers/input/misc/dm355evm_keys.c | 1 +
+ drivers/input/sparse-keymap.c | 1 +
+ drivers/input/touchscreen/ad7877.c | 1 +
+ drivers/input/touchscreen/ad7879-spi.c | 1 +
+ drivers/input/touchscreen/ad7879.c | 1 +
+ drivers/input/touchscreen/ads7846.c | 1 +
+ drivers/input/touchscreen/bu21013_ts.c | 1 +
+ drivers/isdn/capi/kcapi_proc.c | 1 +
+ drivers/leds/dell-led.c | 1 +
+ drivers/leds/leds-88pm860x.c | 1 +
+ drivers/leds/leds-asic3.c | 1 +
+ drivers/leds/leds-atmel-pwm.c | 1 +
+ drivers/leds/leds-cobalt-raq.c | 1 +
+ drivers/leds/leds-fsg.c | 1 +
+ drivers/leds/leds-gpio.c | 1 +
+ drivers/leds/leds-lm3530.c | 1 +
+ drivers/leds/leds-locomo.c | 1 +
+ drivers/leds/leds-lt3593.c | 1 +
+ drivers/leds/leds-net48xx.c | 1 +
+ drivers/leds/leds-net5501.c | 1 +
+ drivers/leds/leds-ns2.c | 1 +
+ drivers/leds/leds-s3c24xx.c | 1 +
+ drivers/leds/leds-wm831x-status.c | 1 +
+ drivers/leds/leds-wm8350.c | 1 +
+ drivers/leds/leds-wrap.c | 1 +
+ drivers/lguest/lguest_device.c | 1 +
+ drivers/md/dm-exception-store.c | 1 +
+ drivers/md/dm-log-userspace-base.c | 1 +
+ drivers/md/dm-path-selector.c | 1 +
+ drivers/md/dm-raid.c | 1 +
+ drivers/md/dm-round-robin.c | 1 +
+ drivers/md/dm-service-time.c | 1 +
+ drivers/md/dm-snap-persistent.c | 1 +
+ drivers/md/dm-snap-transient.c | 1 +
+ drivers/md/dm-uevent.c | 1 +
+ drivers/md/faulty.c | 1 +
+ drivers/md/linear.c | 1 +
+ drivers/md/md.c | 1 +
+ drivers/md/multipath.c | 1 +
+ drivers/md/raid0.c | 1 +
+ drivers/md/raid1.c | 1 +
+ drivers/md/raid10.c | 1 +
+ drivers/md/raid5.c | 1 +
+ drivers/media/common/saa7146_core.c | 1 +
+ drivers/media/common/saa7146_fops.c | 1 +
+ drivers/media/common/saa7146_hlp.c | 1 +
+ drivers/media/common/saa7146_video.c | 1 +
+ drivers/media/common/tuners/tuner-types.c | 1 +
+ drivers/media/dvb/frontends/dibx000_common.c | 1 +
+ drivers/media/dvb/siano/sms-cards.c | 1 +
+ drivers/media/dvb/siano/smsendian.c | 1 +
+ drivers/media/dvb/siano/smssdio.c | 1 +
+ drivers/media/dvb/siano/smsusb.c | 1 +
+ drivers/media/media-device.c | 1 +
+ drivers/media/radio/radio-timb.c | 1 +
+ drivers/media/radio/radio-wl1273.c | 1 +
+ drivers/media/radio/si4713-i2c.c | 1 +
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +
+ drivers/media/rc/ir-jvc-decoder.c | 1 +
+ drivers/media/rc/ir-lirc-codec.c | 1 +
+ drivers/media/rc/ir-nec-decoder.c | 1 +
+ drivers/media/rc/ir-raw.c | 2 +
+ drivers/media/rc/ir-rc5-decoder.c | 1 +
+ drivers/media/rc/ir-rc5-sz-decoder.c | 1 +
+ drivers/media/rc/ir-rc6-decoder.c | 1 +
+ drivers/media/rc/ir-sony-decoder.c | 1 +
+ drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 +
+ drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 +
+ drivers/media/rc/keymaps/rc-anysee.c | 1 +
+ drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 +
+ drivers/media/rc/keymaps/rc-asus-pc39.c | 1 +
+ drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 +
+ .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 +
+ drivers/media/rc/keymaps/rc-avermedia.c | 1 +
+ drivers/media/rc/keymaps/rc-avertv-303.c | 1 +
+ drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 +
+ drivers/media/rc/keymaps/rc-behold-columbus.c | 1 +
+ drivers/media/rc/keymaps/rc-behold.c | 1 +
+ drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 +
+ drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 +
+ drivers/media/rc/keymaps/rc-cinergy.c | 1 +
+ drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 +
+ drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 +
+ drivers/media/rc/keymaps/rc-digittrade.c | 1 +
+ drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 +
+ drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 +
+ drivers/media/rc/keymaps/rc-em-terratec.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv.c | 1 +
+ drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 +
+ drivers/media/rc/keymaps/rc-evga-indtube.c | 1 +
+ drivers/media/rc/keymaps/rc-eztv.c | 1 +
+ drivers/media/rc/keymaps/rc-flydvb.c | 1 +
+ drivers/media/rc/keymaps/rc-flyvideo.c | 1 +
+ drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 +
+ drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 +
+ drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 +
+ drivers/media/rc/keymaps/rc-gotview7135.c | 1 +
+ drivers/media/rc/keymaps/rc-hauppauge.c | 1 +
+ drivers/media/rc/keymaps/rc-imon-mce.c | 1 +
+ drivers/media/rc/keymaps/rc-imon-pad.c | 1 +
+ drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 +
+ drivers/media/rc/keymaps/rc-kaiomy.c | 1 +
+ drivers/media/rc/keymaps/rc-kworld-315u.c | 1 +
+ .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 +
+ drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 +
+ drivers/media/rc/keymaps/rc-lirc.c | 1 +
+ drivers/media/rc/keymaps/rc-lme2510.c | 1 +
+ drivers/media/rc/keymaps/rc-manli.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 +
+ drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 +
+ drivers/media/rc/keymaps/rc-nebula.c | 1 +
+ .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 +
+ drivers/media/rc/keymaps/rc-norwood.c | 1 +
+ drivers/media/rc/keymaps/rc-npgtech.c | 1 +
+ drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 +
+ drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview-new.c | 1 +
+ drivers/media/rc/keymaps/rc-pixelview.c | 1 +
+ .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 +
+ drivers/media/rc/keymaps/rc-proteus-2309.c | 1 +
+ drivers/media/rc/keymaps/rc-purpletv.c | 1 +
+ drivers/media/rc/keymaps/rc-pv951.c | 1 +
+ drivers/media/rc/keymaps/rc-rc6-mce.c | 1 +
+ .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 +
+ drivers/media/rc/keymaps/rc-streamzap.c | 1 +
+ drivers/media/rc/keymaps/rc-tbs-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 +
+ drivers/media/rc/keymaps/rc-terratec-slim.c | 1 +
+ drivers/media/rc/keymaps/rc-tevii-nec.c | 1 +
+ drivers/media/rc/keymaps/rc-tivo.c | 1 +
+ drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 +
+ drivers/media/rc/keymaps/rc-trekstor.c | 1 +
+ drivers/media/rc/keymaps/rc-tt-1500.c | 1 +
+ drivers/media/rc/keymaps/rc-twinhan1027.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-s350.c | 1 +
+ drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 +
+ drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 +
+ drivers/media/rc/keymaps/rc-winfast.c | 1 +
+ drivers/media/rc/rc-main.c | 1 +
+ drivers/media/video/adp1653.c | 1 +
+ drivers/media/video/ak881x.c | 1 +
+ drivers/media/video/cpia2/cpia2_usb.c | 1 +
+ drivers/media/video/cx25840/cx25840-ir.c | 1 +
+ drivers/media/video/davinci/dm355_ccdc.c | 1 +
+ drivers/media/video/davinci/dm644x_ccdc.c | 1 +
+ drivers/media/video/hdpvr/hdpvr-i2c.c | 1 +
+ drivers/media/video/hexium_gemini.c | 1 +
+ drivers/media/video/hexium_orion.c | 1 +
+ drivers/media/video/imx074.c | 1 +
+ drivers/media/video/m5mols/m5mols_core.c | 1 +
+ drivers/media/video/mt9m001.c | 1 +
+ drivers/media/video/mt9m111.c | 1 +
+ drivers/media/video/mt9t031.c | 1 +
+ drivers/media/video/mt9v011.c | 1 +
+ drivers/media/video/mt9v022.c | 1 +
+ drivers/media/video/mt9v032.c | 1 +
+ drivers/media/video/mxb.c | 1 +
+ drivers/media/video/noon010pc30.c | 1 +
+ drivers/media/video/omap24xxcam.c | 1 +
+ drivers/media/video/ov6650.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-devattr.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 +
+ drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 +
+ drivers/media/video/rj54n1cb0c.c | 1 +
+ drivers/media/video/sh_mobile_csi2.c | 1 +
+ drivers/media/video/sh_vou.c | 1 +
+ drivers/media/video/sr030pc30.c | 1 +
+ drivers/media/video/tcm825x.c | 1 +
+ drivers/media/video/timblogiw.c | 1 +
+ drivers/media/video/tvp514x.c | 1 +
+ drivers/media/video/tvp5150.c | 1 +
+ drivers/media/video/tvp7002.c | 1 +
+ drivers/media/video/usbvision/usbvision-cards.c | 1 +
+ drivers/media/video/v4l2-ctrls.c | 1 +
+ drivers/media/video/v4l2-device.c | 1 +
+ drivers/media/video/v4l2-event.c | 1 +
+ drivers/media/video/v4l2-fh.c | 1 +
+ drivers/media/video/v4l2-int-device.c | 1 +
+ drivers/media/video/v4l2-subdev.c | 1 +
+ drivers/memstick/core/memstick.c | 1 +
+ drivers/memstick/core/mspro_block.c | 1 +
+ drivers/memstick/host/jmb38x_ms.c | 1 +
+ drivers/memstick/host/tifm_ms.c | 1 +
+ drivers/message/i2o/pci.c | 1 +
+ drivers/mfd/ab3100-core.c | 1 +
+ drivers/mfd/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/mxs-mmc.c | 1 +
+ drivers/mmc/host/sdhci-of-esdhc.c | 1 +
+ drivers/mmc/host/sdhci-of-hlwd.c | 1 +
+ drivers/mmc/host/sdhci-pci.c | 1 +
+ drivers/mmc/host/sdhci-pltfm.c | 1 +
+ drivers/mmc/host/sdhci-pxav2.c | 1 +
+ drivers/mmc/host/sdhci-pxav3.c | 1 +
+ drivers/mmc/host/sdhci-spear.c | 1 +
+ drivers/mmc/host/sdhci-tegra.c | 1 +
+ drivers/mmc/host/sdhci.c | 1 +
+ drivers/mmc/host/sdricoh_cs.c | 1 +
+ drivers/mmc/host/sh_mmcif.c | 1 +
+ drivers/mmc/host/sh_mobile_sdhi.c | 1 +
+ drivers/mmc/host/tifm_sd.c | 1 +
+ drivers/mmc/host/via-sdmmc.c | 1 +
+ drivers/mtd/ar7part.c | 1 +
+ drivers/mtd/cmdlinepart.c | 1 +
+ drivers/mtd/lpddr/lpddr_cmds.c | 1 +
+ drivers/mtd/mtdblock_ro.c | 1 +
+ drivers/mtd/mtdsuper.c | 1 +
+ drivers/mtd/nand/cafe_nand.c | 1 +
+ drivers/mtd/nand/cmx270_nand.c | 1 +
+ drivers/mtd/nand/diskonchip.c | 1 +
+ drivers/mtd/nand/nand_bbt.c | 1 +
+ drivers/mtd/nand/omap2.c | 1 +
+ drivers/mtd/nand/sm_common.c | 1 +
+ drivers/mtd/onenand/onenand_bbt.c | 1 +
+ drivers/mtd/redboot.c | 1 +
+ drivers/mtd/rfd_ftl.c | 1 +
+ drivers/mtd/ubi/vmt.c | 1 +
+ drivers/net/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_pci_irq.c | 1 +
+ drivers/of/of_spi.c | 1 +
+ drivers/parisc/ccio-dma.c | 1 +
+ drivers/parisc/sba_iommu.c | 1 +
+ drivers/pci/hotplug-pci.c | 1 +
+ drivers/pci/hotplug/pciehp_acpi.c | 1 +
+ drivers/pci/hotplug/pcihp_slot.c | 1 +
+ drivers/pci/hotplug/rpadlpar_core.c | 1 +
+ drivers/pci/htirq.c | 1 +
+ drivers/pci/iov.c | 1 +
+ drivers/pci/irq.c | 1 +
+ drivers/pci/msi.c | 1 +
+ drivers/pci/pci-sysfs.c | 1 +
+ drivers/pci/quirks.c | 1 +
+ drivers/pci/rom.c | 1 +
+ drivers/pci/setup-res.c | 1 +
+ drivers/pci/slot.c | 1 +
+ drivers/pci/vpd.c | 1 +
+ drivers/pcmcia/db1xxx_ss.c | 1 +
+ drivers/pcmcia/pxa2xx_cm_x255.c | 1 +
+ drivers/pcmcia/pxa2xx_cm_x270.c | 1 +
+ drivers/platform/x86/intel_scu_ipc.c | 1 +
+ drivers/platform/x86/msi-wmi.c | 1 +
+ drivers/platform/x86/wmi.c | 1 +
+ drivers/power/max17042_battery.c | 1 +
+ drivers/power/max8903_charger.c | 1 +
+ drivers/power/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/db8500-prcmu.c | 1 +
+ drivers/regulator/dummy.c | 1 +
+ drivers/regulator/fixed.c | 1 +
+ drivers/regulator/lp3971.c | 1 +
+ drivers/regulator/lp3972.c | 1 +
+ drivers/regulator/max8925-regulator.c | 1 +
+ drivers/regulator/max8997.c | 1 +
+ drivers/regulator/mc13783-regulator.c | 1 +
+ drivers/regulator/mc13892-regulator.c | 1 +
+ drivers/regulator/mc13xxx-regulator-core.c | 1 +
+ drivers/regulator/tps6586x-regulator.c | 1 +
+ drivers/regulator/userspace-consumer.c | 1 +
+ drivers/regulator/virtual.c | 1 +
+ drivers/regulator/wm8400-regulator.c | 1 +
+ drivers/rtc/interface.c | 1 +
+ drivers/rtc/rtc-dm355evm.c | 1 +
+ drivers/rtc/rtc-ds1305.c | 1 +
+ drivers/rtc/rtc-ds1511.c | 1 +
+ drivers/rtc/rtc-ds1553.c | 1 +
+ drivers/rtc/rtc-ds1672.c | 1 +
+ drivers/rtc/rtc-ds1742.c | 1 +
+ drivers/rtc/rtc-em3027.c | 1 +
+ drivers/rtc/rtc-isl12022.c | 1 +
+ drivers/rtc/rtc-mv.c | 1 +
+ drivers/rtc/rtc-pcf2123.c | 1 +
+ drivers/rtc/rtc-pcf8563.c | 1 +
+ drivers/rtc/rtc-rs5c348.c | 1 +
+ drivers/rtc/rtc-rs5c372.c | 1 +
+ drivers/rtc/rtc-stk17ta8.c | 1 +
+ drivers/rtc/rtc-tx4939.c | 1 +
+ drivers/rtc/rtc-x1205.c | 1 +
+ drivers/s390/char/fs3270.c | 1 +
+ drivers/s390/char/sclp_cpi_sys.c | 1 +
+ drivers/s390/char/vmur.c | 1 +
+ drivers/s390/cio/chp.c | 2 +
+ drivers/s390/cio/qdio_debug.c | 2 +
+ drivers/s390/kvm/kvm_virtio.c | 1 +
+ drivers/s390/scsi/zfcp_ccw.c | 1 +
+ drivers/s390/scsi/zfcp_dbf.c | 1 +
+ drivers/s390/scsi/zfcp_scsi.c | 1 +
+ drivers/scsi/a2091.c | 1 +
+ drivers/scsi/a3000.c | 1 +
+ drivers/scsi/aacraid/aachba.c | 1 +
+ drivers/scsi/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/gvp11.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/mac53c94.c | 1 +
+ drivers/scsi/megaraid/megaraid_mbox.c | 1 +
+ drivers/scsi/osd/osd_initiator.c | 1 +
+ drivers/scsi/ps3rom.c | 1 +
+ drivers/scsi/scsi_lib.c | 1 +
+ drivers/scsi/scsi_lib_dma.c | 1 +
+ drivers/scsi/scsi_pm.c | 1 +
+ drivers/scsi/sr_ioctl.c | 1 +
+ drivers/sfi/sfi_core.h | 3 +
+ drivers/sh/intc/core.c | 1 +
+ drivers/sh/intc/virq.c | 1 +
+ drivers/sh/maple/maple.c | 1 +
+ drivers/spi/spi-altera.c | 1 +
+ drivers/spi/spi-au1550.c | 1 +
+ drivers/spi/spi-bitbang.c | 1 +
+ drivers/spi/spi-butterfly.c | 1 +
+ drivers/spi/spi-dw-mmio.c | 1 +
+ drivers/spi/spi-dw-pci.c | 1 +
+ drivers/spi/spi-dw.c | 1 +
+ drivers/spi/spi-gpio.c | 1 +
+ drivers/spi/spi-oc-tiny.c | 1 +
+ drivers/spi/spi-omap-uwire.c | 1 +
+ drivers/spi/spi-orion.c | 1 +
+ drivers/spi/spi-pxa2xx-pci.c | 1 +
+ drivers/spi/spi-s3c24xx.c | 1 +
+ drivers/spi/spi-sh-msiof.c | 1 +
+ drivers/spi/spi-sh-sci.c | 1 +
+ drivers/spi/spi-ti-ssp.c | 1 +
+ drivers/spi/spi-tle62x0.c | 1 +
+ drivers/spi/spi-txx9.c | 1 +
+ drivers/spi/spi.c | 1 +
+ drivers/ssb/b43_pci_bridge.c | 1 +
+ drivers/ssb/driver_chipcommon.c | 1 +
+ drivers/ssb/driver_chipcommon_pmu.c | 1 +
+ drivers/ssb/driver_gige.c | 1 +
+ drivers/ssb/driver_pcicore.c | 1 +
+ drivers/ssb/embedded.c | 1 +
+ drivers/ssb/main.c | 1 +
+ drivers/ssb/pcihost_wrapper.c | 1 +
+ drivers/staging/altera-stapl/altera.c | 1 +
+ drivers/staging/brcm80211/brcmutil/wifi.c | 1 +
+ drivers/staging/dt3155v4l/dt3155v4l.c | 1 +
+ 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/olpc_dcon/olpc_dcon.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/ehci-mxc.c | 1 +
+ drivers/usb/host/fsl-mph-dr-of.c | 1 +
+ drivers/usb/host/isp1760-if.c | 1 +
+ drivers/usb/host/pci-quirks.c | 1 +
+ drivers/usb/host/whci/debug.c | 1 +
+ drivers/usb/host/whci/hcd.c | 1 +
+ drivers/usb/host/xhci-hub.c | 1 +
+ drivers/usb/host/xhci-pci.c | 1 +
+ drivers/usb/mon/mon_bin.c | 1 +
+ drivers/usb/mon/mon_stat.c | 1 +
+ drivers/usb/mon/mon_text.c | 1 +
+ drivers/usb/otg/gpio_vbus.c | 1 +
+ drivers/usb/otg/otg.c | 1 +
+ drivers/usb/otg/ulpi.c | 1 +
+ drivers/usb/serial/aircable.c | 1 +
+ drivers/usb/serial/qcserial.c | 1 +
+ drivers/usb/storage/option_ms.c | 1 +
+ drivers/usb/storage/protocol.c | 1 +
+ drivers/usb/storage/sierra_ms.c | 1 +
+ drivers/usb/storage/transport.c | 1 +
+ drivers/usb/storage/uas.c | 1 +
+ drivers/usb/wusbcore/devconnect.c | 1 +
+ drivers/usb/wusbcore/mmc.c | 1 +
+ drivers/usb/wusbcore/rh.c | 1 +
+ drivers/usb/wusbcore/security.c | 1 +
+ drivers/usb/wusbcore/wa-hc.c | 1 +
+ drivers/usb/wusbcore/wa-rpipe.c | 1 +
+ drivers/usb/wusbcore/wa-xfer.c | 1 +
+ drivers/uwb/est.c | 1 +
+ drivers/uwb/i1480/dfu/dfu.c | 1 +
+ drivers/uwb/ie.c | 1 +
+ drivers/uwb/lc-dev.c | 2 +
+ drivers/uwb/neh.c | 1 +
+ drivers/uwb/pal.c | 1 +
+ drivers/uwb/radio.c | 1 +
+ drivers/uwb/reset.c | 1 +
+ drivers/uwb/rsv.c | 1 +
+ drivers/uwb/scan.c | 1 +
+ drivers/uwb/umc-bus.c | 1 +
+ drivers/uwb/umc-dev.c | 1 +
+ drivers/uwb/umc-drv.c | 1 +
+ drivers/uwb/whci.c | 1 +
+ drivers/video/atmel_lcdfb.c | 1 +
+ drivers/video/backlight/88pm860x_bl.c | 1 +
+ drivers/video/backlight/adp5520_bl.c | 1 +
+ drivers/video/backlight/ams369fg06.c | 1 +
+ drivers/video/backlight/da903x_bl.c | 1 +
+ drivers/video/backlight/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/msm/mdp.c | 1 +
+ drivers/video/omap/lcd_mipid.c | 1 +
+ drivers/video/omap/omapfb_main.c | 1 +
+ drivers/video/omap2/dss/dispc.c | 1 +
+ drivers/video/omap2/dss/dpi.c | 1 +
+ drivers/video/omap2/dss/dsi.c | 1 +
+ drivers/video/omap2/dss/dss.c | 1 +
+ drivers/video/omap2/dss/rfbi.c | 1 +
+ drivers/video/omap2/dss/sdi.c | 1 +
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 +
+ drivers/video/savage/savagefb_accel.c | 1 +
+ drivers/video/sh_mipi_dsi.c | 1 +
+ drivers/video/sh_mobile_lcdcfb.c | 1 +
+ drivers/video/via/via-gpio.c | 1 +
+ drivers/video/w100fb.c | 1 +
+ drivers/virtio/virtio.c | 1 +
+ drivers/virtio/virtio_balloon.c | 1 +
+ drivers/virtio/virtio_ring.c | 1 +
+ drivers/w1/w1_family.c | 1 +
+ drivers/xen/balloon.c | 1 +
+ drivers/xen/manage.c | 1 +
+ drivers/xen/swiotlb-xen.c | 1 +
+ drivers/xen/xen-pciback/conf_space.c | 1 +
+ drivers/xen/xen-selfballoon.c | 2 +
+ drivers/xen/xenbus/xenbus_client.c | 1 +
+ drivers/xen/xenbus/xenbus_probe.c | 1 +
+ drivers/xen/xenbus/xenbus_probe_backend.c | 1 +
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
+ drivers/zorro/proc.c | 1 +
+ fs/bio-integrity.c | 1 +
+ fs/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/dmaengine.h | 2 +
+ include/linux/export.h | 89 ++++++++++++++++++++
+ include/linux/firmware.h | 2 +-
+ include/linux/ftrace.h | 2 +-
+ include/linux/gameport.h | 17 ++--
+ include/linux/hid.h | 9 +-
+ include/linux/i2c.h | 10 +-
+ include/linux/ipmi.h | 3 +-
+ include/linux/ipmi_smi.h | 1 -
+ include/linux/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/kfifo.c | 2 +-
+ kernel/kprobes.c | 2 +-
+ kernel/ksysfs.c | 3 +-
+ kernel/kthread.c | 2 +-
+ kernel/latencytop.c | 2 +-
+ kernel/lockdep.c | 2 +-
+ kernel/lockdep_proc.c | 2 +-
+ kernel/module.c | 2 +-
+ kernel/mutex-debug.c | 2 +-
+ kernel/mutex.c | 2 +-
+ kernel/notifier.c | 2 +-
+ kernel/nsproxy.c | 2 +-
+ kernel/padata.c | 2 +-
+ kernel/params.c | 4 +-
+ kernel/pid.c | 2 +-
+ kernel/posix-timers.c | 2 +-
+ kernel/power/hibernate.c | 1 +
+ kernel/power/main.c | 1 +
+ kernel/power/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 +
+ 1375 files changed, 1507 insertions(+), 426 deletions(-)
+ create mode 100644 include/linux/export.h
+$ git am -3 ../patches/0001-dm-use-export.h-instead-of-module.h-where-possible.patch
+Applying: dm: use export.h instead of module.h where possible
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/md/persistent-data/dm-btree-remove.c
+M drivers/md/persistent-data/dm-btree.c
+M drivers/md/persistent-data/dm-space-map-disk.c
+M drivers/md/persistent-data/dm-transaction-manager.c
+$ git add .
+$ git commit -v -a --amend
+[master 409e1ed] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git am -3 ../patches/0001-block-bsg-lib.c-needs-export.h-not-module.h.patch
+Applying: block: bsg-lib.c needs export.h not module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M block/bsg-lib.c
+$ git add .
+$ git commit -v -a --amend
+[master 7c16711] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git am -3 ../patches/power__max8998_charger.c_needs_module.h.patch
+Applying: power: max8998_charger.c needs module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/power/max8998_charger.c
+$ git add .
+$ git commit -v -a --amend
+[master 1107c44] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git am -3 ../patches/regulator__aat2870_needs_module.h.patch
+Applying: regulator: aat2870 needs module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/regulator/aat2870-regulator.c
+$ git add .
+$ git commit -v -a --amend
+[master 8694c56] Merge remote-tracking branch 'moduleh/module.h-split'
+$ git am -3 ../patches/0001-power_supply-max8997_charger.c-need-to-include-modul.patch
+Applying: power_supply: max8997_charger.c need to include module.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/power/max8997_charger.c
+$ git add .
+$ git commit -v -a --amend
+[master acc40a7] Merge remote-tracking branch 'moduleh/module.h-split'
+$ 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: init_fault_attr_dentries() is used to export fault_attr via debugfs. But
+Applying: As the comment explains, the intention of the code is to clear the
+Applying: 1. 26c4caea "don't allow duplicate entries in listener mode"
+Applying: When send_cpu_listeners() finds the orphaned listener it marks it as
+Applying: The current hyper-optimized functions are overkill if you simply want to
+Applying: Fix new kernel-doc warning in fs/dcache.c:
+Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
+Applying: This patch makes two changes:
+Applying: Update kernel-parameters.txt to point users to the authoritative comment
+Applying: Update the module parameters when platform data is used. This means that
+Applying: __GFP_OTHER_NODE is used for NUMA allocations on behalf of other nodes.
+Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex. It
+Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
+Applying: When no floppy is found the module code can be released while a timer
+Applying: kernel/fork.c:267: error: implicit declaration of function
+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: lockdep_init_map() only initializes parts of lockdep_map and triggers
+Applying: The parameter's origin type is long. On an i386 architecture, it can
+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: 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
+Applying: Cc: Ed Wildgoose <git@wildgooses.com>
+Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
+Applying: The x86 timer interrupt handler is the only handler not traced in the
+Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
+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: When doing a single register write we use work_buf for both the register
+Applying: Some messing with error codes to return 0 on out id's and match
+Applying: fb_set_suspend() must be called with the console semaphore held, which
+Applying: hwmon was using an idr with a NULL pointer, so convert to an
+Applying: A straightforward looking use of idr for a device id.
+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: 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: Add new check (assert_init) to make sure objects are initialized and
+Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
+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: The address limit is already set in flush_old_exec() so those calls to
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+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: Some mangling of errors was necessary to maintain current interface.
+Applying: This does involve additional use of the spin lock in idr.c. Is this an
+Applying: Instead of open coding this function use kstrtoul_from_user() directly.
+Applying: brd_make_request() always returns 0, which doesn't make much sense.
+Applying: The address limit is already set in flush_old_exec() so this assignment of
+Applying: The basic idea behind cross memory attach is to allow MPI programs doing
+Applying: - Add x86_64 specific wire up
+Applying: acct_isolated of compaction uses page_lru_base_type which returns only
+Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
+Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
+Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
+Applying: unmap_and_move() is one a big messy function. Clean it up.
+Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
+Applying: per-task block plug can reduce block queue lock contention and increase
+Applying: The tracing ring-buffer used this function briefly, but not anymore.
+Applying: After selecting a task to kill, the oom killer iterates all processes and
+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
+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: We have already acknowledged that swapoff of a tmpfs file is slower than
+Applying: Make the radix_tree exceptional cases, mostly in filemap.c, clearer.
+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: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Applying: The current implementation of the /dev/hpet driver couples opening the
+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: s/lib-/obj-/ for usercopy.o
+Applying: After an "unexpected" reboot, I found this Oops in my logs:
+Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
+Applying: Add axis correction for HP EliteBook 2730p.
+Applying: Add axis correction for HP EliteBook 8540w.
+Applying: Add axis correction for HP ProBook 6555b.
+Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
+Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
+Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
+Applying: Change exported functions to use the device given as parameter
+Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
+Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
+Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
+Applying: don't include asm/msr.h
+Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
+Applying: One can get this information from minix/inode.c, but adding the
+Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+Applying: Force this on for -next/mm testing purposes.
+Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
+Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
+Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
+Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
+Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
+Applying: A default echo function has been provided so it is no longer an error when
+Applying: This client driver allows you to use a GPIO pin as a source for PPS
+Applying: remove unneeded cast of void*
+Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm
+From ../rebase-tmp
+ + cab2400...e90c442 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/DocBook/debugobjects.tmpl | 50 +
+ Documentation/fault-injection/fault-injection.txt | 3 +-
+ Documentation/frv/booting.txt | 13 +-
+ Documentation/kernel-parameters.txt | 1 +
+ Documentation/m68k/kernel-options.txt | 14 +
+ .../trace/postprocess/trace-vmscan-postprocess.pl | 8 +-
+ MAINTAINERS | 1 +
+ 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/powerpc/include/asm/systbl.h | 2 +
+ arch/powerpc/include/asm/unistd.h | 4 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/Kconfig.debug | 14 -
+ 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/ia32/ia32entry.S | 2 +
+ arch/x86/include/asm/irq_vectors.h | 50 +
+ arch/x86/include/asm/uaccess_64.h | 12 +-
+ arch/x86/include/asm/unistd_32.h | 4 +-
+ arch/x86/include/asm/unistd_64.h | 4 +
+ arch/x86/kernel/apic/apic.c | 7 +
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 +
+ arch/x86/kernel/cpu/mcheck/threshold.c | 3 +
+ arch/x86/kernel/e820.c | 59 +-
+ arch/x86/kernel/irq.c | 6 +-
+ arch/x86/kernel/irq_work.c | 3 +
+ arch/x86/kernel/smp.c | 7 +
+ arch/x86/kernel/syscall_table_32.S | 2 +
+ arch/x86/kernel/time.c | 15 +-
+ arch/x86/kernel/traps.c | 3 +
+ arch/x86/lib/usercopy_32.c | 6 -
+ arch/x86/mm/mmap.c | 4 +-
+ arch/x86/mm/tlb.c | 3 +
+ arch/x86/platform/Makefile | 1 +
+ arch/x86/platform/geode/Makefile | 1 +
+ arch/x86/platform/geode/alix.c | 142 ++
+ arch/x86/platform/iris/iris.c | 67 +-
+ block/blk-core.c | 6 +-
+ block/blk-timeout.c | 5 +-
+ drivers/base/regmap/regmap.c | 13 +-
+ drivers/block/brd.c | 2 +-
+ drivers/block/floppy.c | 8 +-
+ drivers/char/hpet.c | 56 +-
+ drivers/char/ramoops.c | 8 +
+ drivers/firmware/dmi_scan.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 34 +-
+ drivers/hwmon/hwmon.c | 32 +-
+ drivers/hwmon/ibmaem.c | 47 +-
+ drivers/idle/intel_idle.c | 59 +-
+ drivers/iommu/dmar.c | 7 +-
+ drivers/iommu/intel-iommu.c | 177 +++-
+ drivers/leds/Kconfig | 20 +-
+ drivers/leds/Makefile | 2 +-
+ drivers/leds/leds-alix2.c | 239 ----
+ drivers/leds/leds-renesas-tpu.c | 343 +++++
+ drivers/misc/lis3lv02d/lis3lv02d.c | 389 +++---
+ drivers/misc/lis3lv02d/lis3lv02d.h | 9 +-
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 11 +-
+ drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +-
+ drivers/platform/x86/Kconfig | 2 +-
+ drivers/platform/x86/acerhdf.c | 1 +
+ drivers/platform/x86/hp_accel.c | 10 +-
+ drivers/pps/clients/Kconfig | 9 +
+ drivers/pps/clients/Makefile | 1 +
+ drivers/pps/clients/pps-gpio.c | 227 +++
+ drivers/pps/clients/pps-ktimer.c | 12 -
+ drivers/pps/clients/pps_parport.c | 9 -
+ drivers/pps/kapi.c | 20 +-
+ drivers/rtc/class.c | 32 +-
+ drivers/rtc/rtc-omap.c | 2 +-
+ drivers/scsi/aacraid/commctrl.c | 1 +
+ drivers/scsi/megaraid.c | 8 +-
+ drivers/scsi/osd/osd_uld.c | 22 +-
+ drivers/scsi/sd.c | 32 +-
+ drivers/scsi/sg.c | 25 +-
+ drivers/video/backlight/Kconfig | 2 +-
+ drivers/video/backlight/aat2870_bl.c | 8 +-
+ drivers/video/fbmem.c | 24 +-
+ drivers/w1/slaves/w1_ds2760.c | 48 +-
+ drivers/w1/slaves/w1_ds2780.c | 48 +-
+ fs/Kconfig | 15 +-
+ fs/aio.c | 4 +-
+ fs/btrfs/inode.c | 3 +-
+ fs/compat.c | 7 +-
+ fs/dcache.c | 1 +
+ fs/ext4/ext4.h | 7 +-
+ fs/ext4/ialloc.c | 4 +-
+ fs/ocfs2/ocfs2.h | 47 +
+ fs/ocfs2/quota_local.c | 10 +-
+ fs/read_write.c | 8 +-
+ fs/stack.c | 5 +-
+ include/linux/compat.h | 3 +-
+ include/linux/debugobjects.h | 6 +
+ include/linux/dmar.h | 5 +
+ include/linux/fault-inject.h | 18 +-
+ include/linux/fs.h | 7 +-
+ include/linux/gfp.h | 2 +-
+ include/linux/hpet.h | 1 +
+ include/linux/idr.h | 4 +
+ include/linux/jiffies.h | 2 +-
+ include/linux/leds-renesas-tpu.h | 14 +
+ include/linux/magic.h | 10 +-
+ include/linux/memcontrol.h | 11 +-
+ include/linux/mfd/aat2870.h | 2 +-
+ include/linux/mmzone.h | 12 +
+ include/linux/pps-gpio.h | 32 +
+ include/linux/radix-tree.h | 37 +-
+ include/linux/shmem_fs.h | 17 +-
+ include/linux/swap.h | 7 +-
+ include/linux/swapops.h | 23 +
+ include/linux/syscalls.h | 13 +
+ include/linux/sysctl.h | 4 +
+ include/linux/writeback.h | 2 -
+ include/scsi/scsi_netlink.h | 2 +-
+ include/trace/events/irq_vectors.h | 56 +
+ include/trace/events/vmscan.h | 8 +-
+ init/do_mounts.c | 46 +-
+ init/main.c | 2 +-
+ ipc/msgutil.c | 6 +
+ ipc/shm.c | 13 +-
+ ipc/util.c | 30 +-
+ ipc/util.h | 1 +
+ kernel/audit.c | 5 +-
+ kernel/irq/generic-chip.c | 4 +-
+ kernel/kprobes.c | 2 +-
+ kernel/lockdep.c | 5 +-
+ kernel/sys_ni.c | 4 +
+ kernel/sysctl.c | 103 +-
+ kernel/taskstats.c | 18 +-
+ kernel/time.c | 2 +-
+ kernel/timer.c | 54 +-
+ lib/Kconfig.debug | 18 +
+ lib/Makefile | 1 +
+ lib/crc32.c | 370 ++++--
+ lib/crc32defs.h | 16 +-
+ lib/debugobjects.c | 33 +
+ lib/fault-inject.c | 20 +-
+ lib/gen_crc32table.c | 59 +-
+ lib/idr.c | 67 +
+ lib/radix-tree.c | 131 ++-
+ {arch/s390/lib => lib}/usercopy.c | 0
+ mm/Makefile | 3 +-
+ mm/compaction.c | 24 +-
+ mm/failslab.c | 14 +-
+ mm/filemap.c | 106 +-
+ mm/memcontrol.c | 71 +-
+ mm/mempolicy.c | 4 +-
+ mm/migrate.c | 75 +-
+ mm/mincore.c | 11 +-
+ mm/oom_kill.c | 5 +-
+ mm/page-writeback.c | 122 +-
+ mm/page_alloc.c | 13 +-
+ mm/process_vm_access.c | 487 +++++++
+ mm/shmem.c | 1493 +++++++-------------
+ mm/swapfile.c | 20 +-
+ mm/truncate.c | 8 +
+ mm/vmscan.c | 63 +-
+ security/keys/compat.c | 2 +-
+ security/keys/keyctl.c | 2 +-
+ security/selinux/selinuxfs.c | 14 +-
+ 177 files changed, 4044 insertions(+), 2551 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
+ create mode 100644 drivers/leds/leds-renesas-tpu.c
+ create mode 100644 drivers/pps/clients/pps-gpio.c
+ create mode 100644 include/linux/leds-renesas-tpu.h
+ create mode 100644 include/linux/pps-gpio.h
+ create mode 100644 include/trace/events/irq_vectors.h
+ rename {arch/s390/lib => lib}/usercopy.c (100%)
+ create mode 100644 mm/process_vm_access.c
+$ git am -3 ../patches/fault-injection-add-ability-to-export-fault_attr-in-arbitrary-directory-fix.patch_added_to_-mm_tree.patch
+Applying: fault-injection-add-ability-to-export-fault_attr-in-arbitrary-directory-fix
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/linux/fault-inject.h
+$ git add .
+$ git commit -v -a --amend
+[master e04da3c] Merge branch 'akpm'
+$ git revert 750f463a749e
+[master eb0d47f] Revert "dt: add of_alias_scan and of_alias_get_id"
+ 4 files changed, 2 insertions(+), 141 deletions(-)
projects / karo-tx-linux.git / commitdiff