diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
tree | ccb9c107744c10b553c0373e450bee3971d16c00 /drivers/ptp/ptp_ixp46x.c | |
parent | atm: fix comments (diff) | |
parent | Linux 3.4-rc2 (diff) | |
download | linux-dev-e75d660672ddd11704b7f0fdb8ff21968587b266.tar.xz linux-dev-e75d660672ddd11704b7f0fdb8ff21968587b266.zip |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'drivers/ptp/ptp_ixp46x.c')
-rw-r--r-- | drivers/ptp/ptp_ixp46x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c index 803d665b15ef..6f2782bb5f41 100644 --- a/drivers/ptp/ptp_ixp46x.c +++ b/drivers/ptp/ptp_ixp46x.c @@ -327,6 +327,6 @@ no_master: module_init(ptp_ixp_init); module_exit(ptp_ixp_exit); -MODULE_AUTHOR("Richard Cochran <richard.cochran@omicron.at>"); +MODULE_AUTHOR("Richard Cochran <richardcochran@gmail.com>"); MODULE_DESCRIPTION("PTP clock using the IXP46X timer"); MODULE_LICENSE("GPL"); |