]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a6b521 64f5030)
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)
commit807b5169e230b264b7db099f5c694e7df2ff3790
tree6ddd02441c199102d54b7a6e20b4dea2c94b2686tree | snapshot
parent8a6b52140fc41fc5ed7251556035a069486979abcommit | diff
parent64f503076f9921fc714a2c79fb0fa520869d2c08commit | 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
Unnamed repository; edit this file 'description' to name the repository.