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)
commitbf52f33ed1992c408c378ba6cc0fc9c45c86bb04
tree64d43c3222fd723e05ec3e60f730ac4a71f6d3cd
parentd93ed0029fe28507eb27a09fefea8d54d7d56b37
parent9884cb2355bb9751fa4c7fa3141d69e076332777
Merge branch 'SLE11-SP1' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP1

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