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

diff --cc drivers/net/tun.c
Simple merge

diff --cc include/uapi/linux/if_pppox.h
Simple merge

diff --cc kernel/hrtimer.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge