Merge branch 'stable/bug-fixes-for-rc1' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 25 May 2011 18:08:19 +0000 (14:08 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 25 May 2011 18:08:19 +0000 (14:08 -0400)
* stable/bug-fixes-for-rc1:
  xen: use the trigger info we already have to choose the irq handler


Trivial merge