linux/arch/arm/mach-omap1
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
..
include/mach omap1: Use asm_irq_flags for entry-macro.S 2010-12-09 15:49:23 -08:00
ams-delta-fiq-handler.S OMAP1: Amstrad Delta: add FIQ handler for serial keyboardport interrupt processing 2010-05-05 11:11:10 -07:00
ams-delta-fiq.c OMAP1: Amstrad Delta: add a handler for processing interruptsgenerated by the FIQ routine 2010-05-05 11:11:10 -07:00
board-ams-delta.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-fsample.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-generic.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
board-h2-mmc.c omap: Fix spotty MMC voltages 2010-10-12 16:07:51 -07:00
board-h2.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-h2.h ARM: OMAP: No need to include board-h2.h from hardware.h 2009-03-23 18:07:33 -07:00
board-h3-mmc.c omap: Fix spotty MMC voltages 2010-10-12 16:07:51 -07:00
board-h3.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-h3.h ARM: OMAP: No need to include board-h3.h from hardware.h 2009-03-23 18:07:33 -07:00
board-htcherald.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-innovator.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-nokia770.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-osk.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-palmte.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-palmtt.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-palmz71.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-perseus2.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-sx1-mmc.c omap: Fix spotty MMC voltages 2010-10-12 16:07:51 -07:00
board-sx1.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-voiceblue.c Merge branch 'devel-gpio' into omap-for-linus 2010-12-10 11:37:47 -08:00
clock_data.c OMAP1: clock_data: use runtime cpu / machine checks 2010-12-21 21:08:15 -07:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h OMAP1: clock: some cleanup 2010-07-26 16:34:28 -06:00
devices.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
dma.c OMAP: DMA: Convert DMA library into platform driver 2010-12-20 18:38:31 -08:00
flash.c arm: omap1: add missing includes 2010-11-24 16:46:48 -08:00
fpga.c omap1: Fix innovator FPGA init for multi-omap 2010-12-20 18:48:16 -08:00
gpio7xx.c omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx 2010-12-07 16:26:58 -08:00
gpio15xx.c omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx 2010-12-07 16:26:58 -08:00
gpio16xx.c omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx 2010-12-07 16:26:58 -08:00
i2c.c omap: i2c: Fix muxing for command line enabled bus 2010-02-25 14:45:08 -08:00
id.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
io.c omap: Split omap_read/write functions for omap1 and omap2+ 2010-12-10 09:46:24 -08:00
irq.c omap1: Use asm_irq_flags for entry-macro.S 2010-12-09 15:49:23 -08:00
Kconfig OMAP1: drop AMS_DELTA_FIQ config option 2010-11-30 13:48:46 -08:00
lcd_dma.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
leds-h2p2-debug.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
leds-innovator.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-osk.c ARM: OMAP: switch to standard gpio get/set calls 2008-12-10 17:35:25 -08:00
leds.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
leds.h
mailbox.c arm: omap1: mbox: delete unused variable 2010-11-24 16:48:47 -08:00
Makefile OMAP: DMA: Convert DMA library into platform driver 2010-12-20 18:38:31 -08:00
Makefile.boot
mcbsp.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
mux.c arm: omap1: make some functions static 2010-11-24 16:48:25 -08:00
opp_data.c OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c 2009-12-11 17:00:40 -07:00
opp.h OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c 2009-12-11 17:00:40 -07:00
pm_bus.c omap1: pm_bus: Fix compilation warning 2010-12-20 17:53:04 -08:00
pm.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
pm.h OMAP850: PM: Add an ARCH_OMAP850 check 2009-10-07 23:14:08 +01:00
serial.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
sleep.S OMAP7XX: Rename all the rest of the omap730 references in omap1 core 2009-10-07 23:14:06 +01:00
sram.S OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead 2009-08-28 10:50:33 -07:00
time.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
timer32k.c arm: omap1: remove dead code from timer32k.c 2010-04-22 17:32:36 -07:00
usb.c omap: Move omap1 USB platform init code into mach-omap1/usb.c 2010-07-05 16:31:30 +03:00