git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b492e95
d515e86
)
Merge branch 'master' into for-2.6.35
author
Jens Axboe
<jens.axboe@oracle.com>
Fri, 21 May 2010 19:27:26 +0000
(21:27 +0200)
committer
Jens Axboe
<jens.axboe@oracle.com>
Fri, 21 May 2010 19:27:26 +0000
(21:27 +0200)
Conflicts:
fs/ext3/fsync.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff