diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-09-23 02:14:40 -0400 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2014-09-23 02:14:40 -0400 |
| commit | 3cf6b0151ba584714f6eafb99bc66d7326efeed7 (patch) | |
| tree | 5d0d9de064208086a10c6ff864cd947cf6713679 /fs/btrfs/disk-io.c | |
| parent | b25c2ff547530f63d71fc67048543ae54b434476 (diff) | |
| parent | 9def39be4e960917fcb80514ff23651f9ec97193 (diff) | |
| parent | d3ac21cacc24790eb45d735769f35753f5b56ceb (diff) | |
| parent | 0da1d4a0b9516adb2acc4841e9f6da6618f47f4e (diff) | |
| parent | 3afed06a355b5525d9a87bcb76567ef2e2e7b3a2 (diff) | |
Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next