aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2/commit.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2011-06-03 22:53:23 +0000
committerLinus Torvalds <[email protected]>2011-06-03 22:53:23 +0000
commitcd4ecf877a4d629c38571405fd649077c12dec50 (patch)
treeac0c5a72b503e1debbc06a10682f4a551bc304ac /fs/jbd2/commit.c
parentMerge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentARM: mach-shmobile: add DMAC clock definitions on SH7372 (diff)
downloadkernel-cd4ecf877a4d629c38571405fd649077c12dec50.tar.gz
kernel-cd4ecf877a4d629c38571405fd649077c12dec50.zip
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: add DMAC clock definitions on SH7372 ARM: arch-shmobile: support SDHI card detection on mackerel, using a GPIO sh_mobile_meram: MERAM platform data for LCDC
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions