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)
commita2530ec3d29e841c8e86219ca2d34e75b7befb37
tree132575b9e8949939f321ee305be39671dc131234
parent58c0d180c0692ac9b86856fa10ef669f6ee23735
parent772c54af39fad31fc28d995356a99ef3eb792dac
Merge branch 'SLE11-SP2' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP2

Conflicts:
series.conf

suse-commit: 0ca126f9794604bfb9a69ebefffaa439b92fe571