| commit | 7f03292ee16e68be96aa88904afc6152f8d37736 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jens.axboe@oracle.com> | Thu Feb 25 08:48:05 2010 +0100 |
| committer | Jens Axboe <jens.axboe@oracle.com> | Thu Feb 25 08:48:05 2010 +0100 |
| tree | 5c32738f0348449c2fa9688d52e6ecf4445d76f0 | |
| parent | c5ecc484c528ff50bdbb16fbfbac758ee368b329 [diff] | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 [diff] |
Merge branch 'master' into for-2.6.34 Conflicts: include/linux/blkdev.h Signed-off-by: Jens Axboe <jens.axboe@oracle.com>