]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2009 17:32:33 +0000 (09:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jan 2009 17:32:33 +0000 (09:32 -0800)
commit9304fb123214e11c8ab1f4548ff7a35bba0fab7d
tree457e0f1214ba44742f63e3cfc472ffbec206d0f3
parentab08ab9ee291aae27d3c52bae527692bd15a3d14
parentccca8cc561235abe139ab4440fe3e55f4f4a3699
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
fs/btrfs/super.c