git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
499337b
899e3ee
)
Merge branch 'v3.1-rc10' into for-3.2/core
author
Jens Axboe
<axboe@kernel.dk>
Wed, 19 Oct 2011 12:30:42 +0000
(14:30 +0200)
committer
Jens Axboe
<axboe@kernel.dk>
Wed, 19 Oct 2011 12:30:42 +0000
(14:30 +0200)
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff