Merge branch 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 16 Oct 2007 23:48:59 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 16 Oct 2007 23:48:59 +0000 (16:48 -0700)
commitce4b61f5e2fab568f90adf79642cbfc49aac5bba
tree51155f2bacade594b1cb6731f334263a91e1fc68
parente95206ab2c8cd6ea11318a5fe96b4ace534be750
parent4d1efed540df1ccd3077df6f2bffba9d506b7d7b
Merge branch 'release' of ssh:///linux/kernel/git/aegl/linux-2.6

* 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix build for CONFIG_SMP=n