Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 12:00:37 +0000 (13:00 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 12:00:37 +0000 (13:00 +0100)
commitc00a30dfd0f0502102668bb43258742e07adf591
tree27233b3aa9ca7e909212937ead9bc623fc99b08a
parent535ad2c06cf12f3f075e3d9a141476beb367ae6b
parent3b08c7740bb1e0ef69c71c7232a870ca250a9e21
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/net/tun.c
include/uapi/linux/if_pppox.h
kernel/hrtimer.c
lib/Kconfig.debug