Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 14:57:41 +0000 (07:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 14:57:41 +0000 (07:57 -0700)
commit0163916f1db7f345963dad1af78b7628c759c6ee
treec33e3551b7825e8700db65b8b27869f6f7d45c72
parenta69eee4988752c7196677958b4ed8f4c2b28499a
parentddf08f4b90a413892bbb9bb2e8a57aed991cd47d
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
fs/exofs/inode.c