]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b03632 3d98af3)
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Aug 2012 20:11:00 +0000 (13:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Aug 2012 20:11:00 +0000 (13:11 -0700)
commitf037a7504d98d5e97c6023696af4f99ddc4e4c9e
tree6ddd02441c199102d54b7a6e20b4dea2c94b2686tree | snapshot
parent7b03632ad5ebbc0f44dae8809455ef912f2fc48dcommit | diff
parent3d98af35dedca73a94ec392b3eeb51372e4ce86bcommit | diff
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull a hwmon fix from Guenter Roeck:
 "One patch with section conflict fixes."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  sections: Fix section conflicts in drivers/hwmon
Linux Kernel Source Tree.