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
nfsd: remove pointless paths in file headers
2009-12-15 15:01:47 -05:00
nfsd: minor fs/nfsd/auth.h cleanup
2008-02-01 16:42:05 -05:00
nfsd: remove pointless paths in file headers
2009-12-15 15:01:47 -05:00
sunrpc: Add net to pure API calls
2010-09-27 10:16:11 -04:00
lockd: push lock_flocks down
2010-10-27 21:39:39 +02:00
nfsd: remove pointless paths in file headers
2009-12-15 15:01:47 -05:00
knfsd: trivial makefile cleanup
2007-05-09 12:30:54 -07:00
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
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
nfsd: minor nfsd read api cleanup
2010-07-30 12:54:54 -04:00
nfsd: Fix possible BUG_ON firing in set_change_info
2010-12-08 11:44:04 -05:00
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
NFSD: remove duplicate NFS4_STATEID_SIZE
2010-10-24 18:02:53 -04:00
nfsd/idmap: drop special request deferal in favour of improved default.
2010-09-21 17:08:31 -04:00
nfsd: disable deferral for NFSv4
2010-09-21 17:02:27 -04:00
sanitize vfs_fsync calling conventions
2010-05-21 18:31:21 -04:00
workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()
2010-12-15 10:56:11 +01:00
nfsd4: adjust buflen for encoded attrs bitmap based on actual bitmap length
2010-10-01 16:52:24 -04:00
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
convert get_sb_single() users
2010-10-29 04:16:28 -04:00
nfsd4: expire clients more promptly
2010-10-11 20:00:18 -04:00
nfsd: fix "insecure" export option
2009-12-20 20:19:51 -08:00
nfsd: fix BUG at fs/nfsd/nfsfh.h:199 on unlink
2010-10-13 15:48:55 -04:00
nfsd: minor nfsd read api cleanup
2010-07-30 12:54:54 -04:00
sunrpc: Add net argument to svc_create_xprt
2010-10-01 17:18:54 -04:00
nfsd: remove pointless paths in file headers
2009-12-15 15:01:47 -05:00
nfsd4: move minorversion to client
2010-10-21 10:12:02 -04:00
nfsd: remove pointless paths in file headers
2009-12-15 15:01:47 -05:00
fs: dcache scale dentry refcount
2011-01-07 17:50:21 +11:00
nfsd: minor nfsd read api cleanup
2010-07-30 12:54:54 -04:00
nfsd: remove pointless paths in file headers
2009-12-15 15:01:47 -05:00
nfsd: remove pointless paths in file headers
2009-12-15 15:01:47 -05:00
nfsd: Fix possible BUG_ON firing in set_change_info
2010-12-08 11:44:04 -05:00
23d69b09b7