]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b762666 c071fcf)
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)
commit4b48d9d44ebe0e8c31b4fe3b7480941576fff613
tree457e0f1214ba44742f63e3cfc472ffbec206d0f3tree | snapshot
parentb762666cc7c9f83ac5759127c29dfad438c09e48commit | diff
parentc071fcfdb60e7abbe95e02460005d6bca165bf24commit | 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
fs/btrfs/super.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.