Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 6 Oct 2013 13:31:06 +0000 (14:31 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 6 Oct 2013 13:31:06 +0000 (14:31 +0100)
1  2 
drivers/usb/gadget/f_fs.c

Simple merge