]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus
authorChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:33:40 +0000 (20:33 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:33:40 +0000 (20:33 -0400)
commit3f77e5507b2e15fdc50ef422fa3d4dcb199a95d8
treee045f062c01075e1f88ab758717cbfd7a7ddd4ca
parent8a4fb4e66b994b0820d5df0dbd846187e7346112
parente3032d383374fd28ba75248c03642f28b8cddfbd
Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
fs/btrfs/transaction.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/backref.c
fs/btrfs/ioctl.c
fs/btrfs/scrub.c
fs/btrfs/super.c