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)
commit6efde93b67191cd8477119f38506300e9146e134
tree179e62a94d064c655b95291a7bd5c8340a725107
parent3935df2b3c2115b897a0f79a71c20035f052a821
parent92c21de26f79119471fc33b3199f87b2d6080356
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
series.conf