From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Aug 2014 16:56:25 +0000 (-0600)
Subject: Merge branch 'akpm' (fixes from Andrew Morton)
X-Git-Tag: v4.14-rc1~7007
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2937e4540836be5c4db7e0a721ce3cfc59036e3;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'akpm' (fixes from Andrew Morton)

Merge leftovers from Andrew Morton:
 "A few leftovers.

  I have a bunch of OCFS2 patches which are still out for review and
  which I might sneak along after -rc1.  Partly my fault - I should send
  my review pokes out earlier"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: fix CROSS_MEMORY_ATTACH help text grammar
  drivers/mfd/rtsx_usb.c: export device table
  mm, hugetlb_cgroup: align hugetlb cgroup limit to hugepage size
---

f2937e4540836be5c4db7e0a721ce3cfc59036e3