kevin/linux
1
Fork 0
Code
39f308242e
linux/arch/arm/mach-lpc32xx
History
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 arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h ARM: LPC32XX: Clock driver 2010-07-27 03:08:09 -07:00
common.c ARM: LPC32XX: Misc support functions 2010-07-27 08:42:46 -07:00
common.h ARM: LPC32XX: Misc support functions 2010-07-27 08:42:46 -07:00
gpiolib.c ARM: LPC32XX: GPIO, timer, and IRQ drivers 2010-07-27 03:08:09 -07:00
irq.c ARM: LPC32XX: GPIO, timer, and IRQ drivers 2010-07-27 03:08:09 -07:00
Kconfig ARM: LPC32XX: Arch config menu supoport and makefiles 2010-07-27 08:46:22 -07:00
Makefile ARM: LPC32XX: Arch config menu supoport and makefiles 2010-07-27 08:46:22 -07:00
Makefile.boot ARM: LPC32XX: Arch config menu supoport and makefiles 2010-07-27 08:46:22 -07:00
phy3250.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-10-21 16:42:32 -07:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
serial.c ARM: LPC32XX: Serial support code 2010-07-27 08:42:07 -07:00
suspend.S ARM: LPC32XX: System suspend support 2010-07-27 08:35:56 -07:00
timer.c ARM: lpc32xx: update clock source registration 2010-12-22 22:44:32 +00:00