diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-18 18:46:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-18 18:46:41 +0100 |
| commit | c877dd285464741cb4c87d07bfcb924d8acf4af3 (patch) | |
| tree | 2d9619036694fc9ddee510be4922ac6c7e472b6e /drivers/tty | |
| parent | 5b301892983be4434690a2440282e2aca87662c3 (diff) | |
| parent | 887191f9ae57f7adb3b4540a096f90f358d8e339 (diff) | |
| download | juno-c877dd285464741cb4c87d07bfcb924d8acf4af3.tar.gz | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
arch/arm64/Makefile
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions