summaryrefslogtreecommitdiffstats
path: root/drivers/power/max17040_battery.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-03 07:54:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-03 07:54:08 -0700
commit37e27e36bc416b07d853d493e6818d6a785507a2 (patch)
treebb7a5f5f187dace341878e9e2d638550dd0ea102 /drivers/power/max17040_battery.c
parent973bec34bfc1bc2465646181653d67f767d418c8 (diff)
parentd557f651b3617b46ed18d5bac48a851df1dbf684 (diff)
downloadlinux-37e27e36bc416b07d853d493e6818d6a785507a2.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.
Diffstat (limited to 'drivers/power/max17040_battery.c')
0 files changed, 0 insertions, 0 deletions