| commit | 4b48d9d44ebe0e8c31b4fe3b7480941576fff613 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 16 09:32:33 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 16 09:32:33 2009 -0800 |
| tree | 457e0f1214ba44742f63e3cfc472ffbec206d0f3 | |
| parent | b762666cc7c9f83ac5759127c29dfad438c09e48 [diff] | |
| parent | c071fcfdb60e7abbe95e02460005d6bca165bf24 [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 ioctl arg size (userland incompatible change!) Btrfs: Clear the device->running_pending flag before bailing on congestion