summaryrefslogtreecommitdiffstats
path: root/drivers/rapidio
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 09:13:13 +0100
committerLen Brown <len.brown@intel.com>2008-02-07 09:13:13 +0100
commit70ec75c5b8e0bda7a16fb387f91e08545f379a0e (patch)
tree59a13092f566f89ce2cccbaecff487c82fc02564 /drivers/rapidio
parentMerge branches 'release' and 'ppc-workaround' into release (diff)
parentacpi: make __acpi_map_table() and __init function (diff)
parentPM: documentation cleanups (diff)
downloadlinux-70ec75c5b8e0bda7a16fb387f91e08545f379a0e.tar.xz
linux-70ec75c5b8e0bda7a16fb387f91e08545f379a0e.zip
Merge branches 'release', 'misc' and 'misc-2.6.25' into release