diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-02 20:27:52 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-02 20:27:52 (GMT) |
commit | ae41fce3cce96b21ae821095654f9d796eae2452 (patch) | |
tree | aac7f635cff07d25a9530384aa48786273d73bf6 /drivers/net/netconsole.c | |
parent | b987a834f61a25ac61835d548ff8fd3388c4e4a8 (diff) | |
parent | eaa7cc60f7dff5e74ef387ace8228235fab8241b (diff) | |
download | linux-ae41fce3cce96b21ae821095654f9d796eae2452.tar.xz |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/net/netconsole.c')
0 files changed, 0 insertions, 0 deletions