summaryrefslogtreecommitdiff
path: root/sound/pci/korg1212
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-01 14:31:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-01 14:31:53 -0800
commit0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (patch)
tree0756648fc3e8141173149202fcebaee61f6d7486 /sound/pci/korg1212
parent4759d386d55fef452d692bf101167914437e848e (diff)
Linux 4.10-rc2
Diffstat (limited to 'sound/pci/korg1212')
0 files changed, 0 insertions, 0 deletions
ef='/cgit.cgi/linux/net-next.git/diff/include/trace/events/filelock.h?h=nds-private-remove&id=c14024dbb156c8392908aaa822097d27c6af8ec8&id2=08965c2eba135bdfb6e86cf25308e01421c7e0ce'>diff)parent3b4f18843e511193e7eb616710e838f5852e661d (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 'include/trace/events/filelock.h')