aboutsummaryrefslogtreecommitdiff
path: root/drivers/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:18:04 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:18:04 -0500
commit26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (patch)
tree47799c181a82225e5ee9c566b2186224cde06251 /drivers/Kconfig
parente5e54bc86a1fed9849b22fd736c30b23c4719046 (diff)
parente5e54bc86a1fed9849b22fd736c30b23c4719046 (diff)
parent3c602840528cf1aa835e6e32d76a0a45936b8e4c (diff)
downloadlinux-2.6.34-ux500-26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7.tar.gz
Merge branches 'release' and 'menlo' into release
Conflicts: drivers/acpi/video.c Signed-off-by: Len Brown <len.brown@intel.com>