summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-08 22:15:27 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-08 22:15:27 +0100
commitb4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (patch)
treef0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7 /fs/jbd2
parentMerge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentx86: Kconfig: drop unknown symbol 'APM_MODULE' (diff)
downloadlinux-b4a133da2eaccb844a7beaef16ffd9c76a0d21d3.tar.xz
linux-b4a133da2eaccb844a7beaef16ffd9c76a0d21d3.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: x86: Kconfig: drop unknown symbol 'APM_MODULE'
Diffstat (limited to 'fs/jbd2')
0 files changed, 0 insertions, 0 deletions