tree 29730185284cbe3ac6252847e15df35118958737
parent 4352d9d44b935e4d000be6ec89ddb55c2bf35f24
parent c4757ee58ae08fa6eb4df6d5e0f417e11d40bc0e
author Linus Torvalds <torvalds@linux-foundation.org> 1301931176 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301931176 -0700

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: add "platform:" prefix for platform modalias