linux-sg2042/fs/logfs
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
..
Kconfig [LogFS] add new flash file system 2009-11-20 20:13:39 +01:00
Makefile [LogFS] add new flash file system 2009-11-20 20:13:39 +01:00
compr.c zlib: slim down zlib_deflate() workspace when possible 2011-03-22 17:44:17 -07:00
dev_bdev.c sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00
dev_mtd.c Fix common misspellings 2011-03-31 11:26:23 -03:00
dir.c filesystems: add missing nlink wrappers 2011-11-02 12:53:43 +01:00
file.c fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers 2011-07-20 20:47:59 -04:00
gc.c logfs: handle powerfail on NAND flash 2010-05-07 19:38:40 +02:00
inode.c filesystems: add missing nlink wrappers 2011-11-02 12:53:43 +01:00
journal.c logfs: fix deadlock in logfs_get_wblocks, hold and wait on super->s_write_mutex 2010-12-22 19:43:33 -08:00
logfs.h lib/string.c: introduce memchr_inv() 2011-10-31 17:30:47 -07:00
logfs_abi.h fix "seperate" typos in comments 2010-05-10 11:56:30 +02:00
readwrite.c filesystems: add set_nlink() 2011-11-02 12:53:43 +01:00
segment.c logfs: get rid of magical inodes 2010-08-09 16:48:26 -04:00
super.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00