diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-14 18:52:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-14 18:52:03 +0100 |
| commit | a75f9b8beff402082cff34ff754eedea483f4bad (patch) | |
| tree | 780a16df0f866eac86855dc1ef3181f9b001d794 /kernel/sched/sched.h | |
| parent | 0d18f973afa17a69b1a9341f7c6a655c259b774a (diff) | |
| parent | 8816ee48f893b905eafbd78e76386394ee43686d (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk
Conflicts:
drivers/usb/phy/phy-ulpi.c
Diffstat (limited to 'kernel/sched/sched.h')
0 files changed, 0 insertions, 0 deletions