Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Mon, 19 Nov 2012 16:19:49 +0000 (17:19 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 19 Nov 2012 16:19:49 +0000 (17:19 +0100)
commitd12d56edc2c472ccb8bb1d00d38c1e5679f0a79d
tree6a6888d4bcebb989752a7d5f6c34b03b945bc336
parentee65d4568895f4addf1f7fff43b09e49b9ed0a1f
parentaca4fb68081774f5109f202332a061b1f6f9f3e9
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
rpm/kernel-source.changes.old
series.conf
Deleted
patches.fixes/net-prevent-NULL-dereference-in-check_peer_redir.patch, as
it is obsoleted by commit 8a533666 from the stable tree.

suse-commit: 7b9eb0972fc84112b925e4abcc80710d14fb3fce