diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:51:40 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:51:40 +0900 |
| commit | 6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (patch) | |
| tree | 6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d /Documentation/keys.txt | |
| parent | a2f7bffa29f18266bc7b55a2b47a5fa1274ed53f (diff) | |
| parent | 5b7d7b22dc8469fbe1ca10b2adeabb70639bde01 (diff) | |
ARM: Merge for-2635-4/watchdog
Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6440/include/mach/map.h
arch/arm/mach-s5p6440/mach-smdk6440.c
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/mach-s5pv210/mach-smdkv210.c
Diffstat (limited to 'Documentation/keys.txt')
0 files changed, 0 insertions, 0 deletions