| commit | 873d8898b7f6aeb4f2085381dbc201d68a37d02b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jun 28 15:00:49 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jun 28 15:00:49 2006 -0700 |
| tree | d32bde1302927f2a2b026d4b03fa77598ac8563e | |
| parent | d9a5685436b0dd08a6386a2f9423103cb4689dbc [diff] | |
| parent | d3e5e1a1b4f43bcfa1a34516e233911487c67307 [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-SGI] fix prom revision checks in SN kernel [IA64] tiger_defconfig s/NR_CPUS=4/NR_CPUS=16/ [IA64-SGI] - Pass OS logical cpu number to the SN prom (bios) [IA64] palinfo.c: s/register_cpu_notifier/register_hotcpu_notifier/