Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Linus Torvalds [Wed, 22 Jun 2005 19:22:12 +0000 (12:22 -0700)]
Do arch/ia64/defconfig by hand.

1  2 
arch/ia64/Kconfig
arch/ia64/defconfig

Simple merge
@@@ -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