summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-07 17:50:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-07 17:50:18 -0700
commitc8d9762affa0a97e299be2cabfec861515ef1580 (patch)
tree50fdc530c553c6f19983786fc1fd27d9fdd1ba7b /drivers/nfc
parent26c12d93348f0bda0756aff83f4867d9ae58a5a6 (diff)
parentd06eb3ee9b09d753dc0883cc388d9a503839d6ca (diff)
Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen build fix from David Vrabel: "Fix arm build of drivers/xen/events/ The merge of irq-core-for-linus branch broke it" * tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: Xen: do hv callback accounting only on x86
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions