]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2011 03:28:32 +0000 (19:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2011 03:28:32 +0000 (19:28 -0800)
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: convert drivers/hwmon/* to use module_platform_driver()
  hwmon: Remove redundant spi driver bus initialization


Trivial merge