summaryrefslogtreecommitdiffstats
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-21 20:19:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-21 20:19:38 -0700
commit865d872280c848dc78b060088171724c3fb98bbb (patch)
tree17590f7da0f0dab34ac21b6e1cd1e7dcf26ed6ba /drivers/input/joydev.c
parentf0d8690ad443069b26df43a1be09c0f14a928eb9 (diff)
parent77bb3dfdc0d554befad58fdefbc41be5bc3ed38a (diff)
downloadlinux-865d872280c848dc78b060088171724c3fb98bbb.tar.gz
linux-865d872280c848dc78b060088171724c3fb98bbb.tar.bz2
linux-865d872280c848dc78b060088171724c3fb98bbb.zip
Merge tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull two xen bugfixes from David Vrabel: - fix ARM build regression. - fix VIRQ_CONSOLE related oops. * tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/events: don't bind non-percpu VIRQs with percpu chip xen/arm: Define xen_arch_suspend()
Diffstat (limited to 'drivers/input/joydev.c')
0 files changed, 0 insertions, 0 deletions