]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe0caa4 9b98e54)
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)
commit6bbff9329dcb6474afcc732e71e0a6a754c5adb9
tree6ddd02441c199102d54b7a6e20b4dea2c94b2686tree | snapshot
parentfe0caa42782c75c1a3284d32c5c32c7e43762de4commit | diff
parent9b98e5413037f482ad289f4abf8db0afc69bfe21commit | 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.