summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-09 04:32:55 -0500
committerLen Brown <len.brown@intel.com>2008-02-09 04:32:55 -0500
commita52500c917ead55dd78d9f37b8ca993f4f79f72a (patch)
tree2f369beb48e39593c9952c6700d12155ef1af25e /drivers
parentd47b180c26c22d78c2428117abb7e6beba00b7ef (diff)
parent4609d029aa8a2c7e0ad71e329c6e3493e1e95040 (diff)
parent16111c797990f4fab571f6e982390cb842d16bf0 (diff)
downloadlinux-a52500c917ead55dd78d9f37b8ca993f4f79f72a.tar.bz2
Merge branches 'release', 'wmi' and 'laptop-docs' into release