git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d2f31a5
7b28afe
)
Merge branch 'for-linus' into for-3.1/core
author
Jens Axboe
<jaxboe@fusionio.com>
Fri, 1 Jul 2011 14:17:13 +0000
(16:17 +0200)
committer
Jens Axboe
<jaxboe@fusionio.com>
Fri, 1 Jul 2011 14:17:13 +0000
(16:17 +0200)
Conflicts:
block/blk-throttle.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff