linux/fs/gfs2
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
acl.c
acl.h
aops.c
bmap.c GFS2: Move readahead of metadata during deallocation into its own function 2011-10-21 12:39:54 +01:00
bmap.h
dentry.c
dir.c
dir.h
export.c
file.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue 2011-10-28 10:49:34 -07:00
gfs2.h
glock.c
glock.h treewide: use __printf not __attribute__((format(printf,...))) 2011-10-31 17:30:54 -07:00
glops.c filesystems: add set_nlink() 2011-11-02 12:53:43 +01:00
glops.h
incore.h GFS2: Remove two unused variables 2011-10-21 12:39:52 +01:00
inode.c Merge http://sucs.org/~rohan/git/gfs2-3.0-nmw 2011-10-28 10:44:50 -07:00
inode.h
Kconfig
lock_dlm.c
log.c
log.h
lops.c GFS2: Misc fixes 2011-10-21 12:39:51 +01:00
lops.h
main.c
Makefile
meta_io.c
meta_io.h
ops_fstype.c fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros 2011-10-31 19:30:31 -04:00
quota.c GFS2: Misc fixes 2011-10-21 12:39:51 +01:00
quota.h
recovery.c
recovery.h
rgrp.c GFS2: Remove two unused variables 2011-10-21 12:39:52 +01:00
rgrp.h GFS2: Remove two unused variables 2011-10-21 12:39:52 +01:00
super.c
super.h
sys.c
sys.h
trace_gfs2.h
trans.c
trans.h
util.c
util.h
xattr.c
xattr.h