Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Wed, 4 Dec 2013 03:21:28 +0000 (11:21 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 4 Dec 2013 03:21:28 +0000 (11:21 +0800)
For tixy's cache disable patchset.

1  2 
arch/arm/include/asm/cacheflush.h

Simple merge