diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
tree | 214348d40ed547a72f9612a7e5c94a01afded812 /drivers/ata/pata_triflex.c | |
parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
download | talos-obmc-linux-3af4182cc5be7d5505f9801ee3297373f1872446.tar.gz talos-obmc-linux-3af4182cc5be7d5505f9801ee3297373f1872446.zip |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'drivers/ata/pata_triflex.c')
-rw-r--r-- | drivers/ata/pata_triflex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c index b181261f2743..ef9597517cdd 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c @@ -1,7 +1,7 @@ /* * pata_triflex.c - Compaq PATA for new ATA layer * (C) 2005 Red Hat Inc - * Alan Cox <alan@redhat.com> + * Alan Cox <alan@lxorguk.ukuu.org.uk> * * based upon * |