diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-23 12:22:16 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 13:27:32 -0500 |
| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch) | |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 /arch/m32r/configs/mappi.up_defconfig | |
| parent | 5a9a8d1a99c617df82339456fbdd30d6ed3a856b (diff) | |
| parent | d315777b32a4696feb86f2a0c9e9f39c94683649 (diff) | |
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'arch/m32r/configs/mappi.up_defconfig')
| -rw-r--r-- | arch/m32r/configs/mappi.up_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/configs/mappi.up_defconfig b/arch/m32r/configs/mappi.up_defconfig index 3726068721a5..cb11384386ce 100644 --- a/arch/m32r/configs/mappi.up_defconfig +++ b/arch/m32r/configs/mappi.up_defconfig | |||
| @@ -5,7 +5,7 @@ CONFIG_IKCONFIG_PROC=y | |||
| 5 | CONFIG_LOG_BUF_SHIFT=14 | 5 | CONFIG_LOG_BUF_SHIFT=14 |
| 6 | CONFIG_BLK_DEV_INITRD=y | 6 | CONFIG_BLK_DEV_INITRD=y |
| 7 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 7 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 8 | CONFIG_EMBEDDED=y | 8 | CONFIG_EXPERT=y |
| 9 | # CONFIG_KALLSYMS is not set | 9 | # CONFIG_KALLSYMS is not set |
| 10 | # CONFIG_FUTEX is not set | 10 | # CONFIG_FUTEX is not set |
| 11 | # CONFIG_EPOLL is not set | 11 | # CONFIG_EPOLL is not set |