Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 10 Jul 2013 11:48:17 +0000 (13:48 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 10 Jul 2013 11:48:17 +0000 (13:48 +0200)
commit6f539a8506ced3c80559272a782bfa34a17df21a
tree94fd4700b44a1949160271392bf2add69be7b220
parent372cdc7a2d6045ddbaec902dfb4f5bc9f56f6f22
parent51bfd99758b225ccfdff0d936483526ffd7d8c89
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
series.conf
Dropped
patches.suse/msft-hv-0406-hyperv-Fix-a-kernel-warning-from-netvsc_linkstatus_c.patch,
which is already present in the tree under a different name.

suse-commit: b0f07195968790344d919b8d59479a43e759dd01
mm/page_alloc.c