| commit | 9bd7de51ee8537094656149eaf45338cadb7d7d4 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jens.axboe@oracle.com> | Fri May 22 20:28:35 2009 +0200 |
| committer | Jens Axboe <jens.axboe@oracle.com> | Fri May 22 20:28:35 2009 +0200 |
| tree | a691987319dfcdb07de2bce619746f88d26882c4 | |
| parent | e4b636366c00738b9609cda307014d71b1225b7f [diff] | |
| parent | 6a44587ee716ac911082cbdec766e5b3f051c071 [diff] |
Merge branch 'master' into for-2.6.31 Conflicts: drivers/ide/ide-io.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>