Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Mon, 22 Apr 2013 15:18:38 +0000 (17:18 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 22 Apr 2013 15:18:38 +0000 (17:18 +0200)
commit1da7c2c455c7c52b45bd7d50eeadaebb8ac8123b
tree328c59dc448a25303b862445fafc97f84527430c
parent014c03a6d9f20813ee1a782b34a19bbbec0f9447
parent2b0d9006483e38873c9e42788bb111e2056bb293
Merge branch 'SLE11-SP2' into SLE11-SP3

Dropped all SP2 changes in Xen and Btrfs.

Conflicts:
kernel-source.changes
patches.suse/btrfs-*
patches.xen/*
series.conf

suse-commit: f4c453d306e40ebfa3e65b54bcd6fff3090ddf94