diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-31 20:03:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-31 20:03:50 -0500 |
| commit | d5b9b787b5e1618dfe82a2c2a6972374e85b02db (patch) | |
| tree | 42fa7b4e4381e40fc94ae41fd932f9b7b1abece6 /drivers/ata/sata_sis.c | |
| parent | 16b7b2ac0148e839da86af8747b6fa4aad43a9b7 (diff) | |
| parent | 024e4f2c5175a482c234cf67ed22368d770bf78f (diff) | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Correct definition of handle_IPI
[IA64] move SAL_CACHE_FLUSH check later in boot
[IA64] MCA recovery: Montecito support
[IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI
[IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access
Diffstat (limited to 'drivers/ata/sata_sis.c')
0 files changed, 0 insertions, 0 deletions