aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-18 09:34:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-18 09:34:17 -0700
commita1e4ee22863d41a6fbb24310d7951836cb6dafe7 (patch)
tree2425e3d680964a493a2598cd30805053a7be5916 /Makefile
parentMerge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux (diff)
parentStaging: benet: remove driver now that it is merged in drivers/net/ (diff)
downloadlinux-dev-a1e4ee22863d41a6fbb24310d7951836cb6dafe7.tar.xz
linux-dev-a1e4ee22863d41a6fbb24310d7951836cb6dafe7.zip
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 'Makefile')
0 files changed, 0 insertions, 0 deletions