| commit | d613839ef987d20f7c9347732b452efd921b97d9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 16 11:46:45 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 16 11:46:45 2009 -0700 |
| tree | 5998f460596d8dca129d0f116add8f9abddfad38 | |
| parent | 609106b9ac968adbc76ce78c979fc3903a56e16c [diff] | |
| parent | e212d6f25084e8e9b02a04ba514d7bb1e4a4924a [diff] |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: remove some includings of blktrace_api.h mg_disk: seperate mg_disk.h again block: Introduce helper to reset queue limits to default values cfq: remove extraneous '\n' in blktrace output ubifs: register backing_dev_info btrfs: properly register fs backing device block: don't overwrite bdi->state after bdi_init() has been run cfq: cleanup for last_end_request in cfq_data