Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Mar 2009 16:34:17 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Mar 2009 16:34:17 +0000 (09:34 -0700)
* 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/


Trivial merge