Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Thu, 10 Jan 2013 06:00:14 +0000 (07:00 +0100)
committerMichal Marek <mmarek@suse.cz>
Thu, 10 Jan 2013 06:00:14 +0000 (07:00 +0100)
commit3d8e57aff6a1b07e3976dead8a3b0d0ea5ccb77b
treee378f6abfdb504af3d8e50879e2027378a47c8c4
parent8dc1ca8bd610337f1fd799ac721fb96b178e401f
parentb54ac2af72889017e755508dea6e81a16f9ef1f3
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf