diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 23:56:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 23:56:41 +0800 |
| commit | 60d29b4f9bf5466c1d6eccac414765b7ac2e8eb4 (patch) | |
| tree | 51ea304cd736ff03faa6bc568644a9d15b628d4a /drivers/tty/tty_port.c | |
| parent | 0a1e99e83990f72055eadd7ab5793b9f63e16834 (diff) | |
| parent | 450cdfa9c5713551ab1438ab210679868b52a994 (diff) | |
| download | juno-60d29b4f9bf5466c1d6eccac414765b7ac2e8eb4.tar.gz | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
include/linux/mm_types.h
Diffstat (limited to 'drivers/tty/tty_port.c')
0 files changed, 0 insertions, 0 deletions