diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-15 02:21:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-15 02:21:30 -0500 |
| commit | 6a54aebf6978e9f296a4d3da3e40af425163c22e (patch) | |
| tree | 8217c7114db02d8b69c22fc44880749426949bc3 /drivers/net/hippi/Kconfig | |
| parent | 067491b7313c41f49607fce782d29344d1472587 (diff) | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
Merge commit 'v3.2-rc5' into sched/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/hippi/Kconfig')
| -rw-r--r-- | drivers/net/hippi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hippi/Kconfig b/drivers/net/hippi/Kconfig index 7393eb732ee6..95eb34fdbba7 100644 --- a/drivers/net/hippi/Kconfig +++ b/drivers/net/hippi/Kconfig | |||
| @@ -36,4 +36,4 @@ config ROADRUNNER_LARGE_RINGS | |||
| 36 | kernel code or by user space programs. Say Y here only if you have | 36 | kernel code or by user space programs. Say Y here only if you have |
| 37 | the memory. | 37 | the memory. |
| 38 | 38 | ||
| 39 | endif /* HIPPI */ | 39 | endif # HIPPI |