]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 487afd8 90d0c9c)
Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 29 May 2012 18:25:53 +0000 (14:25 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 29 May 2012 18:25:53 +0000 (14:25 -0400)
* stable/for-linus-3.5.rebased:
  xen/blkback: Copy id field when doing BLKIF_DISCARD.
  xen/balloon: Subtract from xen_released_pages the count that is populated.

1  2 
arch/x86/xen/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/setup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.