diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-16 00:06:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-16 00:06:37 +0200 |
| commit | dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3 (patch) | |
| tree | 30d223a3a3c7470c657284ef030657bd1753d4d3 /sound/pci/ens1371.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff) | |
| parent | Btrfs: always pin metadata in discard mode (diff) | |
| download | linux-dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3.tar.xz linux-dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: always pin metadata in discard mode
Btrfs: enable discard support
Btrfs: add -o discard option
Btrfs: properly wait log writers during log sync
Btrfs: fix possible ENOSPC problems with truncate
Btrfs: fix btrfs acl #ifdef checks
Btrfs: streamline tree-log btree block writeout
Btrfs: avoid tree log commit when there are no changes
Btrfs: only write one super copy during fsync
Diffstat (limited to 'sound/pci/ens1371.c')
0 files changed, 0 insertions, 0 deletions