aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 15:13:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 15:13:24 -0700
commit9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e (patch)
treea905000d066defcc187e8e073134a1bee3c56fc1 /fs/nfs/nfs4proc.c
parentMerge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
parentregulator: max8952 - fix max8952_set_voltage (diff)
downloadlinux-dev-9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e.tar.xz
linux-dev-9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: max8952 - fix max8952_set_voltage regulator: max8952 - fix max8952_pmic_probe error path regulator: fix build when CONFIG_REGULATOR_DUMMY=n regulator: avoid deadlock when disabling regulator with supply regulator: Add option for machine drivers to enable the dummy regulator Regulator: lp3972 cleanup Regulator: LP3972 PMIC regulator driver MAX8952 PMIC Driver Initial Release
Diffstat (limited to 'fs/nfs/nfs4proc.c')
0 files changed, 0 insertions, 0 deletions