Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)

Trivial merge