Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig
Showing
arch/arm/mach-s5pc100/dma.c
0 → 100644
arch/arm/plat-s5p/irq-eint.c
0 → 100644
Please register or sign in to comment