Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Mar 2012 03:04:27 +0000 (20:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Mar 2012 03:04:27 +0000 (20:04 -0700)
commitafb9bd704c7116076879352a2cc2c43aa12c1e14
treeb622fba5044ef3111050ca9dacce207ba49fea39
parent58df9b387c5f240566ac15b7fa5136f5a35bb19a
parent72749a270b6d254b4a018e290b853c27edb2fa62
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

Pull trivial exofs changes from Boaz Harrosh:
 "Just nothingness really.  The big exofs changes are reserved for the
  next merge window."

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: Cap on the memcpy() size
  exofs: (trivial) Fix typo in super.c
  exofs: fix endian conversion in exofs_sync_fs()
fs/exofs/super.c