]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 23 May 2012 18:23:36 +0000 (14:23 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 23 May 2012 18:23:36 +0000 (14:23 -0400)
commit487afd8af7b4a1f08405c0bc1e898d801851fc4e
tree9abef8a8dcc2fdf000fd7405221b9267e4a0965c
parent33430b743dbe944b49ac227bf7eeb0adfe878f9f
parente19207c22bdec63057991a3820af84e818d87272
Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge

* stable/for-linus-3.5.rebased:
  xen/events: Add WARN_ON when quick lookup found invalid type.
  xen/hvc: Check HVM_PARAM_CONSOLE_[EVTCHN|PFN] for correctness.
  xen/hvc: Fix error cases around HVM_PARAM_CONSOLE_PFN
  xen/hvc: Collapse error logic.
drivers/xen/events.c