summaryrefslogtreecommitdiff
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:31:17 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:31:17 -0500
commit299cfe38081bea6dcd8b882375f6f65a980bccf9 (patch)
treee567c1e908d158d6dce155cc5cf1b4eb8c78c514 /drivers/acpi/Kconfig
parent8976b6fd7a0060f72e20d5cec833c03d50874cd1 (diff)
parent443dea72d5f428170de6d6e3c4c1a1e2b7632b65 (diff)
downloadlinux-3.10-299cfe38081bea6dcd8b882375f6f65a980bccf9.tar.gz
linux-3.10-299cfe38081bea6dcd8b882375f6f65a980bccf9.tar.bz2
linux-3.10-299cfe38081bea6dcd8b882375f6f65a980bccf9.zip
Merge branches 'release' and 'hwmon-conflicts' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
0 files changed, 0 insertions, 0 deletions