Merge remote-tracking branch 'lsk/v3.10/topic/mm' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 15:19:03 +0000 (16:19 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 15:19:03 +0000 (16:19 +0100)
1  2 
mm/hugetlb.c

diff --cc mm/hugetlb.c
Simple merge