summaryrefslogtreecommitdiff
path: root/drivers/w1/w1_family.h
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2011-10-19 12:30:42 (GMT)
committerJens Axboe <axboe@kernel.dk>2011-10-19 12:30:42 (GMT)
commit5c04b426f2e8b46cfc7969a35b2631063a3c646c (patch)
tree2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 /drivers/w1/w1_family.h
parent499337bb6511e665a236a6a947f819d98ea340c6 (diff)
parent899e3ee404961a90b828ad527573aaaac39f0ab1 (diff)
downloadlinux-fsl-qoriq-5c04b426f2e8b46cfc7969a35b2631063a3c646c.tar.xz
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts: block/blk-core.c include/linux/blkdev.h Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/w1/w1_family.h')
-rw-r--r--drivers/w1/w1_family.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index 98a1ac0..490cda2 100644
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -1,7 +1,7 @@
/*
* w1_family.h
*
- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+ * Copyright (c) 2004 Evgeniy Polyakov <zbr@ioremap.net>
*
*
* This program is free software; you can redistribute it and/or modify