1
linux/arch/blackfin/mach-common
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
..
arch_checks.c Blackfin: allow cache funcs to be in L1 for IFLUSH Anomaly 05000491 2010-08-06 12:55:47 -04:00
cache-c.c Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
cache.S Blackfin: allow cache funcs to be in L1 for IFLUSH Anomaly 05000491 2010-08-06 12:55:47 -04:00
clocks-init.c Blackfin: pull in asm/dpmc.h for power defines 2009-12-15 00:14:50 -05:00
cpufreq.c Blackfin: Rename IRQ flags handling functions 2010-10-07 14:08:52 +01:00
dpmc_modes.S Blackfin: bf561: rewrite SICA_xxx to just SIC_xxx 2010-10-22 16:30:02 -04:00
dpmc.c
entry.S Blackfin: fix building IPIPE code when XIP is enabled 2011-01-10 07:18:21 -05:00
head.S Blackfin: initial XIP support 2010-03-09 00:30:48 -05:00
interrupt.S Blackfin: initial preempt support while returning from interrupt 2010-10-22 03:48:55 -04:00
ints-priority.c Blackfin: bf54x: don't ack GPIO ints when unmasking them 2011-01-10 07:18:26 -05:00
Makefile Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK 2010-10-25 17:24:00 -04: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
smp.c Blackfin: SMP: rewrite IPI handling to avoid memory allocation 2011-01-10 07:18:15 -05:00