diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 15:43:53 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 15:43:53 +0100 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /drivers/net/hippi | |
| parent | gma500: Final enables for Oaktrail (diff) | |
| parent | Linux 3.2-rc6 (diff) | |
| download | linux-1fbe6f625f69e48c4001051dc1431afc704acfaa.tar.xz linux-1fbe6f625f69e48c4001051dc1431afc704acfaa.zip | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'drivers/net/hippi')
| -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 kernel code or by user space programs. Say Y here only if you have the memory. -endif /* HIPPI */ +endif # HIPPI |