summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-01 02:57:30 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-01 02:57:30 +0100
commit4f427634b127f5fdc4e9fd2e5780f0a6caef936b (patch)
tree1c1651abea7d54a9de8d852030a344a1705253f6 /fs/gfs2/main.c
parentMerge branches 'perf-fixes-for-linus', 'x86-fixes-for-linus' and 'timers-fixe... (diff)
parentMerge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into dev... (diff)
downloadlinux-4f427634b127f5fdc4e9fd2e5780f0a6caef936b.tar.xz
linux-4f427634b127f5fdc4e9fd2e5780f0a6caef936b.zip
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omap4: prcm: Fix the CPUx clockdomain offsets OMAP2+: clocksource: fix crash on boot when !CONFIG_OMAP_32K_TIMER OMAP2/3: clock: fix fint calculation for DPLL_FREQSEL OMAP2+: mailbox: fix lookups for multiple mailboxes OMAP2420: mailbox: fix IVA vs DSP IRQ numbering mach-omap2: smartreflex: world-writable debugfs voltage files mach-omap2: pm: world-writable debugfs timer files mach-omap2: mux: world-writable debugfs files
Diffstat (limited to 'fs/gfs2/main.c')
0 files changed, 0 insertions, 0 deletions