diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 18:28:24 +0200 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 18:28:24 +0200 |
| commit | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (patch) | |
| tree | bac4953f8899d6600f4716c0bcde1e25e34c2591 /drivers/net/ibmlana.c | |
| parent | bq27x00_battery: use unaligned access helper (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-ed8c3174dd227031d1f3b9fa4fbb512f8f623434.tar.xz linux-ed8c3174dd227031d1f3b9fa4fbb512f8f623434.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/Makefile
Diffstat (limited to 'drivers/net/ibmlana.c')
| -rw-r--r-- | drivers/net/ibmlana.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index 95e3464068db..f02764725a22 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c @@ -71,7 +71,7 @@ History: June 1st, 2000 corrected version codes, added support for the latest 2.3 changes Oct 28th, 2002 - cleaned up for the 2.5 tree <alan@redhat.com> + cleaned up for the 2.5 tree <alan@lxorguk.ukuu.org.uk> *************************************************************************/ |