Merge remote-tracking branch 'lsk/v3.10/topic/warnings' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 11 Dec 2013 22:41:14 +0000 (22:41 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 11 Dec 2013 22:41:14 +0000 (22:41 +0000)
Conflicts:
arch/arm64/include/asm/cmpxchg.h


Trivial merge