]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'stable/bug.fixes-3.3.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 13 Dec 2011 17:34:43 +0000 (12:34 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 13 Dec 2011 17:34:43 +0000 (12:34 -0500)
* stable/bug.fixes-3.3.rebased:
  Revert "xen/pm_idle: Make pm_idle be default_idle under Xen."

1  2 
arch/x86/xen/setup.c

Simple merge