git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c186794
f5412be
)
Merge commit 'v2.6.38-rc6' into for-2.6.39/core
author
Jens Axboe
<jaxboe@fusionio.com>
Tue, 1 Mar 2011 20:04:39 +0000
(15:04 -0500)
committer
Jens Axboe
<jaxboe@fusionio.com>
Tue, 1 Mar 2011 20:04:39 +0000
(15:04 -0500)
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff