summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/osd/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds2014-10-21 21:53:45 +0200
committerLinus Torvalds2014-10-21 21:53:45 +0200
commit848a552893ff1fe071c57231edcd179cf84ec4f8 (patch)
tree720c74e623ead59f388f306b86fb0963f2813aec /drivers/scsi/osd/Kconfig
parentMerge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/workin... (diff)
parentBoaz Harrosh - fix email in Documentation (diff)
downloadkernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.gz
kernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.xz
kernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.zip
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
Diffstat (limited to 'drivers/scsi/osd/Kconfig')
-rw-r--r--drivers/scsi/osd/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osd/Kconfig b/drivers/scsi/osd/Kconfig
index a0703514eb0f..347cc5e33749 100644
--- a/drivers/scsi/osd/Kconfig
+++ b/drivers/scsi/osd/Kconfig
@@ -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