]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Nov 2012 20:27:52 +0000 (13:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Nov 2012 20:27:52 +0000 (13:27 -0700)
commitae41fce3cce96b21ae821095654f9d796eae2452
treeaac7f635cff07d25a9530384aa48786273d73bf6
parentb987a834f61a25ac61835d548ff8fd3388c4e4a8
parenteaa7cc60f7dff5e74ef387ace8228235fab8241b
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "An e-mail address update, and fix a compile error on SPARC"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: Only include of_match_table with CONFIG_OF_GPIO
  hwmon, fam15h_power: Change email address, MAINTAINERS entry
MAINTAINERS