diff options
| author | Linus Torvalds <[email protected]> | 2009-03-18 16:34:17 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-03-18 16:34:17 +0000 |
| commit | a1e4ee22863d41a6fbb24310d7951836cb6dafe7 (patch) | |
| tree | 2425e3d680964a493a2598cd30805053a7be5916 /net/unix/af_unix.c | |
| parent | Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | Staging: benet: remove driver now that it is merged in drivers/net/ (diff) | |
| download | kernel-a1e4ee22863d41a6fbb24310d7951836cb6dafe7.tar.gz kernel-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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions