diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-02 13:30:07 -0400 |
commit | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch) | |
tree | a4ab2bfc578f279fc6847031f501d84c75057531 /include/linux/spi | |
parent | 3e502e63586920f219ed2590f69c1f5a8888cfa4 (diff) | |
parent | 85f72bc839705294b32b6c16b491c0422f0a71b3 (diff) | |
download | kernel_samsung_crespo-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.zip kernel_samsung_crespo-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.gz kernel_samsung_crespo-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'include/linux/spi')
-rw-r--r-- | include/linux/spi/wl12xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spi/wl12xx.h b/include/linux/spi/wl12xx.h index a223ecb..a20bccf 100644 --- a/include/linux/spi/wl12xx.h +++ b/include/linux/spi/wl12xx.h @@ -3,7 +3,7 @@ * * Copyright (C) 2009 Nokia Corporation * - * Contact: Kalle Valo <kalle.valo@nokia.com> + * Contact: Luciano Coelho <luciano.coelho@nokia.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |