Merge branch 'stable/for-linus-3.3' into linux-next

* stable/for-linus-3.3:
  xen/event: Add reference counting to event channels
  xen/gnt{dev,alloc}: reserve event channels for notify
  xen/gntalloc: Change gref_lock to a mutex
  xen: Make XEN_MAX_DOMAIN_MEMORY have more sensible defaults
  xen: document backend sysfs files
  xen: document balloon driver sysfs files

diff --cc drivers/xen/gntalloc.c
Simple merge

diff --cc drivers/xen/gntdev.c
Simple merge