diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-25 17:52:21 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-25 17:52:21 -0600 |
commit | 5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch) | |
tree | dfa1522796d5af649caf64ac6e2f1e69119e85d0 /drivers/clocksource/cs5535-clockevt.c | |
parent | cf40f082f8d3a98e28af02af20d00d2500eb6a65 (diff) | |
parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) |
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'drivers/clocksource/cs5535-clockevt.c')
-rw-r--r-- | drivers/clocksource/cs5535-clockevt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c index d7be69f13154..b7dab32ce63c 100644 --- a/drivers/clocksource/cs5535-clockevt.c +++ b/drivers/clocksource/cs5535-clockevt.c @@ -194,6 +194,6 @@ err_timer: module_init(cs5535_mfgpt_init); -MODULE_AUTHOR("Andres Salomon <dilinger@collabora.co.uk>"); +MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>"); MODULE_DESCRIPTION("CS5535/CS5536 MFGPT clock event driver"); MODULE_LICENSE("GPL"); |