diff options
| author | Kevin Hilman | 2010-10-21 20:21:55 +0200 |
|---|---|---|
| committer | Kevin Hilman | 2010-10-21 20:21:55 +0200 |
| commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
| tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /init | |
| parent | arm: remove machine_desc.io_pg_offst and .phys_io (diff) | |
| parent | davinci: mityomapl138: make file local data static (diff) | |
| download | kernel-qcow2-linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.tar.gz kernel-qcow2-linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.tar.xz kernel-qcow2-linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.zip | |
Merge branch 'davinci-next' into davinci-for-linus
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions