]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 52e7c1d) | patch
Merge conflict resolved. Somehow the letter 's' slipped in
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Feb 2012 19:59:22 +0000 (14:59 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Feb 2012 19:59:22 +0000 (14:59 -0500)
commit70a3d8d324b9aa4dc130c01029b042d89cda071f
tree8f388ba4729604f78bf978c5d7337140d0e82a4atree
parent52e7c1d47f9b4716a225c2b1ba7e65ec0ebda245commit | diff
Merge conflict resolved. Somehow the letter 's' slipped in
the Makefile. This fixes the compile issues.

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