linux/arch/ia64/sn/kernel
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
..
sn2 [IA64] sn2: add missing put_cpu() 2011-08-11 09:27:54 -07:00
bte_error.c [IA64] Fix Altix BTE error return status 2007-12-19 11:19:19 -08:00
bte.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
huberror.c [IA64] minor irq handler cleanups 2008-04-22 08:56:58 -07:00
idle.c
io_acpi_init.c ia64: Add export.h to arch/ia64 specific files as required 2011-10-31 19:30:58 -04:00
io_common.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
io_init.c ia64: Add export.h to arch/ia64 specific files as required 2011-10-31 19:30:58 -04:00
iomv.c [IA64] Move include/asm-ia64 to arch/ia64/include/asm 2008-08-01 10:21:21 -07:00
irq.c ia64,rcu: Convert call_rcu(sn_irq_info_free) to kfree_rcu() 2011-07-20 14:10:13 -07:00
klconflib.c [IA64-SGI] sn2 housekeeping 2006-02-02 13:35:59 -08:00
machvec.c
Makefile ia64: change to new flag variables 2011-03-17 14:02:56 +01:00
mca.c [IA64] remove remaining __FUNCTION__ occurrences 2008-03-06 09:19:27 -08:00
msi_sn.c ia64: Convert to the new irq_* function names 2011-03-29 14:48:05 +02:00
pio_phys.S [IA64-SGI] - Eliminate SN pio_phys_xxx macros. Move to assembly 2006-02-07 09:24:14 -08:00
setup.c [IA64] setup.c Typo fix "Architechtuallly" 2011-03-02 14:00:11 -08:00
tiocx.c [IA64] Convert ia64 to use int-ll64.h 2009-06-17 09:33:49 -07:00