diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /drivers/s390/cio/airq.c | |
| parent | 044f324f6ea5d55391db62fca6a295b2651cb946 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'drivers/s390/cio/airq.c')
| -rw-r--r-- | drivers/s390/cio/airq.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c index cd2cc28e16a7..5287631fbfc8 100644 --- a/drivers/s390/cio/airq.c +++ b/drivers/s390/cio/airq.c | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | * drivers/s390/cio/airq.c | 2 | * drivers/s390/cio/airq.c |
| 3 | * S/390 common I/O routines -- support for adapter interruptions | 3 | * S/390 common I/O routines -- support for adapter interruptions |
| 4 | * | 4 | * |
| 5 | * $Revision: 1.15 $ | ||
| 6 | * | ||
| 7 | * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, | 5 | * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, |
| 8 | * IBM Corporation | 6 | * IBM Corporation |
| 9 | * Author(s): Ingo Adlung (adlung@de.ibm.com) | 7 | * Author(s): Ingo Adlung (adlung@de.ibm.com) |