linux/fs/ncpfs
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
..
dir.c fs: rcu-walk aware d_revalidate method 2011-01-07 17:50:29 +11:00
file.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
getopt.c fs/ncpfs/getopt.c: cleanup keneldoc 2009-01-06 15:59:19 -08:00
getopt.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
inode.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
ioctl.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
Kconfig fs/Kconfig: move the rest of ncpfs out 2009-01-22 13:16:01 +03:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mmap.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ncplib_kernel.c BKL: Remove BKL from ncpfs 2010-10-04 21:10:52 +02:00
ncplib_kernel.h fs: dcache remove dcache_lock 2011-01-07 17:50:23 +11:00
ncpsign_kernel.c BKL: Remove BKL from ncpfs 2010-10-04 21:10:52 +02:00
ncpsign_kernel.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sock.c BKL: Remove BKL from ncpfs 2010-10-04 21:10:52 +02:00
symlink.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00