summaryrefslogtreecommitdiff
path: root/drivers/nfc/st21nfca
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-24 10:22:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-24 10:22:34 -0700
commit29567292c0b5b2fb484125c280a2175141fe2205 (patch)
treee697016baeed05d266367b2959e81a3b5b8561fa /drivers/nfc/st21nfca
parentecaba7185894778c24895356d117a7f92e3c92de (diff)
parentdd14be92fbf5bc1ef7343f34968440e44e21b46a (diff)
Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel. * tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: use same main loop for counting and remapping pages xen/events: Don't move disabled irqs xen/x86: actually allocate legacy interrupts on PV guests Xen: don't warn about 2-byte wchar_t in efi xen/gntdev: reduce copy batch size to 16 xen/x86: don't lose event interrupts
Diffstat (limited to 'drivers/nfc/st21nfca')
0 files changed, 0 insertions, 0 deletions