diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-19 01:30:49 (GMT) |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-19 01:30:49 (GMT) |
| commit | c9312209aa9fdef05b03d63bbead63bb720fd133 (patch) | |
| tree | 6704773403e34969a27f177bef22e4125378a3df /drivers/net/plip.c | |
| parent | d5663e7a404ae97888bb8e7a7376de3fb0878ddd (diff) | |
| parent | 2213d0c0bae510df3860a48e107a5ba17ac72e99 (diff) | |
| download | linux-c9312209aa9fdef05b03d63bbead63bb720fd133.tar.xz | |
Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s5p64x0/clock-s5p6440.c
arch/arm/mach-s5p64x0/clock-s5p6450.c
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pv210/clock.c
Diffstat (limited to 'drivers/net/plip.c')
0 files changed, 0 insertions, 0 deletions