diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-17 13:40:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-17 13:40:43 +0800 |
| commit | 26fb95cac56be1885787cfc69881d906f4814c46 (patch) | |
| tree | c6f0f9fdb95a0ba6bd2bdd354adcd622493c8e26 /net/irda/af_irda.c | |
| parent | b674d6ecd467c91c826536240ee6863d13ff83c0 (diff) | |
| parent | 146f542aac2cc725aa32f51b354eba5ece7ae08b (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android
Remove conflictsed drivers/staging/android/logger.c
Diffstat (limited to 'net/irda/af_irda.c')
0 files changed, 0 insertions, 0 deletions