diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:34:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:34:17 -0700 |
commit | a1e4ee22863d41a6fbb24310d7951836cb6dafe7 (patch) | |
tree | 2425e3d680964a493a2598cd30805053a7be5916 /kernel/Makefile | |
parent | 85bff8857c62ab2bc3ed204de3fcde74781bbdb2 (diff) | |
parent | d0573facf21d1e5cfbc1ddac272b7592722e6c01 (diff) |
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/
Diffstat (limited to 'kernel/Makefile')
0 files changed, 0 insertions, 0 deletions