diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 16:23:03 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 16:23:03 +0100 |
| commit | adbfbcd12af3d183957622a99ca009b665639b81 (patch) | |
| tree | 830e5cc6a0dbd5cb590b8484c4234bd65073d1d7 /drivers/gpu/drm/ati_pcigart.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Btrfs: apply updated fallocate i_size fix (diff) | |
| download | linux-adbfbcd12af3d183957622a99ca009b665639b81.tar.xz linux-adbfbcd12af3d183957622a99ca009b665639b81.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: apply updated fallocate i_size fix
Btrfs: do not try and lookup the file extent when finishing ordered io
Btrfs: Fix oopsen when dropping empty tree.
Btrfs: remove BUG_ON() due to mounting bad filesystem
Btrfs: make error return negative in btrfs_sync_file()
Btrfs: fix race between allocate and release extent buffer.
Diffstat (limited to 'drivers/gpu/drm/ati_pcigart.c')
0 files changed, 0 insertions, 0 deletions