git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
28f4197
67a3e12
)
Merge branch 'master' into for-linus
author
Jens Axboe
<jaxboe@fusionio.com>
Tue, 1 Jun 2010 10:42:12 +0000
(12:42 +0200)
committer
Jens Axboe
<jaxboe@fusionio.com>
Tue, 1 Jun 2010 10:42:12 +0000
(12:42 +0200)
Conflicts:
fs/pipe.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff