Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Thu, 4 Jul 2013 09:12:35 +0000 (11:12 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 4 Jul 2013 09:12:35 +0000 (11:12 +0200)
commit60ab5bbd0d14b13c4b91bff2869de0e2f9753597
treea2eaa3f5804802a082504281ec5a18ba3ae5837e
parentc9ef9860d4c5604241f4fd1f4b187448c3788fc6
parent2e1669dc74671dd723298b8ccaac47a5b130518d
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf

suse-commit: 753544fffb2342f3b77846f10baf2e993beb4165
block/genhd.c
drivers/block/nbd.c