diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 18:00:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 18:00:17 -0700 |
| commit | 4864ccbb5a6f99e4c44dc816304007547a268b9f (patch) | |
| tree | d6cbb0ea8671dffcaab98b17fbf9a72e16245ad0 /include/linux | |
| parent | 735f0a985ac414b6e5f09cf6199b6fd5e118ff62 (diff) | |
| parent | 213d27a42ce1646989966011d2af8563feac5635 (diff) | |
Merge tag 'spi-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
Pull spi fixes from Mark Brown:
"A bunch of fixes here, mostly minor except for the pl022 which has
just been a bit of a shambles all round, the recent runtime PM changes
have as far as I can tell never worked so they're just getting thrown
out."
* tag 'spi-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
spi/pl022: Revert recent runtime PM changes
spi: tsc2005: delete soon-obsolete e-mail address
spi: spi-rspi: fix build error for the latest shdma driver
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/spi/tsc2005.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/spi/tsc2005.h b/include/linux/spi/tsc2005.h index d9b0c84220c..8f721e465e0 100644 --- a/include/linux/spi/tsc2005.h +++ b/include/linux/spi/tsc2005.h @@ -3,8 +3,6 @@ * * Copyright (C) 2009-2010 Nokia Corporation * - * Contact: Aaro Koskinen <aaro.koskinen@nokia.com> - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or |