tree 6223d17d7601212c51d223657d273d6e7bc0807a
parent df632d3ce7eacf92ad9b642301c7b53a1d95b8d8
parent 0657777fcefffbf79d4a5fa0952a3f1a4248c0da
author Linus Torvalds <torvalds@linux-foundation.org> 1349912958 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1349912958 +0900

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Pull hwmon updates from Jean Delvare:
 "Only trivial things this time"

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: Drop needless includes of <linux/delay.h>
  hwmon: Add missing inclusions of <linux/err.h>
  hwmon: Add missing inclusions of <linux/jiffies.h>
  hwmon: Fix spelling of Celsius
  hwmon: Update Alexey Fisher's name