summaryrefslogtreecommitdiffstats
path: root/drivers/power/olpc_battery.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-07-30 19:38:04 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-07-30 19:38:04 +0200
commit2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch)
tree8492ea548fea2d8243e4af4b877906afc4e32783 /drivers/power/olpc_battery.c
parentMerge branch 'master' into for-linus (diff)
parentMerge branch 'i2c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux (diff)
downloadlinux-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.xz
linux-2e6713c7662cc5ebc7346b033c404cb2f708fd51.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/power/olpc_battery.c')
0 files changed, 0 insertions, 0 deletions