diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 12:06:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 12:06:38 -0800 |
| commit | f60c153d503e798b354333772e7c00f1e8733e71 (patch) | |
| tree | f34aef151cd9566412dede029cb85762c8be0866 /drivers/input/keyboard/twl4030_keypad.c | |
| parent | a1213b091cd50c3038b3ae480c2f1fae2713f010 (diff) | |
| parent | 83f6b0c18204f68961f58b9f69e5dba0d36056a2 (diff) | |
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
nfsd: break lease on unlink due to rename
nfsd4: acquire only one lease per file
nfsd4: modify fi_delegations under recall_lock
nfsd4: remove unused deleg dprintk's.
nfsd4: split lease setting into separate function
nfsd4: fix leak on allocation error
nfsd4: add helper function for lease setup
nfsd4: split up nfsd_break_deleg_cb
NFSD: memory corruption due to writing beyond the stat array
NFSD: use nfserr for status after decode_cb_op_status
nfsd: don't leak dentry count on mnt_want_write failure
Diffstat (limited to 'drivers/input/keyboard/twl4030_keypad.c')
0 files changed, 0 insertions, 0 deletions