summaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 14:16:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 14:16:08 -0700
commitd56f84e7e317c69adefb2454a3d538a6d7e11e4b (patch)
tree18e9baeb22810139af93b77dbf03c8435f58070a /drivers/net/tokenring
parent12462f2df4d10ea4f6d55b9d438ff788badec3f0 (diff)
parent3414df8ca38b203c8a5ad8efc32d4a3836a0596d (diff)
downloadlinux-d56f84e7e317c69adefb2454a3d538a6d7e11e4b.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: dream: remove dream driver and arch from tree
Diffstat (limited to 'drivers/net/tokenring')
0 files changed, 0 insertions, 0 deletions