]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.7' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 2 Oct 2012 16:36:53 +0000 (12:36 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 2 Oct 2012 16:36:53 +0000 (12:36 -0400)
* stable/for-linus-3.7:
  xen: mark xen_init_IRQ __init
  xen/Makefile: fix dom-y build


Trivial merge