Merge commit '6066894bfa2d61868aac48c58012b75f6b81a405' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 1 Oct 2012 08:11:59 +0000 (10:11 +0200)
committerJiri Slaby <jslaby@suse.cz>
Mon, 1 Oct 2012 08:12:54 +0000 (10:12 +0200)
commit582208c4334d0b2b1e605a44a2c5183927d6d315
treee97dbbc74b419eb28dabc2c15c1c16d4b7c06463
parentf1a1fe20ff57524f070e258ab6b6b11cf25ca353
parent6066894bfa2d61868aac48c58012b75f6b81a405
Merge commit '6066894bfa2d61868aac48c58012b75f6b81a405' into stable

Conflicts:
config/i386/vanilla
config/ia64/vanilla
config/ppc/vanilla
config/ppc64/vanilla
config/s390/vanilla
config/s390x/vanilla
config/x86_64/vanilla
patches.suse/scsi-error-test-unit-ready-timeout
scripts/config.sh
series.conf
patches.fixes/cgroup-mark-subsystems-with-broken-hierarchy-support.patch
rpm/config.sh
series.conf