diff options
author | Len Brown <len.brown@intel.com> | 2008-02-09 09:32:55 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-09 09:32:55 (GMT) |
commit | a52500c917ead55dd78d9f37b8ca993f4f79f72a (patch) | |
tree | 2f369beb48e39593c9952c6700d12155ef1af25e /drivers | |
parent | d47b180c26c22d78c2428117abb7e6beba00b7ef (diff) | |
parent | 4609d029aa8a2c7e0ad71e329c6e3493e1e95040 (diff) | |
parent | 16111c797990f4fab571f6e982390cb842d16bf0 (diff) | |
download | linux-fsl-qoriq-a52500c917ead55dd78d9f37b8ca993f4f79f72a.tar.xz |
Merge branches 'release', 'wmi' and 'laptop-docs' into release