Merge branch 'SLE11-SP1' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP1
authorJiri Kosina <jkosina@suse.cz>
Mon, 22 Feb 2010 15:22:25 +0000 (16:22 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 22 Feb 2010 15:22:25 +0000 (16:22 +0100)
commite97bc7baa25a89d176cdc7c854a8a83c8ee5ed54
treef61ae805d69188139f69e93099346e514480380e
parentfd6d94bd9c0d2db227d817459b4e9b3a24535560
parentc40b1eac5174efd98768f8ebbe7726a5a90a626a
Merge branch 'SLE11-SP1' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP1

Conflicts:
kernel-source.changes

suse-commit: bf52f33ed1992c408c378ba6cc0fc9c45c86bb04