diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 06:08:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 06:08:33 +0300 |
| commit | a232591ba289a1a397e0005c9f276a126c1bc1b1 (patch) | |
| tree | 78fb774d4ca742c4be1dc15f528d40598efb1393 /drivers/hid/hid-elecom.c | |
| parent | d8a6e3aed955342dd68dd72e0feaf2cd32be683b (diff) | |
| parent | 5714320d316ae6e830bfc463bfdaf288695f6b62 (diff) | |
| download | linux-a232591ba289a1a397e0005c9f276a126c1bc1b1.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"11 fixes.
The presence of 'thp: reduce indentation level in change_huge_pmd()'
is unfortunate. But the patchset had been decently reviewed and tested
before we decided it was needed in -stable and I felt it best not to
churn things at the last minute"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mailmap: add Martin Kepplinger's email
zsmalloc: expand class bit
zram: do not use copy_page with non-page aligned address
zram: fix operator precedence to get offset
hugetlbfs: fix offset overflow in hugetlbfs mmap
thp: fix MADV_DONTNEED vs clear soft dirty race
thp: fix MADV_DONTNEED vs. MADV_FREE race
mm: drop unused pmdp_huge_get_and_clear_notify()
thp: fix MADV_DONTNEED vs. numa balancing race
thp: reduce indentation level in change_huge_pmd()
z3fold: fix page locking in z3fold_alloc()
Diffstat (limited to 'drivers/hid/hid-elecom.c')
0 files changed, 0 insertions, 0 deletions