From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 May 2011 15:47:12 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v2.6.39-rc6~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fa515888821d307a79cb8d1e8e052b7aff39d844;p=users%2Fjedix%2Flinux-maple.git

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails
---

fa515888821d307a79cb8d1e8e052b7aff39d844