Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Fri, 3 May 2013 15:00:42 +0000 (17:00 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 3 May 2013 15:00:42 +0000 (17:00 +0200)
commita0625c1c791fa713ad5b9711a098262c3f1e520b
tree9d4d2319b503a951b2e1be1904fa3c87694b9445
parentc3f0d02fefca01c3f4017149121eebd9616f6183
parent3e0897c8cedd924a1114d6cfcb55e7e1538d9ac8
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
rpm/kernel-binary.spec.in
rpm/kernel-source.spec.in
rpm/kernel-syms.spec.in
series.conf