]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'stable/for-linus-3.4.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 18:28:53 +0000 (14:28 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 7 May 2012 21:20:32 +0000 (17:20 -0400)
* stable/for-linus-3.4.rebased:
  Revert "xen-blkfront: set pages are FOREIGN_FRAME when sharing them"

Fixes Bug 14028600

1  2 
drivers/block/xen-blkfront.c

Simple merge