Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 848a5528 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 43d451f1 1fa3a002

Documentation/scsi/osd.txt

+1 −2
Original line number Diff line number Diff line
@@ -184,8 +184,7 @@ Any problems, questions, bug reports, lonely OSD nights, please email: 
More up-to-date information can be found on:

http://open-osd.org



Boaz Harrosh <bharrosh@panasas.com>

Benny Halevy <bhalevy@panasas.com>

Boaz Harrosh <ooo@electrozaur.com>



References

==========

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6830,7 +6830,7 @@ S: Orphan 
F:	drivers/net/wireless/orinoco/



OSD LIBRARY and FILESYSTEM

M:	Boaz Harrosh <bharrosh@panasas.com>

M:	Boaz Harrosh <ooo@electrozaur.com>

M:	Benny Halevy <bhalevy@primarydata.com>

L:	osd-dev@open-osd.org

W:	http://open-osd.org

drivers/scsi/osd/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# Copyright (C) 2008 Panasas Inc.  All rights reserved.

#

# Authors:

#   Boaz Harrosh <bharrosh@panasas.com>

#   Boaz Harrosh <ooo@electrozaur.com>

#   Benny Halevy <bhalevy@panasas.com>

#

# This program is free software; you can redistribute it and/or modify

drivers/scsi/osd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# Copyright (C) 2008 Panasas Inc.  All rights reserved.

#

# Authors:

#   Boaz Harrosh <bharrosh@panasas.com>

#   Boaz Harrosh <ooo@electrozaur.com>

#   Benny Halevy <bhalevy@panasas.com>

#

# This program is free software; you can redistribute it and/or modify

drivers/scsi/osd/osd_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Copyright (C) 2008 Panasas Inc.  All rights reserved.

 *

 * Authors:

 *   Boaz Harrosh <bharrosh@panasas.com>

 *   Boaz Harrosh <ooo@electrozaur.com>

 *   Benny Halevy <bhalevy@panasas.com>

 *

 * This program is free software; you can redistribute it and/or modify