diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:00:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:00:54 -0800 |
commit | 533cf7aef25bfe5da72170466582bcd0db5189c0 (patch) | |
tree | 9378349259efc63391d920bc779787fc7f06a057 /arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | |
parent | Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
parent | nfsd4: fix v3-less build (diff) | |
download | linux-dev-533cf7aef25bfe5da72170466582bcd0db5189c0.tar.xz linux-dev-533cf7aef25bfe5da72170466582bcd0db5189c0.zip |
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"These are fixes for two bugs introduced during the merge window"
* 'for-3.20' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix v3-less build
nfsd: fix comparison in fh_fsid_match()
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31-app4-evb1.dts')
0 files changed, 0 insertions, 0 deletions