From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Apr 2014 21:33:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
X-Git-Tag: Ubuntu-5.10.0-12.13~17102
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9e897e13bd46fa03485468609741974259a8c573;p=mirror_ubuntu-hirsute-kernel.git

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
---

9e897e13bd46fa03485468609741974259a8c573