]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 3a3137a) | patch
oracleasm: Fix two merge errors
authorMartin K. Petersen <martin.petersen@oracle.com>
Wed, 28 Dec 2011 19:42:23 +0000 (14:42 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 28 Dec 2011 19:42:23 +0000 (14:42 -0500)
commitfaf0fb8aecf08f8abaf5972af888a1b17af7d7d3
tree4f2deccd0028b0e5017111f2be7771e2227c0483tree
parent3a3137a68c2fa7c793fa61924845ac08667e76decommit | diff
oracleasm: Fix two merge errors

Fix two bugs introduced while bringing oracleasm up to date with
mainline.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/block/oracleasm/driver.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.