Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Tue, 12 May 2015 06:55:30 +0000 (14:55 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 12 May 2015 06:55:30 +0000 (14:55 +0800)
commit1f8fdf83fe376cc83e96e942689a6cfac01e9634
tree5bd0c30cb23791f2806c85631fe45079e6917b9b
parent8134585f1c33565ea5e752a7ba9323ed3e0921f3
parent043787104c5b1386a96c317f2e82ecff257dd9c5
Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk

 Conflicts:
mm/Kconfig
mm/Makefile
include/linux/cpu.h
lib/Makefile
mm/Kconfig
mm/Makefile