kernel_optimize_test/arch/powerpc/platforms
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
..
8xx powerpc/8xx: Add support for the MPC8xx based boards from TQC 2010-08-04 14:25:22 -05:00
40x of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
44x powerpc/4xx: Add suspend and idle support 2010-11-29 10:05:06 -05:00
52xx Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
82xx powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
83xx Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
85xx Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
86xx Merge commit 'v2.6.35-rc6' into devicetree/next 2010-07-24 09:49:13 -06:00
512x of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
amigaone of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
cell Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-01-11 16:31:41 -08:00
chrp powerpc/nvram: Move things out of asm/nvram.h 2010-11-30 15:09:19 +11:00
embedded6xx powerpc, memblock: Fix memblock API change fallout 2010-09-11 10:30:28 +02:00
iseries powerpc/iseries: Remove unused mf_getSrcHistory function and caller. 2010-11-29 15:48:21 +11:00
maple powerpc/maple: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
pasemi powerpc/pasemi: Clean up pasemi iommu table initializations 2010-11-29 15:48:20 +11:00
powermac powerpc/powermac: Make auto-loading of therm_pm72 possible 2010-12-09 15:36:30 +11:00
prep powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
ps3 tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
pseries Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
fsl_uli1575.c PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs 2010-02-23 09:43:31 -08:00
Kconfig Merge v2.6.37-rc8 into powerpc/next 2010-12-29 22:21:47 -07:00
Kconfig.cputype powerpc/fsl-booke: Add support for FSL 64-bit e5500 core 2010-10-14 00:55:03 -05:00
Makefile powerpc/85xx: Kconfig cleanup 2009-11-20 16:45:27 -06:00