tree e2221c08271cd4413f191532a957cb0e7b2a525b
parent 8364919c5698d934860aabc607ffd32b13c8c37c
parent 8ea11f7f11c811d1f502c2dabc5259d447c2f2a0
author Linus Torvalds <torvalds@linux-foundation.org> 1326830189 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326830189 -0800

Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/balloon: Move the registration from device to subsystem.