WSL2-Linux-Kernel/arch/powerpc/platforms/pseries
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
..
Kconfig powerpc: Add support for new hcall H_BEST_ENERGY 2010-11-29 15:48:19 +11:00
Makefile powerpc: Add support for new hcall H_BEST_ENERGY 2010-11-29 15:48:19 +11:00
cmm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dlpar.c powerpc/pseries: Use kmemdup 2010-10-13 16:19:22 +11:00
dtl.c powerpc/pseries: Re-enable dispatch trace log userspace interface 2010-09-02 14:07:32 +10:00
eeh.c powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG 2010-11-18 14:54:22 +11:00
eeh_cache.c powerpc/pseries/eeh: Use for_each_pci_dev() 2010-07-09 11:28:25 +10:00
eeh_driver.c powerpc/eeh: Fix a bug when pci structure is null 2010-02-17 14:02:47 +11:00
eeh_event.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
eeh_sysfs.c headers: kobject.h redux 2011-01-10 08:51:44 -08:00
event_sources.c powerpc/pseries: Add WARN_ON() to request_event_sources_irqs() on irq allocation/request failure 2010-07-09 11:28:32 +10:00
firmware.c powerpc: Add VPHN firmware feature 2010-11-29 15:48:22 +11:00
hotplug-cpu.c powerpc/pseries: Increase cpu die timeout 2010-07-31 15:04:15 +10:00
hotplug-memory.c powerpc: Fix erroneous lmb->memblock conversions 2010-07-23 12:56:57 +10:00
hvCall.S powerpc: Remove second definition of STACK_FRAME_OVERHEAD 2010-11-29 15:48:23 +11:00
hvCall_inst.c powerpc: remove cast from void* 2010-11-03 10:23:26 -04:00
hvconsole.c
hvcserver.c
iommu.c powerpc/pseries: Pass phb only to iommu_table_setparms_lpar 2010-12-09 15:24:01 +11:00
kexec.c
lpar.c powerpc/pseries: Add kernel parameter to disable batched hcalls 2010-11-29 15:48:18 +11:00
mobility.c powerpc/pseries: Partition migration in the kernel 2010-10-13 16:19:03 +11:00
msi.c powerpc/pci: Fix regression in powerpc MSI-X 2009-11-05 17:06:27 +11:00
nvram.c powerpc/nvram: Rename ppc64,linux partition to ibm,rtas-log 2010-11-30 15:38:50 +11:00
offline_states.h powerpc: Reset kernel stack on cpu online from cede state 2010-03-09 11:57:10 +11:00
pci.c
pci_dlpar.c powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG 2010-11-18 14:54:22 +11:00
phyp_dump.c lmb: rename to memblock 2010-07-14 17:14:00 +10:00
plpar_wrappers.h powerpc/pseries: Add hcall to read 4 ptes at a time in real mode 2010-05-21 17:31:10 +10:00
power.c
pseries.h powerpc/pseries: Export device tree updating routines 2010-10-13 16:19:02 +11:00
pseries_energy.c powerpc: Add support for new hcall H_BEST_ENERGY 2010-11-29 15:48:19 +11:00
ras.c powerpc/pseries: Rename RAS_VECTOR_OFFSET to RTAS_VECTOR_EXTERNAL_INTERRUPT and move to rtas.h 2010-07-09 11:28:31 +10:00
reconfig.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
scanlog.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
setup.c powerpc: Account time using timebase rather than PURR 2010-09-02 14:07:31 +10:00
smp.c powerpc: Correct smt_enabled=X boot option for > 2 threads per core 2010-08-24 15:26:30 +10:00
suspend.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
xics.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2010-10-21 21:19:54 -07:00
xics.h