Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Tue, 9 Jul 2013 05:00:24 +0000 (07:00 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 9 Jul 2013 05:00:24 +0000 (07:00 +0200)
commita04aa52cedef2a916b563ad58ad5e4d5c945a748
tree257889aac0cf8ab16b62b40cb0cd02eeb03bcb9f
parent7546302a10ee4d648a47858e546e57097c3c50ea
parent53de5b8aa59ebf54e72e2ffb0196326da3750288
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes

suse-commit: 2a7aa6bb1bfb1377d3cc65346fcc290610de6ec6