Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Apr 2006 05:31:40 +0000 (21:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Apr 2006 05:31:40 +0000 (21:31 -0800)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Avoid "u64 foo : 32;" for gcc3 vs. gcc4 compatibility
  [IA64] Export cpu cache info by sysfs


Trivial merge