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)
commit2a7aa6bb1bfb1377d3cc65346fcc290610de6ec6
tree0b9f1be8e39b47b77655e689f73772795a7720d6
parent79c8e138babe49f3de1838247b6804b940aea93d
parent2517080f111321173043c3d3a8268ceed3224a88
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes