Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Tue, 30 Apr 2013 21:08:50 +0000 (23:08 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 30 Apr 2013 21:08:50 +0000 (23:08 +0200)
commitd1c3fb0e00b0980c69a454d3741d0cb133c2b53d
tree7fc85d993327783d59bd240158d4d7fe03d3ec83
parent445a9526083a2c7700f07ebe7c8398b30406ac87
parentbc4f3b0506268536d629ac0fa441ee3f1709ceb7
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf