Merge 'v2.6.39-100.5.1+3.0.25+ext4+hxge' into uek2-200

Conflicts:
	mm/filemap.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/process_32.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/pci/acpi.c
Simple merge

diff --cc drivers/acpi/sleep.c
Simple merge

diff --cc drivers/pci/msi.c
Simple merge

diff --cc fs/aio.c
Simple merge

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc uek-rpm/ol6/config-generic
Simple merge