]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-fixes-3.3' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 23 Feb 2012 03:08:19 +0000 (22:08 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 23 Feb 2012 03:08:19 +0000 (22:08 -0500)
* stable/for-linus-fixes-3.3:
  xen/pat: Disable PAT support for now.
  xen/setup: Remove redundant filtering of PTE masks.

1  2 
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c

Simple merge
Simple merge