diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-02 21:14:05 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-02 21:14:05 -1000 |
| commit | ed8f37370d83e695c0a4fa5d5fc7a83ecb947526 (patch) | |
| tree | 2e57247c609a495b31892b2d05ea52e35556ab60 /drivers/char/viotape.c | |
| parent | a6b11f53388973d99c4a357c22b19753b424e73c (diff) | |
| parent | 0d10ee2e6deb5c8409ae65b970846344897d5e4e (diff) | |
| download | linux-ed8f37370d83e695c0a4fa5d5fc7a83ecb947526.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (31 commits)
Btrfs: don't call writepages from within write_full_page
Btrfs: Remove unused variable 'last_index' in file.c
Btrfs: clean up for find_first_extent_bit()
Btrfs: clean up for wait_extent_bit()
Btrfs: clean up for insert_state()
Btrfs: remove unused members from struct extent_state
Btrfs: clean up code for merging extent maps
Btrfs: clean up code for extent_map lookup
Btrfs: clean up search_extent_mapping()
Btrfs: remove redundant code for dir item lookup
Btrfs: make acl functions really no-op if acl is not enabled
Btrfs: remove remaining ref-cache code
Btrfs: remove a BUG_ON() in btrfs_commit_transaction()
Btrfs: use wait_event()
Btrfs: check the nodatasum flag when writing compressed files
Btrfs: copy string correctly in INO_LOOKUP ioctl
Btrfs: don't print the leaf if we had an error
btrfs: make btrfs_set_root_node void
Btrfs: fix oops while writing data to SSD partitions
Btrfs: Protect the readonly flag of block group
...
Fix up trivial conflicts (due to acl and writeback cleanups) in
- fs/btrfs/acl.c
- fs/btrfs/ctree.h
- fs/btrfs/extent_io.c
Diffstat (limited to 'drivers/char/viotape.c')
0 files changed, 0 insertions, 0 deletions