diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 18:32:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 18:32:33 +0100 |
| commit | 4b48d9d44ebe0e8c31b4fe3b7480941576fff613 (patch) | |
| tree | 457e0f1214ba44742f63e3cfc472ffbec206d0f3 /drivers/parport/multiface.h | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | Btrfs: fix ioctl arg size (userland incompatible change!) (diff) | |
| download | linux-4b48d9d44ebe0e8c31b4fe3b7480941576fff613.tar.xz linux-4b48d9d44ebe0e8c31b4fe3b7480941576fff613.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: fix ioctl arg size (userland incompatible change!)
Btrfs: Clear the device->running_pending flag before bailing on congestion
Diffstat (limited to 'drivers/parport/multiface.h')
0 files changed, 0 insertions, 0 deletions