Merge branch 'SLE11-SP1' of ssh://kerncvs.suse.de/home/git/kernel-source into SLE11-SP1
authorJan Kara <jack@suse.cz>
Thu, 14 Jul 2011 12:47:44 +0000 (14:47 +0200)
committerJan Kara <jack@suse.cz>
Thu, 14 Jul 2011 12:47:44 +0000 (14:47 +0200)
commit7da281afbd78855773911f3b44d7d45efa04ec20
treecea944498431af94f4118cfa08e5bb6d3b14b3c6
parente5cac1e7b72d9752ee2ed17462f9beb7a200dc11
parent1f1e5e88f7c81a0e4936349731910655ccf51ff8
Merge branch 'SLE11-SP1' of ssh://kerncvs.suse.de/home/git/kernel-source into SLE11-SP1

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