diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-11 17:56:53 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-11 17:56:53 +0900 |
| commit | 9cf22e80df77b3f8459559e156f6322657e17090 (patch) | |
| tree | 22021240398c83286234dbc18200c90e446e7ad6 /fs/nfsd/nfs4acl.c | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| parent | dd18dbc2d42af75fffa60c77e0f02220bc329829 (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc fixes from Andrew Morton:
"4 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, thp: close race between mremap() and split_huge_page()
mm: postpone the disabling of kmemleak early logging
MAINTAINERS: update maintainership of LTP
drivers/rtc/rtc-hym8563.c: set uie_unsupported
Diffstat (limited to 'fs/nfsd/nfs4acl.c')
0 files changed, 0 insertions, 0 deletions