2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
linux-next/fs/ocfs2/cluster
Linus Torvalds 23d69b09b7 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
  usb: don't use flush_scheduled_work()
  speedtch: don't abuse struct delayed_work
  media/video: don't use flush_scheduled_work()
  media/video: explicitly flush request_module work
  ioc4: use static work_struct for ioc4_load_modules()
  init: don't call flush_scheduled_work() from do_initcalls()
  s390: don't use flush_scheduled_work()
  rtc: don't use flush_scheduled_work()
  mmc: update workqueue usages
  mfd: update workqueue usages
  dvb: don't use flush_scheduled_work()
  leds-wm8350: don't use flush_scheduled_work()
  mISDN: don't use flush_scheduled_work()
  macintosh/ams: don't use flush_scheduled_work()
  vmwgfx: don't use flush_scheduled_work()
  tpm: don't use flush_scheduled_work()
  sonypi: don't use flush_scheduled_work()
  hvsi: don't use flush_scheduled_work()
  xen: don't use flush_scheduled_work()
  gdrom: don't use flush_scheduled_work()
  ...

Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.
2011-01-07 16:58:04 -08:00
..
heartbeat.c Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-01-07 16:58:04 -08:00
heartbeat.h ocfs2/cluster: Get all heartbeat regions 2010-10-07 14:31:06 -07:00
Makefile ocfs2/net: Add debug interface to o2net 2008-04-18 08:56:20 -07:00
masklog.c ocfs2: Adjust masklog flag values 2010-12-16 00:36:11 -08:00
masklog.h ocfs2: Adjust masklog flag values 2010-12-16 00:36:11 -08:00
netdebug.c inet: rename some inet_sock fields 2009-10-18 18:52:53 -07:00
nodemanager.c ocfs2/cluster: Print messages when adding/removing nodes 2010-10-07 17:30:17 -07:00
nodemanager.h ocfs2/cluster: Make fence method configurable - v2 2009-12-02 16:49:26 -08:00
ocfs2_heartbeat.h ocfs2: warn the user on a dead timeout mismatch 2006-06-29 15:45:35 -07:00
ocfs2_nodemanager.h ocfs2/dlm: Add message DLM_QUERY_REGION 2010-10-09 10:26:23 -07:00
quorum.c ocfs2: don't use flush_scheduled_work() 2010-12-24 15:59:06 +01:00
quorum.h
sys.c ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb) 2008-04-30 17:07:59 -07:00
sys.h
tcp_internal.h Fix various typos of valid in comments 2010-09-21 17:04:50 +02:00
tcp.c ocfs2/cluster: Check slots for unconfigured live nodes 2010-10-07 17:00:16 -07:00
tcp.h [PATCH 1/3] ocfs2/net: Silence build warnings 2008-05-30 15:15:04 -07:00
ver.c ocfs2: bump version number 2008-01-25 15:05:46 -08:00
ver.h