aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 01:48:46 -0400
committerLen Brown <len.brown@intel.com>2009-04-05 01:48:46 -0400
commit59b17bf6ea06abed519dfc788fff1b6b9499d23f (patch)
tree6f7e870659f91e753dc515cc1b8702420dd6a81e /Documentation
parentMerge branch 'acpi-modparam' into release (diff)
parentACPI: battery: asynchronous init (diff)
downloadlinux-dev-59b17bf6ea06abed519dfc788fff1b6b9499d23f.tar.xz
linux-dev-59b17bf6ea06abed519dfc788fff1b6b9499d23f.zip
Merge branch 'async-battery' into release
Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions