From: Mark Brown Date: Wed, 11 Dec 2013 22:41:14 +0000 (+0000) Subject: Merge remote-tracking branch 'lsk/v3.10/topic/warnings' into linux-linaro-lsk X-Git-Tag: firefly_0821_release~3680^2~158^2~28 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fae4bb16eec6425bd37495d8fa7d70bde98b368b;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'lsk/v3.10/topic/warnings' into linux-linaro-lsk Conflicts: arch/arm64/include/asm/cmpxchg.h --- fae4bb16eec6425bd37495d8fa7d70bde98b368b