Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2011 15:32:56 +0000 (08:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2011 15:32:56 +0000 (08:32 -0700)
commit7dbb25a579fe1f068358a19928ada4f9be62e60d
tree29730185284cbe3ac6252847e15df35118958737
parent4352d9d44b935e4d000be6ec89ddb55c2bf35f24
parentc4757ee58ae08fa6eb4df6d5e0f417e11d40bc0e
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