Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 14 May 2014 18:10:54 +0000 (19:10 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 May 2014 18:10:54 +0000 (19:10 +0100)
1  2 
drivers/usb/phy/Kconfig

Simple merge