]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.13' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 6 Nov 2013 20:32:36 +0000 (15:32 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 6 Nov 2013 20:32:36 +0000 (15:32 -0500)
* stable/for-linus-3.13:
  xen: remove deprecated IRQF_DISABLED
  x86/xen: remove deprecated IRQF_DISABLED

1  2 
arch/x86/xen/smp.c

Simple merge