diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 20:36:35 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 20:36:35 +0300 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /samples | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
| download | linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index e4be84ac3d38..8924f72f0629 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -1,5 +1,3 @@ -# samples/Kconfig - menuconfig SAMPLES bool "Sample kernel code" help @@ -47,4 +45,3 @@ config SAMPLE_HW_BREAKPOINT This builds kernel hardware breakpoint example modules. endif # SAMPLES - |