diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:03:21 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:04:25 -0400 |
| commit | ffe315012510165ce82e4dd4767f0a5dba9edbf7 (patch) | |
| tree | f601cd980af9d0ced5ca9aedecef4fa0d2ca0e15 /tools/testing/ktest/examples/include/defaults.conf | |
| parent | e2d3a35ee427aaba99b6c68a56609ce276c51270 (diff) | |
| parent | 4a8e43feeac7996b8de2d5b2823e316917493df4 (diff) | |
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
Diffstat (limited to 'tools/testing/ktest/examples/include/defaults.conf')
| -rw-r--r-- | tools/testing/ktest/examples/include/defaults.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/examples/include/defaults.conf b/tools/testing/ktest/examples/include/defaults.conf index 323a552ce642..63a1a83f4f0b 100644 --- a/tools/testing/ktest/examples/include/defaults.conf +++ b/tools/testing/ktest/examples/include/defaults.conf | |||
| @@ -33,7 +33,7 @@ DEFAULTS | |||
| 33 | THIS_DIR := ${PWD} | 33 | THIS_DIR := ${PWD} |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | # to orginize your configs, having each machine save their configs | 36 | # to organize your configs, having each machine save their configs |
| 37 | # into a separate directly is useful. | 37 | # into a separate directly is useful. |
| 38 | CONFIG_DIR := ${THIS_DIR}/configs/${MACHINE} | 38 | CONFIG_DIR := ${THIS_DIR}/configs/${MACHINE} |
| 39 | 39 | ||