aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/lp486e.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-04-19 21:32:41 +1000
committerJames Morris <jmorris@namei.org>2011-04-19 21:32:41 +1000
commitd4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch)
treeeefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/lp486e.c
parentc0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff)
parent96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff)
downloadkernel_samsung_smdk4412-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.zip
kernel_samsung_smdk4412-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.gz
kernel_samsung_smdk4412-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.bz2
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/lp486e.c')
-rw-r--r--drivers/net/lp486e.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 3698824..385a953 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -27,7 +27,7 @@
Credits:
Thanks to Murphy Software BV for letting me write this in their time.
- Well, actually, I get payed doing this...
+ Well, actually, I get paid doing this...
(Also: see http://www.murphy.nl for murphy, and my homepage ~ard for
more information on the Professional Workstation)