Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 25 Sep 2013 07:45:35 +0000 (09:45 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 25 Sep 2013 08:00:40 +0000 (10:00 +0200)
commitcf227aa893ce51b295dc726897b8d6535f2b7680
tree70aa5adc59c4fabaaf0cc7451efbff9693584444
parent96a852b766d607709c444c09278ad087c77ac5d4
parent9e83ce891e7f67ea72bfcedfc3b28987c5f250f2
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf
Refreshed:
patches.fixes/net-remove-skb_orphan_try.patch
patches.fixes/net-remove-skb_orphan_try.patch
series.conf