git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b9ed725
279e677
)
Merge branch 'master' into for-2.6.31
author
Jens Axboe
<jens.axboe@oracle.com>
Fri, 22 May 2009 18:25:34 +0000
(20:25 +0200)
committer
Jens Axboe
<jens.axboe@oracle.com>
Fri, 22 May 2009 18:25:34 +0000
(20:25 +0200)
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff