diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-31 04:37:29 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-31 04:37:29 (GMT) |
commit | 4e700bcdd89a5592a5a991bf3e78904de1140611 (patch) | |
tree | 1a21ea2eb4c0ebe1a9d5303c6cc8328474f7f5e1 /drivers/power/olpc_battery.c | |
parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) | |
parent | a84b50ceb7d640437d0dc28a2bef0d0de054de89 (diff) | |
download | linux-fsl-qoriq-4e700bcdd89a5592a5a991bf3e78904de1140611.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/power/olpc_battery.c')
0 files changed, 0 insertions, 0 deletions