From: Alex Shi <alex.shi@linaro.org>
Date: Fri, 17 Apr 2015 05:40:43 +0000 (+0800)
Subject: Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro... 
X-Git-Tag: firefly_0821_release~3680^2~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=26fb95cac56be1885787cfc69881d906f4814c46;p=firefly-linux-kernel-4.4.55.git

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
---

26fb95cac56be1885787cfc69881d906f4814c46