Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 19:22:12 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 19:22:12 +0000 (12:22 -0700)
commitfb7a0e36532bc231bea8adfb1dddc3961eb38940
tree82cb74383809668d6d92a5124fc60d11b35c8d6e
parent4e93d3e8859c834ee18dfd33051d24df8669d0c0
parent29516d75a0b09e0a0328dd55c98a342515c9615a
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6.git

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