projects / linux.git / commitdiff
? search:
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...
authorJens Axboe <jaxboe@fusionio.com>
Fri, 12 Nov 2010 07:47:04 +0000 (08:47 +0100)
committerJens 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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git