Merge branch 'SLE11-SP2' into SLE11-SP3
authorJiri Slaby <jslaby@suse.cz>
Fri, 3 May 2013 12:02:06 +0000 (14:02 +0200)
committerJiri Slaby <jslaby@suse.cz>
Fri, 3 May 2013 12:02:06 +0000 (14:02 +0200)
commitb3f0dd6f2f17c5f4fca04f4b9cf3b9b2e6d09f31
tree85584ec5ad982279e15b7b45696142a1445ab710
parent5f49321e67d6e2fe7949eb6f7b4b900deb9cf5af
parentb159555e2098a5221b1033d74ebaebfa1aa986e5
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
patches.kabi/revert-rtnetlink-Fix-problem-with-buffer-allocation.patch
patches.kabi/revert-rtnetlink-fix-rtnl_calcit-and-rtnl_dump_ifinf.patch
patches.suse/btrfs-8120-return-error-of-btrfs_update_inode-to-caller.patch
series.conf
patches.arch/kvm-x86-add-code-to-track-call-origin-for-msr-assignment.patch
patches.arch/kvm-x86-emulate-ia32_tsc_adjust-msr.patch
patches.fixes/net-addr_list-add-exclusive-dev_uc_add-and-dev_mc_ad.patch
patches.suse/btrfs-0614-return-error-of-btrfs_update_inode-to-caller.patch
patches.suse/btrfs-0732-turbo-charge-fsync.patch
patches.suse/btrfs-0739-remove-unused-hint-byte-argument-for-btrfs_dro.patch
patches.suse/btrfs-1094-cleanup-for-open-coded-alignment.patch
series.conf