diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:30:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:30:03 -0700 |
| commit | 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 (patch) | |
| tree | 14d451f638805a4db17d6cf38d5003220b1314df /drivers/ide/ide-io.c | |
| parent | 0d1782144e81faf6203075c5fcd0a2f0db91af5b (diff) | |
| parent | 0f1482fdd7e5efc473335b92f350027b8f1519fb (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix lh7a40x_udc.c
[ARM] Fix warning in consistent.c
[ARM] Fix warnings in arch/arm/kernel/setup.c
[ARM] Fix ecard.c resource warnings.
[ARM] Fix ISA IRQ resources
[ARM] Fix bad asm instruction in proc-arm925.S
[ARM] More missing proc-macros.S includes
[ARM] 3708/2: fix SMP build after section ioremap changes
Diffstat (limited to 'drivers/ide/ide-io.c')
0 files changed, 0 insertions, 0 deletions