Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Oct 2014 19:53:45 +0000 (12:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Oct 2014 19:53:45 +0000 (12:53 -0700)
commit848a552893ff1fe071c57231edcd179cf84ec4f8
tree720c74e623ead59f388f306b86fb0963f2813aec
parent43d451f163c1b615c1bedef95258c49712679eeb
parent1fa3a002b2546c42c343c77c144871285896ced5
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

Pull email address change from Boaz Harrosh.

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  Boaz Harrosh - fix email in Documentation
  Boaz Harrosh - Fix broken email address
  MAINTAINERS: Change Boaz Harrosh's email
MAINTAINERS
drivers/scsi/osd/osd_initiator.c
fs/nfs/objlayout/objio_osd.c
fs/nfs/objlayout/objlayout.c
fs/nfs/objlayout/objlayout.h