sugar/linux
1
0
Fork 0
Code Activity

Merge branches 'release' and 'menlo' into release

Browse Source 
Conflicts:

	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2008-02-07 03:18:04 -05:00
parent e5e54bc86a e5e54bc86a 3c60284052
commit 26b6f22366
19 changed files with 2455 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/Kconfig
View File

@@ -60,6 +60,8 @@ source "drivers/power/Kconfig"
source "drivers/hwmon/Kconfig"
source "drivers/thermal/Kconfig"
source "drivers/watchdog/Kconfig"
source "drivers/ssb/Kconfig"