tree ebf95f236e95f074f0ad7a6f99d13e816f594f8a
parent 4ba85265790ba3681deeaf73f018c0eb829a7341
parent f1f6630b53e702648a248fecd881f3df5968a31a
author Linus Torvalds <torvalds@linux-foundation.org> 1397165582 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397165582 -0700

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

Pull exofs updates from Boaz Harrosh:
 "Trivial updates to exofs for 3.15-rc1

  Just a few fixes sent by people"

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  MAINTAINERS: Update email address for bhalevy
  fs: Mark functions as static in exofs/ore_raid.c
  fs: Mark function as static in exofs/super.c