Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Thu, 27 Jun 2013 13:19:18 +0000 (15:19 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 27 Jun 2013 13:19:18 +0000 (15:19 +0200)
commite99b9fae7a80e47f866ebadc98f2cff98bd37ad5
treea44ff5cd4c37d33f331d3807d5288aece0f16bd4
parentf2519ccd9d840b27117e2357cf2a0d729531131d
parentf0746bccc7eb2f04e45b79942f6b70c8040bcf47
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
patches.kabi/mm-compaction-scan-pfn-caching-KABI-fix.patch
patches.kabi/mm-compaction-scan-pfn-caching-KABI.patch
patches.kabi/mm-mmu_notifier-have-mmu_notifiers-use-a-global-SRCU-so-they-may-safely-schedule-kabi.patch
patches.kabi/netfilter-kABI-fix-after-making-event-callback-regis.patch
series.conf

suse-commit: 6efde93b67191cd8477119f38506300e9146e134