git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd3932e
cd07202
)
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
author
Jens Axboe
<jaxboe@fusionio.com>
Tue, 19 Oct 2010 07:13:04 +0000
(09:13 +0200)
committer
Jens Axboe
<jaxboe@fusionio.com>
Tue, 19 Oct 2010 07:13:04 +0000
(09:13 +0200)
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff