aboutsummaryrefslogtreecommitdiff
path: root/fs/ocfs2/heartbeat.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-05 08:25:43 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-05 08:25:43 -0800
commit227c5fe7993a5430e582dfd4c3acd9484004c6fc (patch)
tree9724f1cbebaae71f86c8f2d168f34380355a6f0f /fs/ocfs2/heartbeat.c
parent6ebf622b2577c50b1f496bd6a5e8739e55ae7b1c (diff)
parent202d4e602555e68c2bc71775228876b0356785c8 (diff)
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: backlight: Allow enable/disable of fb backlights, fixing regressions backlight: Fix nvidia backlight initial brightness
Diffstat (limited to 'fs/ocfs2/heartbeat.c')
0 files changed, 0 insertions, 0 deletions