]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
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)
* 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.

1  2 
drivers/xen/events.c

Simple merge