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)
commita1e4ee22863d41a6fbb24310d7951836cb6dafe7
tree2425e3d680964a493a2598cd30805053a7be5916
parent85bff8857c62ab2bc3ed204de3fcde74781bbdb2
parentd0573facf21d1e5cfbc1ddac272b7592722e6c01
Merge git://git./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/