Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 3 Jul 2013 05:00:26 +0000 (07:00 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 3 Jul 2013 05:00:26 +0000 (07:00 +0200)
commit167f02a688ba16579a2522094af9581010115f7e
tree189797df05697eac4f832789fefb7caee9d2cc56
parented7c9cff52311995ac391338da4541768d41c714
parentb7423576860fe7c6892f9a84b926307a836f64f4
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf