From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 May 2010 14:57:41 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
X-Git-Tag: firefly_0821_release~9833^2~2029
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0163916f1db7f345963dad1af78b7628c759c6ee;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: confusion between kmap() and kmap_atomic() api
  exofs: Add default address_space_operations
---

0163916f1db7f345963dad1af78b7628c759c6ee