Merge branch 'linux-3.14.25' into tizen_next_linux_3.14

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

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

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge