aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2/commit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:55:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:55:44 -0700
commitde109c9868cf78a172ae580a83bf9a3a74a9b4bd (patch)
tree8b555db133d85b19538c0c0ac555e999c91f166e /fs/jbd2/commit.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff)
parentapm_power: Add missing break statement (diff)
downloadlinux-dev-de109c9868cf78a172ae580a83bf9a3a74a9b4bd.tar.xz
linux-dev-de109c9868cf78a172ae580a83bf9a3a74a9b4bd.zip
Merge git://git.infradead.org/users/cbou/battery-2.6.36
* git://git.infradead.org/users/cbou/battery-2.6.36: apm_power: Add missing break statement intel_pmic_battery: Fix battery charging status on mrst
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions