git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f85acd8
4205df3
)
Merge branch 'for-2.6.37/drivers' into for-linus
author
Jens Axboe
<jaxboe@fusionio.com>
Wed, 10 Nov 2010 13:51:27 +0000
(14:51 +0100)
committer
Jens Axboe
<jaxboe@fusionio.com>
Wed, 10 Nov 2010 13:51:27 +0000
(14:51 +0100)
Conflicts:
drivers/block/cciss.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff