| commit | c727e7f0071cae66c029f667d48b154c6b64227b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed May 16 01:02:40 2012 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Wed May 16 01:02:40 2012 -0400 |
| tree | 197c2760fcae529d04d56f56e9cd55f51d6d9273 | |
| parent | 91df42bedccb919902c7cf7eb876c982ae7f1b1d [diff] | |
| parent | ee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d [diff] |
Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux