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

diff --cc block/genhd.c
Simple merge

diff --cc drivers/hid/hid-input.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc fs/pstore/ram.c
Simple merge

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

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

diff --cc mm/mmap.c
Simple merge

diff --cc mm/vmscan.c
Simple merge