summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-22 12:53:09 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-22 12:53:09 -0400
commitea3d1cc285bf1ae1fa81b47418cd7fd79990bb06 (patch)
treea5b4cd52ec5e27d169bf3115d732d2106bc78fc2 /samples
parent2fa70df935585479f974766d84fa68af462a25a5 (diff)
parentf4541d60a449afd40448b06496dcd510f505928e (diff)
downloadlinux-3.10-ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06.tar.gz
linux-3.10-ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06.tar.bz2
linux-3.10-ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull to get the thermal netlink multicast group name fix, otherwise the assertion added in net-next to netlink to detect that kind of bug makes systems unbootable for some folks. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions