]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6df81b618fcf62dbea134ff3db37f2977ce88a41
treecbcfa6c9c989f8b950d293e71bff691773cc3134tree
parent487afd8af7b4a1f08405c0bc1e898d801851fc4ecommit | diff
parent90d0c9c1510a8363a242d418bf578026d9592468commit | diff
Merge branch 'stable/for-linus-3.5.rebased' into uek2-merge

* 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.
arch/x86/xen/setup.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.