Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 5 Jun 2014 14:03:54 +0000 (15:03 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 5 Jun 2014 14:03:54 +0000 (15:03 +0100)
1  2 
include/linux/serial_core.h

Simple merge