Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Sat, 6 Sep 2014 10:08:30 +0000 (11:08 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 6 Sep 2014 10:08:30 +0000 (11:08 +0100)
1  2 
drivers/tty/serial/serial_core.c
fs/nfs/nfs4proc.c

Simple merge
Simple merge