]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 111b4f0) | patch
xen/gntdev: Fix merge error.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 11 May 2012 20:29:09 +0000 (16:29 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 31 May 2012 20:15:24 +0000 (16:15 -0400)
commit10cb1f577c9f3cf6d275ad74f0c6ecffe03c0bc1
treeb05bea6e060e8f62f35dff1c464fabb83ff886d8tree
parent111b4f078ee8e8b3f4ae7e7b07f5452d5e3a1163commit | diff
xen/gntdev: Fix merge error.

Somehow a merge error ensued were an important part of
 "xen/gnt{dev,alloc}: reserve event channels for notify"
went missing.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
drivers/xen/gntdev.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.