Merge branch 'SLE11-SP2' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP2
authorOliver Neukum <oneukum@suse.de>
Thu, 7 Mar 2013 17:03:35 +0000 (18:03 +0100)
committerOliver Neukum <oneukum@suse.de>
Thu, 7 Mar 2013 17:03:35 +0000 (18:03 +0100)
commit0ca126f9794604bfb9a69ebefffaa439b92fe571
tree200b5d1248cf427a2730f232e90d42685a44f09e
parentbb5744ceddda01a852a916b218b06b78fa60803c
parent9164d70e15f80dbb17433986e866423ac5a371f6
Merge branch 'SLE11-SP2' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP2

Conflicts:
series.conf
kernel-source.changes
series.conf