summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/ptp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/testing/selftests/ptp')
0 files changed, 0 insertions, 0 deletions
5c2eba135bdfb6e86cf25308e01421c7e0ce'>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 'net/nfc/hci/hci.h')