git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cedb4a7
dcb8bae
)
Merge branch 'upstream/blkfront' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Jens Axboe
<jaxboe@fusionio.com>
Fri, 12 Nov 2010 07:47:04 +0000
(08:47 +0100)
committer
Jens Axboe
<jaxboe@fusionio.com>
Fri, 12 Nov 2010 07:47:04 +0000
(08:47 +0100)
Conflicts:
drivers/block/xen-blkfront.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff