git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af75cd3
0a58e07
)
Merge branch 'for-linus' into for-2.6.40/core
author
Jens Axboe
<jaxboe@fusionio.com>
Fri, 20 May 2011 18:36:16 +0000
(20:36 +0200)
committer
Jens Axboe
<jaxboe@fusionio.com>
Fri, 20 May 2011 18:36:16 +0000
(20:36 +0200)
This patch merges in a fix that missed 2.6.39 final.
Conflicts:
block/blk.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff