Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Tue, 12 Feb 2013 06:00:19 +0000 (07:00 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 12 Feb 2013 06:00:19 +0000 (07:00 +0100)
commitc1ea5deca1ecd263f0e955849ec8ba41b91b7edf
treec02426736f36fe66f1051bfeab933dcde7f9dc6c
parenta02cc113ed17b39760862822d31be5f1c434a099
parent308f7f778df217148eb5d9730710d87cc3cde89a
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf