diff options
| author | Linus Torvalds <[email protected]> | 2014-01-02 22:40:38 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-01-02 22:40:38 +0000 |
| commit | 06f055f394da2364b944d41b9609589763ae762a (patch) | |
| tree | 3f8c0a081e2a9aa5d0742d8f164c87b30dba3d2d /net/unix/af_unix.c | |
| parent | Merge tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve... (diff) | |
| parent | epoll: do not take the nested ep->mtx on EPOLL_CTL_DEL (diff) | |
| download | kernel-06f055f394da2364b944d41b9609589763ae762a.tar.gz kernel-06f055f394da2364b944d41b9609589763ae762a.zip | |
Merge branch 'akpm' (incoming from Andrew)
Merge patches from Andrew Morton:
"Ten fixes"
* emailed patches from Andrew Morton <[email protected]>:
epoll: do not take the nested ep->mtx on EPOLL_CTL_DEL
sh: add EXPORT_SYMBOL(min_low_pfn) and EXPORT_SYMBOL(max_low_pfn) to sh_ksyms_32.c
drivers/dma/ioat/dma.c: check DMA mapping error in ioat_dma_self_test()
mm/memory-failure.c: transfer page count from head page to tail page after split thp
MAINTAINERS: set up proper record for Xilinx Zynq
mm: remove bogus warning in copy_huge_pmd()
memcg: fix memcg_size() calculation
mm: fix use-after-free in sys_remap_file_pages
mm: munlock: fix deadlock in __munlock_pagevec()
mm: munlock: fix a bug where THP tail page is encountered
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions