diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-15 12:00:09 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-15 12:00:09 +0400 |
| commit | c9572f010d369d9905309f63e31180f291b66a8a (patch) | |
| tree | fbca2a0576c4223790e23a3c1d5f50e2bdf64e10 /drivers/staging/Kconfig | |
| parent | 58cea307432e3376293e6b2be88d1f6e6e99274a (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | linux-c9572f010d369d9905309f63e31180f291b66a8a.tar.xz | |
Merge tag 'v3.11-rc5' into perf/core
Merge Linux 3.11-rc5, to sync up with the latest upstream fixes since -rc1.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 3227ebeae3f1..57d8b3444600 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -118,8 +118,6 @@ source "drivers/staging/ozwpan/Kconfig" source "drivers/staging/gdm72xx/Kconfig" -source "drivers/staging/csr/Kconfig" - source "drivers/staging/silicom/Kconfig" source "drivers/staging/ced1401/Kconfig" |