diff options
author | Linus Torvalds | 2013-04-02 16:56:20 +0200 |
---|---|---|
committer | Linus Torvalds | 2013-04-02 16:56:20 +0200 |
commit | f8e9248dbb2bddfaed86a14254b7ca2409ef68ff (patch) | |
tree | 1056fbdc4d31b3d7aa459bb7f32f2b3be5086b22 /include/video/ili9320.h | |
parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | nfsd4: reject "negative" acl lengths (diff) | |
download | kernel-qcow2-linux-f8e9248dbb2bddfaed86a14254b7ca2409ef68ff.tar.gz kernel-qcow2-linux-f8e9248dbb2bddfaed86a14254b7ca2409ef68ff.tar.xz kernel-qcow2-linux-f8e9248dbb2bddfaed86a14254b7ca2409ef68ff.zip |
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfix from J Bruce Fields:
"An xdr decoding error--thanks, Toralf Förster, and Trinity!"
* 'for-3.9' of git://linux-nfs.org/~bfields/linux:
nfsd4: reject "negative" acl lengths
Diffstat (limited to 'include/video/ili9320.h')
0 files changed, 0 insertions, 0 deletions