summaryrefslogtreecommitdiff
path: root/include/uapi/drm/sis_drm.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/drm/sis_drm.h')
0 files changed, 0 insertions, 0 deletions
href='/cgit.cgi/linux/net-next.git/diff/?id=2b1d530cb3157f828fcaadd259613f59db3c6d1c'>Diffstat (limited to 'net/ceph')05f62708a518de2acdc /sound/firewire/oxfw/oxfw-midi.c
parent08965c2eba135bdfb6e86cf25308e01421c7e0ce (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 'sound/firewire/oxfw/oxfw-midi.c')