kernel_optimize_test/arch/arm/mach-msm/include/mach
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
board.h msm: MSM8X60 RUMI3 board support 2010-10-08 15:12:37 -07:00
clk.h msm: generalize clock support. 2010-05-13 16:08:20 -07:00
debug-macro.S msm: fix compile failure when no debug uart is selected 2010-10-29 15:56:16 -07:00
dma.h msm: dma: add stub functions for dma features not yet present on 8x60 2010-10-08 15:12:42 -07:00
entry-macro-qgic.S fix comment typos concerning "consistent" 2010-12-10 16:04:28 +01:00
entry-macro-vic.S msm: irq: rename existing entry-macro to entry-macro-vic 2010-10-08 15:12:38 -07:00
entry-macro.S msm: irq: rename existing entry-macro to entry-macro-vic 2010-10-08 15:12:38 -07:00
gpio.h msm: gpio: Remove tlmm routines obsoleted by gpiomux. 2010-10-06 09:01:17 -07:00
hardware.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
io.h msm: io: MSM8X60 io support 2010-10-08 15:12:33 -07:00
iommu_hw-8xxx.h msm: iommu: Definitions for extended memory attributes 2010-11-30 16:05:05 -08:00
iommu.h msm: iommu: Definitions for extended memory attributes 2010-11-30 16:05:05 -08:00
irqs-7x00.h msm: generialize IRQ to support multiple SOCs. 2010-05-13 16:07:53 -07:00
irqs-7x30.h msm: irqs: add irqs-7x30.h for MSM7x30 support 2010-05-13 16:08:40 -07:00
irqs-8x50.h msm: irqs: add irqs-8x50.h for QSD8x50 support 2010-05-13 16:08:27 -07:00
irqs-8x60.h msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU 2010-11-30 13:53:45 -08:00
irqs.h msm: initial irq definitions for MSM8X60 2010-10-08 15:12:34 -07:00
memory.h msm: physical offset for MSM8X60 2010-10-08 15:12:46 -07:00
mmc.h msm: mmc: Add msm prefix to platform data structure 2010-08-09 15:48:23 -07:00
msm_fb.h arm: msm: video: add msm_fb.h 2010-05-12 09:19:41 -07:00
msm_iomap-7x00.h msm: generialize iomap to support multiple SOCs. 2010-05-13 16:07:54 -07:00
msm_iomap-7x30.h MSM: Add USB support for MSM7x30 2010-12-16 13:53:39 -08:00
msm_iomap-8x50.h msm: add msm_iomap-8x50.h for QSD8x50 support 2010-05-13 16:08:29 -07:00
msm_iomap-8x60.h msm: timer: SMP timer support for msm 2011-01-07 15:54:44 -08:00
msm_iomap.h msm: io: MSM8X60 io support 2010-10-08 15:12:33 -07:00
msm_smd.h arm: msm: smd: checkpatch clean up of smd/proc_comm 2010-05-12 09:15:39 -07:00
sirc.h msm: add sirc interrupt controller driver. 2010-05-13 16:07:56 -07:00
smp.h ARM: SMP: pass an ipi number to smp_cross_call() 2010-12-03 08:26:30 +00:00
system.h [ARM] msm: shared memory interface for baseband processor ipc 2010-05-12 09:14:52 -07:00
timex.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
uncompress.h msm: make debugging UART (for DEBUG_LL) configurable 2009-11-20 06:40:05 -08:00
vmalloc.h ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
vreg.h arm: msm: status for vreg 2010-05-12 09:14:36 -07:00