Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Aug 2006 19:25:24 +0000 (12:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Aug 2006 19:25:24 +0000 (12:25 -0700)
commitf5d635f649607b09b0b4620d25d028fd2b1b7ea5
tree39e5232b1b2d8b15abe81699b2ef69a80eb1e143
parent3b445eeac4f292aeb14df50b272729d0924da937
parenteca7994f60eb6550d9e9b36d3b641a5a0e18a7c1
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] make uncached allocator more node aware