diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-01 14:43:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-01 14:43:57 -0700 |
| commit | 2e175a90047a2dbc76fde169c990164895b25dfc (patch) | |
| tree | ddff26c8c44a4cb10594753785f7c8ee03000861 /fs/proc/root.c | |
| parent | c21b1e4d9b0c263a35f67eed2b025d053566c557 (diff) | |
| parent | 398e692fd5cecdd25d311b47bbae69f7bac3a3cb (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4298/1: fix memory barriers for DMA coherent and SMP platforms
[ARM] 4295/2: Fix error-handling in pxaficp_ir.c (version 2)
[ARM] Fix __NR_kexec_load
[ARM] Export dma_channel_active()
[ARM] 4296/1: ixp4xx: compile fix
[ARM] 4289/1: AT91: SAM9260 NAND flash timing
Diffstat (limited to 'fs/proc/root.c')
0 files changed, 0 insertions, 0 deletions