diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 11:06:53 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 11:06:53 +0200 |
| commit | 4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793 (patch) | |
| tree | 3932656b422e63e3d3fc4629a57a1a8b7f03ef42 /arch/arm/mach-shmobile/board-bockw.c | |
| parent | ARM: shmobile: r8a7779: Remove '0x's from R8A7779 DTS file (diff) | |
| parent | ARM: shmobile: r8a7740: Add TPU node to the device tree (diff) | |
| download | linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.tar.xz linux-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.zip | |
Merge branch 'dt2' into cleanup3-base
Conflicts:
arch/arm/mach-shmobile/Makefile.boot
Diffstat (limited to 'arch/arm/mach-shmobile/board-bockw.c')
0 files changed, 0 insertions, 0 deletions