diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /drivers/macintosh | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/therm_pm72.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index bb8b722a978..0ff92c20800 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
| @@ -44,11 +44,11 @@ | |||
| 44 | * TODO: - Check MPU structure version/signature | 44 | * TODO: - Check MPU structure version/signature |
| 45 | * - Add things like /sbin/overtemp for non-critical | 45 | * - Add things like /sbin/overtemp for non-critical |
| 46 | * overtemp conditions so userland can take some policy | 46 | * overtemp conditions so userland can take some policy |
| 47 | * decisions, like slewing down CPUs | 47 | * decisions, like slowing down CPUs |
| 48 | * - Deal with fan and i2c failures in a better way | 48 | * - Deal with fan and i2c failures in a better way |
| 49 | * - Maybe do a generic PID based on params used for | 49 | * - Maybe do a generic PID based on params used for |
| 50 | * U3 and Drives ? Definitely need to factor code a bit | 50 | * U3 and Drives ? Definitely need to factor code a bit |
| 51 | * bettter... also make sensor detection more robust using | 51 | * better... also make sensor detection more robust using |
| 52 | * the device-tree to probe for them | 52 | * the device-tree to probe for them |
| 53 | * - Figure out how to get the slots consumption and set the | 53 | * - Figure out how to get the slots consumption and set the |
| 54 | * slots fan accordingly | 54 | * slots fan accordingly |