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)
commit4e65656dfa8cfd0660bac70cba7466d04e565ba6
tree99444533d96eddedeef878691adf7d4d410c7dbf
parentce83d4f70eeab2613f9bb64a0db3767ec0416326
parentebb1d078e4a8f9f2e9d1c822823671d5131fc42f
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/tty/serial/serial_core.c
fs/nfs/nfs4proc.c