summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lops.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-03 11:09:42 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-03 11:09:42 +0200
commitaa4f608478acb7ed69dfcff4f3c404100b78ac49 (patch)
treefa647976f80598156ec1c193f3dd90c3529516ae /fs/gfs2/lops.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff)
parentm68k/mac: Fix unexpected interrupt with CONFIG_EARLY_PRINTK (diff)
downloadlinux-aa4f608478acb7ed69dfcff4f3c404100b78ac49.tar.xz
linux-aa4f608478acb7ed69dfcff4f3c404100b78ac49.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fix from Geert Uytterhoeven: "A boot lock-up on Mac, also destined for stable" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/mac: Fix unexpected interrupt with CONFIG_EARLY_PRINTK
Diffstat (limited to 'fs/gfs2/lops.c')
0 files changed, 0 insertions, 0 deletions