]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-linus-3.7' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 24 Sep 2012 13:30:32 +0000 (09:30 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 24 Sep 2012 13:30:32 +0000 (09:30 -0400)
* stable/for-linus-3.7:
  xen/vga: add the xen EFI video mode support
  xen/x86: retrieve keyboard shift status flags from hypervisor.

1  2 
arch/x86/xen/enlighten.c

Simple merge