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)
commitffa5306f4481fce98a4e5a3a9093bbb4735e84c9
tree667625237cda9fe4f517cb5cdb75dfb2e42c5a78
parentfb2e2b0fe4da8dcebd075ae3b08c9fea4284feb5
parent191b3fc1bc99ccc3e6b206bdc60db382c69a54b4
Merge branch 'SLE11-SP1' of ssh://kerncvs.suse.de/home/git/kernel-source into SLE11-SP1

Conflicts:
series.conf

suse-commit: 7da281afbd78855773911f3b44d7d45efa04ec20