diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 15:39:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 15:39:48 +1000 |
| commit | 5eb39559db0ada9d0cab0b7f802a2fa8b9b733f5 (patch) | |
| tree | 7f4e4a7c78c396dfcffa8bf149899be3c87c26da /drivers/net/irda/smsc-ircc2.c | |
| parent | 00da9e30c72ccbdad5e074146b16cc413dc373f8 (diff) | |
| parent | 030352a9c7715780b2c01033ae9afe56249bb7cc (diff) | |
Merge commit 'net/master'
Conflicts:
Documentation/powerpc/booting-without-of.txt
Diffstat (limited to 'drivers/net/irda/smsc-ircc2.c')
| -rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index cfe0194fef71..78dc8e7837f0 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c @@ -1,5 +1,4 @@ /********************************************************************* - * $Id: smsc-ircc2.c,v 1.19.2.5 2002/10/27 11:34:26 dip Exp $ * * Description: Driver for the SMC Infrared Communications Controller * Status: Experimental. |