From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jan 2009 17:32:33 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.29-rc2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4b48d9d44ebe0e8c31b4fe3b7480941576fff613;p=linux-2.6-omap-h63xx.git

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
---

4b48d9d44ebe0e8c31b4fe3b7480941576fff613