commit | a8b59e79ed55de97949ff1ca7d933786b95b39bd | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Mar 31 21:31:40 2006 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Mar 31 21:31:40 2006 -0800 |
tree | bdb9bfca39e01954d8416e2a49f59d040d1b1777 | |
parent | 547a77ae62091449e23b64a75b9c69e373613608 [diff] | |
parent | 2ab9391dea6e36fed13443c29bf97d3be05f5289 [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * '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