diff options
author | Len Brown <len.brown@intel.com> | 2010-02-23 00:19:48 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-02-23 00:19:48 -0500 |
commit | e4f23f66ed2498d7d08437d47cad2fca88b812bc (patch) | |
tree | d33d0b43a9f6c6e33b301c76631a75e74e4adb2a | |
parent | 9f3a6284880ceea452903e2043c88d7226736318 (diff) | |
parent | 6f6ef82cc9de24153ba7d5cedab5970e276aefa1 (diff) | |
parent | d306ebc28649b89877a22158fe0076f06cc46f60 (diff) | |
download | linux-e4f23f66ed2498d7d08437d47cad2fca88b812bc.tar.bz2 |
Merge branches 'bugzilla-14207' and 'idle' into release