Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Sat, 23 Mar 2013 06:00:19 +0000 (07:00 +0100)
committerMichal Marek <mmarek@suse.cz>
Sat, 23 Mar 2013 06:00:19 +0000 (07:00 +0100)
commit9198b63d3aa462a1bef4e2095a554bd06ce256f0
treedf15d74dbc626a063133725ff0df17384d33341b
parent3f7d782cc73affdfb9dec92726f5f08d017bea3a
parent3b9efaf6478c3d3d5ca8ad23ebbc1d8446139fb3
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes

suse-commit: a203508f4c60a7047abcf764b1cd3de38da0f045
include/linux/skbuff.h
net/ipv6/route.c