From: Linus Torvalds Date: Fri, 9 Jan 2009 22:00:58 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu X-Git-Tag: v2.6.29-rc1~22 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c40f6f8bbc4cbd2902671aacd587400ddca62627;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu: NOMMU: Support XIP on initramfs NOMMU: Teach kobjsize() about VMA regions. FLAT: Don't attempt to expand the userspace stack to fill the space allocated FDPIC: Don't attempt to expand the userspace stack to fill the space allocated NOMMU: Improve procfs output using per-MM VMAs NOMMU: Make mmap allocation page trimming behaviour configurable. NOMMU: Make VMAs per MM as for MMU-mode linux NOMMU: Delete askedalloc and realalloc variables NOMMU: Rename ARM's struct vm_region NOMMU: Fix cleanup handling in ramfs_nommu_get_umapped_area() --- c40f6f8bbc4cbd2902671aacd587400ddca62627