diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:03:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:03:09 -0700 |
| commit | d6a0967c90dced0a8baf502e6f3d5862fd5a5805 (patch) | |
| tree | e0242d5077730dabc4102b7abad9ee0c41e33bc0 /drivers/usb/misc/rio500_usb.h | |
| parent | fb385003c4ac9634cf2448f6ded81e5fd1190c1f (diff) | |
| parent | ceab36edd3d3ad3ffd01d41d6d1e05ac1ff8357e (diff) | |
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: fix balancing oops when invalidate_inode_pages2 returns EBUSY
Btrfs: correct error-handling zlib error handling
Btrfs: remove superfluous NULL pointer check in btrfs_rename()
Btrfs: make sure the async caching thread advances the key
Btrfs: fix btrfs_remove_from_free_space corner case
Diffstat (limited to 'drivers/usb/misc/rio500_usb.h')
0 files changed, 0 insertions, 0 deletions