summaryrefslogtreecommitdiffstats
path: root/drivers/pnp/manager.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-18 12:26:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-18 12:26:54 -0800
commit224394ad75711042c6d362c9dbc9874b476edbc0 (patch)
tree69cff48bc367ca2f035685d16441b1fa51a53aee /drivers/pnp/manager.c
parentae664dba2724e59ddd66291b895f7370e28b9a7a (diff)
parent9d328a948f38ec240fc6d05db2c146e23ccd9b8b (diff)
downloadlinux-224394ad75711042c6d362c9dbc9874b476edbc0.tar.bz2
Merge tag 'stable/for-linus-3.8-rc0-bugfix-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen bugfixes from Konrad Rzeszutek Wilk: "Two fixes. One of them is caused by the recent change introduced by the 'x86-bsp-hotplug-for-linus' tip tree that inhibited bootup (old function does not do what it used to do). The other one is just a vanilla bug. - Fix to bootup regression introduced by 'x86-bsp-hotplug-for-linus' tip branch. - Fix to vcpu hotplug code." * tag 'stable/for-linus-3.8-rc0-bugfix-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/vcpu: Fix vcpu restore path. xen: Add EVTCHNOP_reset in Xen interface header files. xen/smp: Use smp_store_boot_cpu_info() to store cpu info for BSP during boot time.
Diffstat (limited to 'drivers/pnp/manager.c')
0 files changed, 0 insertions, 0 deletions