Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 4 Aug 2013 12:16:28 +0000 (13:16 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 4 Aug 2013 12:16:28 +0000 (13:16 +0100)
1  2 
drivers/usb/gadget/udc-core.c
kernel/trace/trace.c

Simple merge
Simple merge