2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
linux-next/arch/sparc/mm
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
..
btfixup.c sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
extable.c sparc: Add module.h to files previously implicitly using it. 2011-10-31 19:30:54 -04:00
fault_32.c sparc: remove several unnecessary module.h include instances 2011-10-31 19:30:54 -04:00
fault_64.c perf: Remove the nmi parameter from the swevent and overflow interface 2011-07-01 11:06:35 +02:00
generic_32.c sparc: add export.h to arch/sparc files as required 2011-10-31 19:30:52 -04:00
generic_64.c sparc: add export.h to arch/sparc files as required 2011-10-31 19:30:52 -04:00
gup.c thp: share get_huge_page_tail() 2011-11-02 16:06:58 -07:00
highmem.c sparc: add export.h to arch/sparc files as required 2011-10-31 19:30:52 -04:00
hugetlbpage.c sparc: remove several unnecessary module.h include instances 2011-10-31 19:30:54 -04:00
hypersparc.S sparc: remove CVS keywords 2008-05-20 00:33:44 -07:00
init_32.c sparc: Remove unnecessary semicolons 2011-06-07 16:06:34 -07:00
init_64.c sparc64: Force the execute bit in OpenFirmware's translation entries. 2011-09-29 12:18:59 -07:00
init_64.h sparc64: Fix definition of VMEMMAP_SIZE. 2009-11-23 16:38:56 -08:00
io-unit.c sparc: remove references to of_device and to_of_device 2010-07-24 09:58:22 -06:00
iommu.c Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-05 15:57:35 -07:00
leon_mm.c sparc32,leon: SRMMU MMU Table probe fix 2011-10-07 12:08:01 -07:00
loadmmu.c sparc,leon: Introduce the sparc-leon CPU type. 2009-08-17 18:32:10 -07:00
Makefile sparc64: implement get_user_pages_fast() 2011-07-25 20:57:10 -07:00
nosun4c.c MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself 2010-02-20 16:41:46 +00:00
srmmu.c sparc: Remove unnecessary semicolons 2011-06-07 16:06:34 -07:00
sun4c.c sparc: Remove unnecessary semicolons 2011-06-07 16:06:34 -07:00
swift.S sparc: remove CVS keywords 2008-05-20 00:33:44 -07:00
tlb.c sparc: mmu_gather rework 2011-05-25 08:39:13 -07:00
tsb.c sparc64: kill page table quicklists 2011-07-25 20:57:09 -07:00
tsunami.S sparc/mm/: possible cleanups 2008-07-17 21:38:01 -07:00
ultra.S sparc64: Reschedule KGDB capture to a software interrupt. 2009-03-18 23:51:57 -07:00
viking.S sparc: remove CVS keywords 2008-05-20 00:33:44 -07:00