Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 9 Feb 2006 01:06:51 +0000 (17:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 9 Feb 2006 01:06:51 +0000 (17:06 -0800)
commit0bdd340c092b0936f78a54bdbd3927463ed4fca3
treed9215d382cdc4c2dc6366a2c551079590e8b8216
parent9908104935325bd6beba67d637b6f5396d47075c
parentf478af9dc58c01880832a321c3eea7703772c420
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6
arch/ia64/sn/kernel/setup.c