summaryrefslogtreecommitdiffstats
path: root/Documentation/sgi-ioc4.txt
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-16 03:33:28 -0500
committerLen Brown <len.brown@intel.com>2009-12-16 03:33:28 -0500
commitf02f465b1cdcdf7485f89ec019e6cceaf80cadd5 (patch)
tree4219772e39848f31b9554786de5a18c026dfe2e5 /Documentation/sgi-ioc4.txt
parentb6202832b43abb56b90ba8d68e2b9fc53c442fa6 (diff)
parent747479a3fb42849fe73b9b1f7545d751bde7d632 (diff)
Merge branch 'dock' into release
Conflicts: drivers/acpi/dock.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/sgi-ioc4.txt')
0 files changed, 0 insertions, 0 deletions