Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Tue, 2 Jul 2013 08:30:59 +0000 (10:30 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 2 Jul 2013 08:30:59 +0000 (10:30 +0200)
commited7c9cff52311995ac391338da4541768d41c714
treed4625ae4bbe3803ebb9ee6a44aa7c075cb56ebc9
parent5e9061a88ad45f25badb177e71377941cc7974bd
parentb479fedd959fd591f79c4397b6a809ad1fb768fd
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
patches.suse/btrfs-0512-fix-how-we-deal-with-the-orphan-block-rsv.patch
patches.suse/btrfs-0589-fix-wrong-check-during-log-recovery.patch
patches.suse/btrfs-0615-change-how-we-indicate-we-re-adding-csums.patch
patches.suse/btrfs-0768-delay-block-group-item-insertion.patch
patches.suse/btrfs-0769-remove-bytes-argument-from-do_chunk_alloc.patch
patches.suse/btrfs-0954-don-t-take-inode-delalloc-mutex-if-we-re-a-fre.patch
patches.suse/btrfs-1092-use-reserved-space-for-creating-a-snapshot.patch
patches.suse/btrfs-1107-cleanup-to-make-the-function-btrfs_delalloc_re.patch
patches.suse/btrfs-1136-fix-space-leak-when-we-fail-to-reserve-metadat.patch
patches.suse/btrfs-1137-fix-space-accounting-for-unlink-and-rename.patch
patches.suse/btrfs-8235-simplify-unlink-reservations.patch
series.conf
series.conf