diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:05:15 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:05:15 +0900 |
commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/mach-s5p6440/mach-smdk6440.c | |
parent | 32457942b90aabb9242b450f02d18d9c8d982916 (diff) | |
parent | 7d1a2077a7e519fc0c68617526abea3f72632e60 (diff) | |
download | blackbird-op-linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.tar.gz blackbird-op-linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.zip |
ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2
Conflicts:
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5p6440/mach-smdk6440.c')
0 files changed, 0 insertions, 0 deletions