summaryrefslogtreecommitdiffstats
path: root/include/linux/firmware-map.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-02-23 14:05:56 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2009-02-23 14:05:56 -0800
commitdc731ca60954310be0993e8992d450c7089fd13d (patch)
tree6a997916f963d9e6dfa76fc5564296f57c3f909e /include/linux/firmware-map.h
parentec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff)
parent20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff)
downloadkernel-crypto-dc731ca60954310be0993e8992d450c7089fd13d.tar.gz
kernel-crypto-dc731ca60954310be0993e8992d450c7089fd13d.tar.xz
kernel-crypto-dc731ca60954310be0993e8992d450c7089fd13d.zip
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'include/linux/firmware-map.h')
-rw-r--r--include/linux/firmware-map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/firmware-map.h b/include/linux/firmware-map.h
index 6e199c8dfac..cca686b3912 100644
--- a/include/linux/firmware-map.h
+++ b/include/linux/firmware-map.h
@@ -1,7 +1,7 @@
/*
* include/linux/firmware-map.h:
* Copyright (C) 2008 SUSE LINUX Products GmbH
- * by Bernhard Walle <bwalle@suse.de>
+ * by Bernhard Walle <bernhard.walle@gmx.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License v2.0 as published by