From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Apr 2008 22:50:49 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.26-rc1~1125
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a64388d83f6ef08dfff405a9d122e3dbcb6bf38;p=linux-2.6

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
  [POWERPC] Fix compile breakage for 64-bit UP configs
  [POWERPC] Define copy_siginfo_from_user32
  [POWERPC] Add compat handler for PTRACE_GETSIGINFO
  [POWERPC] i2c: Fix build breakage introduced by OF helpers
  [POWERPC] Optimize fls64() on 64-bit processors
  [POWERPC] irqtrace support for 64-bit powerpc
  [POWERPC] Stacktrace support for lockdep
  [POWERPC] Move stackframe definitions to common header
  [POWERPC] Fix device-tree locking vs. interrupts
  [POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
  [POWERPC] Remove unused __max_memory variable
  [POWERPC] Simplify xics direct/lpar irq_host setup
  [POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
  [POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
  [POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
  [POWERPC] Use asm-generic/bitops/find.h in bitops.h
  [POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
  [POWERPC] 85xx: Fix the size of qe muram for MPC8568E
  [POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
  [POWERPC] 86xx: mark functions static, other minor cleanups
  ...
---

9a64388d83f6ef08dfff405a9d122e3dbcb6bf38
diff --cc Documentation/kernel-parameters.txt
index f483960698,4f82c85666..dfb5bef240
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -947,13 -928,10 +947,15 @@@ and is between 256 and 4096 characters
  	kstack=N	[X86-32,X86-64] Print N words from the kernel stack
  			in oops dumps.
  
 +	kgdboc=		[HW] kgdb over consoles.
 +			Requires a tty driver that supports console polling.
 +			(only serial suported for now)
 +			Format: <serial_device>[,baud]
 +
  	l2cr=		[PPC]
  
+ 	l3cr=		[PPC]
+ 
  	lapic		[X86-32,APIC] Enable the local APIC even if BIOS
  			disabled it.