5d2571dcfd6f5d
author David S. Miller <davem@davemloft.net> 1337144560 -0400
committer David S. Miller <davem@davemloft.net> 1337144560 -0400

Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
#›s{š/x