summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-16 02:18:36 -0500
committerLen Brown <len.brown@intel.com>2009-12-16 02:18:36 -0500
commit8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4 (patch)
tree76cd9d4492d7fe4e2a90dbbc43127ca80ad93288 /README
parent7458bbd044f0e799ad27c3fc71e1115ac30a9c25 (diff)
parentd81c45e1c9369855901420f79114852eba2ea16a (diff)
downloadlinux-8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4.tar.bz2
Merge branch 'ost' into release
Conflicts: include/acpi/processor.h Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions