Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 13 Feb 2013 09:12:00 +0000 (10:12 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 13 Feb 2013 09:12:00 +0000 (10:12 +0100)
commit18f188bc709fa4ed2c107a2b896ff6ccebaa9c57
tree2cdfecc016f1a412e1ea9d34400277d80415283e
parent91596c24e64835c7629fcd985a8c7a916e437217
parent5794decde376e9a3249dac91ba05854e7c06ed49
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf
Deleted
patches.suse/SoN-0025-mm-net-allow-some-SOCK_MEMALLOC-traffic-through.patch