Merge branch 'common/mmcif' into rmobile-latest

2026-11-13 07:31:07 +00:00 · 2011-01-14 16:06:31 +09:00 · 2011-01-14 16:06:31 +09:00 · c488a4731a
commit c488a4731a
parent 6d2ae89c36 bba958783b
181 changed files with 9940 additions and 2132 deletions
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
--- a/Documentation/device-mapper/dm-crypt.txt
+++ b/Documentation/device-mapper/dm-crypt.txt
--- a/Documentation/device-mapper/dm-raid.txt
+++ b/Documentation/device-mapper/dm-raid.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/vm/transhuge.txt
+++ b/Documentation/vm/transhuge.txt
--- a/3
+++ b/3
--- a/arch/alpha/include/asm/mman.h
+++ b/arch/alpha/include/asm/mman.h
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
--- a/arch/avr32/configs/atngw100mkii_defconfig
+++ b/arch/avr32/configs/atngw100mkii_defconfig
--- a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
--- a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
--- a/arch/avr32/configs/favr-32_defconfig
+++ b/arch/avr32/configs/favr-32_defconfig
--- a/arch/avr32/configs/hammerhead_defconfig
+++ b/arch/avr32/configs/hammerhead_defconfig
--- a/arch/avr32/include/asm/syscalls.h
+++ b/arch/avr32/include/asm/syscalls.h
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
--- a/arch/mips/include/asm/mman.h
+++ b/arch/mips/include/asm/mman.h
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
--- a/arch/parisc/include/asm/mman.h
+++ b/arch/parisc/include/asm/mman.h
--- a/arch/powerpc/mm/gup.c
+++ b/arch/powerpc/mm/gup.c
--- a/arch/sh/mm/hugetlbpage.c
+++ b/arch/sh/mm/hugetlbpage.c
--- a/arch/sparc/kernel/module.c
+++ b/arch/sparc/kernel/module.c
--- a/arch/sparc/mm/generic_32.c
+++ b/arch/sparc/mm/generic_32.c
--- a/arch/sparc/mm/generic_64.c
+++ b/arch/sparc/mm/generic_64.c
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
--- a/arch/x86/include/asm/pgtable-2level.h
+++ b/arch/x86/include/asm/pgtable-2level.h
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
--- a/arch/x86/mm/gup.c
+++ b/arch/x86/mm/gup.c
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
--- a/arch/xtensa/include/asm/mman.h
+++ b/arch/xtensa/include/asm/mman.h
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
--- a/drivers/md/dm-log-userspace-base.c
+++ b/drivers/md/dm-log-userspace-base.c
--- a/drivers/md/dm-log-userspace-transfer.c
+++ b/drivers/md/dm-log-userspace-transfer.c
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
--- a/fs/mpage.c
+++ b/fs/mpage.c
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
--- a/Show more
+++ b/Show more