Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 9 Jan 2013 09:03:43 +0000 (10:03 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 9 Jan 2013 09:03:43 +0000 (10:03 +0100)
commit3f18a478433482c7f6168cb57f16264db4aadbd0
treeb590dc9879ba65988a0a01accde78f67b54f6f4f
parenteb9c6bb4bea2321372ed5392d5fece897c42539f
parent83fd276e19ff8a1aba019eb6630f74c6c9627ac1
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
Dropped patches.xen changes, as these will be done separately in the SP3
branch.
series.conf