summaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-28 12:38:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-28 12:38:51 -0700
commit9acc7bde23ebb19a704395f76490685e1513e422 (patch)
treecd7aed46542134ebaa4a0ad909b0109ede12eb6d /fs/nfs/dir.c
parentccce27c0fe9dd61bc35ba2f52a2de485008c53ed (diff)
parentbb9a80e5719abae235c7e9c7391a3a17b64a217b (diff)
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon changes from Guenter Roeck: "Just e-mail address updates" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: Update my e-mail address hwmon: (applesmc) correct email address for Jesper Juhl
Diffstat (limited to 'fs/nfs/dir.c')
0 files changed, 0 insertions, 0 deletions