diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/macintosh | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 8b9364434aa0..3fbe41b0ac07 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * | 15 | * |
| 16 | * WARNING: This driver has only been testen on Apple's | 16 | * WARNING: This driver has only been testen on Apple's |
| 17 | * 1.25 MHz Dual G4 (March 03). It is tuned for a CPU | 17 | * 1.25 MHz Dual G4 (March 03). It is tuned for a CPU |
| 18 | * temperatur around 57 C. | 18 | * temperature around 57 C. |
| 19 | * | 19 | * |
| 20 | * Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se) | 20 | * Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se) |
| 21 | * | 21 | * |