Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Thu, 21 Mar 2013 08:16:55 +0000 (09:16 +0100)
committerMichal Marek <mmarek@suse.cz>
Thu, 21 Mar 2013 08:16:55 +0000 (09:16 +0100)
commit56737a70492815fd9cfd5cbb0f57a2c3cb186e24
tree3d497586e9355cdaf5a71b3e3a7aa918100dcb8f
parent47c0dd88c510414f49500659b351809a533def79
parentcf59c0db5178fb385205ede6ca6833e6225e1925
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
patches.arch/kvm-convert-msr_kvm_system_time-to-use-gfn_to_hva_cache_init.patch
patches.arch/kvm-fix-for-buffer-overflow-in-handling-of-msr_kvm_system_time.patch
series.conf

suse-commit: 1bbd576bf5230ead3d14759b2f9a333711199b8d
drivers/scsi/st.c