tree 2425e3d680964a493a2598cd30805053a7be5916
parent 85bff8857c62ab2bc3ed204de3fcde74781bbdb2
parent d0573facf21d1e5cfbc1ddac272b7592722e6c01
author Linus Torvalds <torvalds@linux-foundation.org> 1237394057 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1237394057 -0700

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: benet: remove driver now that it is merged in drivers/net/