From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 6 Nov 2013 20:32:36 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.13' into linux-next
X-Git-Tag: next-20131128~16^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a1d4ff0ef271333f90f28d9a58d921f6601a3a0;p=karo-tx-linux.git

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

* stable/for-linus-3.13:
  xen: remove deprecated IRQF_DISABLED
  x86/xen: remove deprecated IRQF_DISABLED
---

2a1d4ff0ef271333f90f28d9a58d921f6601a3a0