alistair23-linux/arch/blackfin/mach-bf537/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
..
anomaly.h Blackfin: update anomaly lists to latest public info 2010-08-06 12:55:46 -04:00
bf537.h Blackfin: BF537: push down error masks to avoid namespace pollution 2009-12-15 00:16:11 -05:00
bfin_serial.h Blackfin: bfin_serial.h: unify heavily duplicated serial code 2011-01-10 07:18:02 -05:00
bfin_serial_5xx.h Blackfin: bfin_serial.h: unify heavily duplicated serial code 2011-01-10 07:18:02 -05:00
blackfin.h Blackfin: clean up mach header includes 2011-01-10 07:18:08 -05:00
cdefBF534.h Blackfin: drop asm/irq.h include from mach headers 2011-01-10 07:18:10 -05:00
cdefBF537.h Blackfin: clean up mach header includes 2011-01-10 07:18:08 -05:00
defBF534.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
defBF537.h Blackfin: clean up mach header includes 2011-01-10 07:18:08 -05:00
dma.h Blackfin arch: cleanup - use scm for changelog, not file headers 2009-01-07 23:14:38 +08:00
gpio.h Blackfin: push gpio (port) defines into common headers 2011-01-10 07:18:06 -05:00
irq.h Blackfin: fix typo in BF537 IRQ comment 2010-05-22 14:19:14 -04:00
mem_map.h Blackfin: unify memory map headers 2009-06-22 21:16:07 -04:00
pll.h Blackfin: unify pll.h headers 2011-01-10 07:18:16 -05:00
portmux.h Blackfin: gpio/portmux: clean up whitespace corruption 2010-08-06 12:55:51 -04:00