diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /drivers/media/radio/radio-cadet.c | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/media/radio/radio-cadet.c')
| -rw-r--r-- | drivers/media/radio/radio-cadet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 0490a1fa999d..bfd37f38b9ab 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | * 2002-01-17 Adam Belay <ambx1@neo.rr.com> | 23 | * 2002-01-17 Adam Belay <ambx1@neo.rr.com> |
| 24 | * Updated to latest pnp code | 24 | * Updated to latest pnp code |
| 25 | * | 25 | * |
| 26 | * 2003-01-31 Alan Cox <alan@redhat.com> | 26 | * 2003-01-31 Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 27 | * Cleaned up locking, delay code, general odds and ends | 27 | * Cleaned up locking, delay code, general odds and ends |
| 28 | * | 28 | * |
| 29 | * 2006-07-30 Hans J. Koch <koch@hjk-az.de> | 29 | * 2006-07-30 Hans J. Koch <koch@hjk-az.de> |