diff options
| author | Olof Johansson | 2012-09-04 21:05:19 -0700 |
|---|---|---|
| committer | Olof Johansson | 2012-09-04 21:05:19 -0700 |
| commit | 242521e90e3f0a7660699761f7b42f0deaa8ea15 (patch) | |
| tree | 14078c1cf39a7506b9f760018181c2b67ffa7f44 /arch/m68k/apollo | |
| parent | 3fbb96d275989c604b343b9e39aeea50386756e9 (diff) | |
| parent | c1e3c1196be37acaea95803043bc1055ea5131ac (diff) | |
Merge branch 'marco-prepare' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/cleanup
* 'marco-prepare' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
ARM: SIRF: make sirf irqchip driver optional since new SoCs will have GIC
ARM: PRIMA2: adjust Kconfig to support select SoC features
ARM: PRIMA2: use DT_MACHINE_START and convert to generic board
clk: prima2: move from arch/arm/mach to drivers/clk
ARM: PRIMA2: convert to common clk and finish full clk tree
Diffstat (limited to 'arch/m68k/apollo')
0 files changed, 0 insertions, 0 deletions