diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /net/Kconfig | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig index acbf7c60e89b..b98668751749 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -181,6 +181,7 @@ source "net/dccp/Kconfig" | |||
| 181 | source "net/sctp/Kconfig" | 181 | source "net/sctp/Kconfig" |
| 182 | source "net/tipc/Kconfig" | 182 | source "net/tipc/Kconfig" |
| 183 | source "net/atm/Kconfig" | 183 | source "net/atm/Kconfig" |
| 184 | source "net/802/Kconfig" | ||
| 184 | source "net/bridge/Kconfig" | 185 | source "net/bridge/Kconfig" |
| 185 | source "net/8021q/Kconfig" | 186 | source "net/8021q/Kconfig" |
| 186 | source "net/decnet/Kconfig" | 187 | source "net/decnet/Kconfig" |