summaryrefslogtreecommitdiff
path: root/fs/nfs/nfs4state.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 16:38:50 +0300
committerMark Brown <broonie@kernel.org>2015-08-30 16:38:50 +0300
commit08aad16c80f22d2c34407dc2f8cfe0eb57750db6 (patch)
tree70fb050591d5f470872b122d425ee15bde9ab175 /fs/nfs/nfs4state.c
parenteaf018e170cef4a5a4378c984b70d768dd30048d (diff)
parentbf1fc23c80e61695e8e899354d17549a4946a9d0 (diff)
parentce317515b43f3e0b789b41df9b54e1608c783c5d (diff)
parentd4ea7d86457a8d0ea40ce77bdeda1fc966cc35ec (diff)
parent736050c4c11a4907d381672d5396485045d78bab (diff)
downloadlinux-08aad16c80f22d2c34407dc2f8cfe0eb57750db6.tar.xz
Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ad5398', 'regulator/topic/axp20x' and 'regulator/topic/da9062' into regulator-next