]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2014 21:33:02 +0000 (14:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2014 21:33:02 +0000 (14:33 -0700)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge