diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:50:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:50:43 +0100 |
| commit | a852cbfaaf8122827602027b1614971cfd832304 (patch) | |
| tree | 1878756f936963822ed2d51a15db1da5814973e7 /drivers/block/floppy.c | |
| parent | 0d3a9cf5ab041c15691fd03dab3af0841af63606 (diff) | |
| parent | ecda06289f8202d4c6beb235f59ea464f4a91209 (diff) | |
| parent | 9f331119a4f95a44d918fe6d5e85998fabf99b72 (diff) | |
| parent | bda3a89745d7bb88d3e735046c0cdc3d0eb2ac24 (diff) | |
| parent | b319eed0aa0a6d710887350a3cb734c572aa64c4 (diff) | |
| parent | a967bb3fbe640056bacb0357722f51676bb06e3c (diff) | |
| parent | 954a8b8162ecab1d5ddf6c5b993b2d4da3fcaef7 (diff) | |
Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core