summaryrefslogtreecommitdiff
path: root/drivers/reset/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-14 17:05:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-14 17:05:26 -0700
commit8394a1b7151c54c6be66551a0ca1041b398029b6 (patch)
tree3113992bcc202cc17ea579dbcf3ac6bb0e4cdf15 /drivers/reset/Makefile
parentfbd9163f1c89f9591c03981bdb2d1de7f6e27c11 (diff)
parent7f11c47605cbe7cb76fd2f8607f452d4afe919f5 (diff)
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "11 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: Update maintainers for DRM STI driver mm: cma: mark cma_bitmap_maxno() inline in header zram: fix pool name truncation memory-hotplug: fix wrong edge when hot add a new node .mailmap: Andrey Ryabinin has moved ipc/sem.c: update/correct memory barriers mm/hwpoison: fix panic due to split huge zero page ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem() ipc,sem: fix use after free on IPC_RMID after a task using same semaphore set exits mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held mm/hwpoison: fix page refcount of unknown non LRU page
Diffstat (limited to 'drivers/reset/Makefile')
0 files changed, 0 insertions, 0 deletions