summaryrefslogtreecommitdiff
path: root/fs/lockd/svc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-21 23:41:19 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-21 23:41:19 +0400
commitd541b22abde3e71af4b65d79a510b6bc551d5f76 (patch)
tree35041bcaeb0ddac14ce323f927fda2922afc651b /fs/lockd/svc.c
parent6f21d806f698a5c437dcae1f03e8dd73e3f5aab1 (diff)
parentd130d97154f5342973a0fffc0b5a144359273c79 (diff)
downloadlinux-d541b22abde3e71af4b65d79a510b6bc551d5f76.tar.xz
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (ad7414) Make ad7414_update_device() static hwmon: (it87) Fix fan tachometer reading in IT8712F rev 0x7 (I) hwmon: (atxp1) Fix device detection logic
Diffstat (limited to 'fs/lockd/svc.c')
0 files changed, 0 insertions, 0 deletions