| commit | 0e5e24bf64b755a034d8294303bc61d8f40ebeaf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Apr 13 20:30:58 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Apr 13 20:30:58 2006 -0700 |
| tree | d90d974b18b674980496d28cecf47cff2564e5a8 | |
| parent | 20ac94378de59d61dc39f10ed5530485e4ac8c07 [diff] | |
| parent | ace1d816a13ff42d4f41989862552032f9c19853 [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] Make show_mem() skip holes in a pgdat [IA64] ia64_wait_for_slaves() incorrectly reports MCA