summaryrefslogtreecommitdiffstats
path: root/Documentation/ptp/ptp.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-03 12:54:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-03 12:54:56 -0700
commit0f86267b79bc6e357b8606077c7f70239045ea9c (patch)
treef31af517e9b40e360180dfb4679de866a2ad2bb2 /Documentation/ptp/ptp.txt
parent0d617928f5f5426f6e40edaacbfa80e73d67e0cd (diff)
parent20ecb499f64a7e8e7fe03f6098ab25c71b7a6481 (diff)
Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
* 'hwmon-for-linus' of git://github.com/groeck/linux: hwmon: (coretemp) Avoid leaving around dangling pointer hwmon: (coretemp) Fixup platform device ID change
Diffstat (limited to 'Documentation/ptp/ptp.txt')
0 files changed, 0 insertions, 0 deletions