diff options
author | 2012-03-07 03:34:41 -0800 | |
---|---|---|
committer | 2012-03-07 03:34:41 -0800 | |
commit | 60571f98d292b74586ff8330d8bc965eb01e8df0 (patch) | |
tree | 8d4f14f4a99b8b465828a314620f3b3aa030713f /arch/um/kernel/process.c | |
parent | Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff) | |
parent | ARM: SAMSUNG: use static declaration when it is not used in other files (diff) | |
download | wireguard-linux-60571f98d292b74586ff8330d8bc965eb01e8df0.tar.xz wireguard-linux-60571f98d292b74586ff8330d8bc965eb01e8df0.zip |
Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static
Conflicts:
arch/arm/mach-exynos/dma.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5pc100/dma.c
arch/arm/mach-s5pv210/dma.c
Diffstat (limited to 'arch/um/kernel/process.c')
0 files changed, 0 insertions, 0 deletions