diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 11:34:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 11:34:04 -0800 |
| commit | 87c7ae06cc50bcbcdcc60d64a959ca0b9b71f892 (patch) | |
| tree | 14753708a10c8bf65517056cd3fc87a22a03eda9 /fs/proc/meminfo.c | |
| parent | dff6d1c5ef9116a4478908001d72ee67127ecf01 (diff) | |
| parent | f070304094edb8d516423e79edd27c97ec2020b0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
dm raid1: fix deadlock when suspending failed device
dm: eliminate some holes data structures
dm ioctl: introduce flag indicating uevent was generated
dm: free dm_io before bio_endio not after
dm table: remove unused dm_get_device range parameters
dm ioctl: only issue uevent on resume if state changed
dm raid1: always return error if all legs fail
dm mpath: refactor pg_init
dm mpath: wait for pg_init completion when suspending
dm mpath: hold io until all pg_inits completed
dm mpath: avoid storing private suspended state
dm: document when snapshot has finished merging
dm table: remove dm_get from dm_table_get_md
dm mpath: skip activate_path for failed paths
dm mpath: pass struct pgpath to pg init done
Diffstat (limited to 'fs/proc/meminfo.c')
0 files changed, 0 insertions, 0 deletions