Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Thu, 26 Sep 2013 08:05:34 +0000 (10:05 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 26 Sep 2013 08:05:34 +0000 (10:05 +0200)
commit79f4bf297698bcd5d8a9dc3047131378f071e658
treec4dd4d0a1c5f9483cfc6de287ea0b936b22c9377
parentfbfe7800296a7f1f34466318fd43a72b0ff7edc8
parent2ffc35183c90088aaf870a3edb7c5610aacafc58
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
Refreshed:
patches.drivers/0011-iscsi_transport-Add-support-to-display-CHAP-list-and.patch
patches.drivers/0011-iscsi_transport-Add-support-to-display-CHAP-list-and.patch
series.conf