Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc drivers/tty/serial/serial_core.c
Simple merge

diff --cc drivers/usb/gadget/udc-core.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

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

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

diff --cc kernel/freezer.c
Simple merge

diff --cc kernel/power/process.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge