linux-kernel-test/arch/powerpc/platforms/52xx
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
..
efika.c powerpc/5200: efika.c: Add of_node_put to avoid memory leak 2010-09-08 11:45:24 -06:00
Kconfig powerpc/5200: add LocalPlus bus FIFO device driver 2009-11-04 16:42:47 -07:00
lite5200_pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
lite5200_sleep.S [POWERPC] MPC5200 low power mode 2007-09-19 15:25:34 +10:00
lite5200.c of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
Makefile powerpc/5200: add LocalPlus bus FIFO device driver 2009-11-04 16:42:47 -07:00
media5200.c of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
mpc52xx_common.c powerpc/5200: tighten up ac97 reset timing 2010-09-08 11:55:26 -06:00
mpc52xx_gpio.c powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
mpc52xx_gpt.c powerpc/mpc5200: include fs.h in mpc52xx_gpt.c 2010-12-23 12:08:02 -07:00
mpc52xx_lpbfifo.c powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
mpc52xx_pci.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
mpc52xx_pic.c powerpc: Make "intspec" pointers in irq_host->xlate() const 2009-12-09 17:10:37 +11:00
mpc52xx_pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
mpc52xx_sleep.S
mpc5200_simple.c of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00