diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-08 10:22:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-08 10:22:00 -0800 |
| commit | d8af8582c321414087ed46512ffe5ce4f5c9c5da (patch) | |
| tree | 816afd4b4d43bfa73c8cd65867a1c264a044a41c /net/unix/sysctl_net_unix.c | |
| parent | Fix __pfn_to_page(pfn) for CONFIG_DISCONTIGMEM=y (diff) | |
| parent | Staging: make usbip depend on CONFIG_NET (diff) | |
| download | linux-d8af8582c321414087ed46512ffe5ce4f5c9c5da.tar.gz linux-d8af8582c321414087ed46512ffe5ce4f5c9c5da.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: make usbip depend on CONFIG_NET
Staging: only build the tree if we really want to
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions