From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Apr 2011 15:32:56 +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-rc2~26
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=7dbb25a579fe1f068358a19928ada4f9be62e60d

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: twl4030-madc-hwmon: add "platform:" prefix for platform modalias
---

7dbb25a579fe1f068358a19928ada4f9be62e60d