diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:44:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:44:56 -0400 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/misc/Kconfig | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 5a74db75f66f..39a2173b4e6c 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -447,5 +447,6 @@ source "drivers/misc/c2port/Kconfig" | |||
| 447 | source "drivers/misc/eeprom/Kconfig" | 447 | source "drivers/misc/eeprom/Kconfig" |
| 448 | source "drivers/misc/cb710/Kconfig" | 448 | source "drivers/misc/cb710/Kconfig" |
| 449 | source "drivers/misc/iwmc3200top/Kconfig" | 449 | source "drivers/misc/iwmc3200top/Kconfig" |
| 450 | source "drivers/misc/ti-st/Kconfig" | ||
| 450 | 451 | ||
| 451 | endif # MISC_DEVICES | 452 | endif # MISC_DEVICES |