Merge remote-tracking branch 'asoc/fix/cs4271' into tmp

[~andy/linux] / include / media / v4l2-fh.h

diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h
index 52513c225c182c6d8d5a4906b78a40a45834f112..a62ee18cb7b799c3982decdb63dc57f520e9b93a 100644 (file)
--- a/include/media/v4l2-fh.h
+++ b/include/media/v4l2-fh.h
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 2009--2010 Nokia Corporation.
  *
- * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
+ * Contact: Sakari Ailus <sakari.ailus@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License