Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Fri, 8 Mar 2013 11:23:09 +0000 (12:23 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 8 Mar 2013 11:23:09 +0000 (12:23 +0100)
commitabdec3b14b7c5878ffbc5fe433bf7e1ff1bf272f
tree2de09c90eab5ee1bb36273bbf861aabe828dfb4f
parent8c8cfd5983d53563c5cd2b15eb1a92cfe2181651
parent852688e7538d2277ebf59e36cbf8c8a1173e21ca
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf
series.conf