From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 22 Jun 2005 19:22:12 +0000 (-0700)
Subject: Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
X-Git-Tag: v2.6.13-rc4~130^2~159
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fb7a0e36532bc231bea8adfb1dddc3961eb38940;p=~emulex%2Finfiniband.git

Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

Do arch/ia64/defconfig by hand.
---

fb7a0e36532bc231bea8adfb1dddc3961eb38940
diff --cc arch/ia64/defconfig
index 9997ef45ab2,2aea0f9e6e1..7be8096e056
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@@ -638,7 -657,7 +657,8 @@@ CONFIG_SERIAL_8250_SHARE_IRQ=
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
  CONFIG_SERIAL_SGI_L1_CONSOLE=y
 +CONFIG_SERIAL_SGI_IOC4=y
+ # CONFIG_SERIAL_JSM is not set
  CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256