summaryrefslogtreecommitdiff
path: root/sound/ppc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-15 16:21:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-15 16:21:59 -0800
commit49def1853334396f948dcb4cedb9347abb318df5 (patch)
treec5a5a4527656f2aac3c8f66c6849bcd5bde002b0 /sound/ppc
parent99421c1cb27fb837e93b517036fab4500fe39de5 (diff)
Linux 4.10-rc4
Diffstat (limited to 'sound/ppc')
0 files changed, 0 insertions, 0 deletions
microtek.h?h=nds-private-remove&id=3b4f18843e511193e7eb616710e838f5852e661d'>3b4f18843e511193e7eb616710e838f5852e661d (diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'drivers/usb/image/microtek.h')