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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/scsi/osd/osd_initiator.c
Simple merge

diff --cc fs/nfs/objlayout/objio_osd.c
Simple merge

diff --cc fs/nfs/objlayout/objlayout.c
Simple merge

diff --cc fs/nfs/objlayout/objlayout.h
Simple merge