summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lock_dlm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-23 19:50:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-23 19:50:48 -0700
commitce1ee9f5b99fa4ba332692194aa57b604112762f (patch)
tree99440af5e5d90133b5417472277ff790caa3fdb4 /fs/gfs2/lock_dlm.c
parent4d634ca35a8b38530b134ae92bc9e3cc9c23c030 (diff)
parente00574b7f3181c5277df819e960d5af205e0e87a (diff)
downloadlinux-ce1ee9f5b99fa4ba332692194aa57b604112762f.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel
Pull Hexagon fixes from Richard Kuo: "It's mostly compile fixes and the Hexagon portion of a CPU hotplug patch set." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel: hexagon: add missing cpu.h include hexagon/CPU hotplug: Add missing call to notify_cpu_starting() hexagon: use renamed tick_nohz_idle_* functions Hexagon: misc compile warning/error cleanup due to missing headers
Diffstat (limited to 'fs/gfs2/lock_dlm.c')
0 files changed, 0 insertions, 0 deletions