diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 20:02:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 20:02:14 -0500 |
| commit | 8d99641f6c1af806cd5d9e6badce91910219a161 (patch) | |
| tree | ee841f807005a4a6234f6f502a13185d13a34870 /arch/arm/configs/bcmring_defconfig | |
| parent | fc887b15d935ead2a00aef5779a18034e7c69ee1 (diff) | |
| parent | 225c8e010f2d17a62aef131e24c6e7c111f36f9b (diff) | |
Merge branch 'akpm'
* akpm:
kernel/smp.c: consolidate writes in smp_call_function_interrupt()
kernel/smp.c: fix smp_call_function_many() SMP race
memcg: correctly order reading PCG_USED and pc->mem_cgroup
backlight: fix 88pm860x_bl macro collision
drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
MAINTAINERS: update Atmel AT91 entry
mm: fix truncate_setsize() comment
memcg: fix rmdir, force_empty with THP
memcg: fix LRU accounting with THP
memcg: fix USED bit handling at uncharge in THP
memcg: modify accounting function for supporting THP better
fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
mm: compaction: prevent division-by-zero during user-requested compaction
mm/vmscan.c: remove duplicate include of compaction.h
memblock: fix memblock_is_region_memory()
thp: keep highpte mapped until it is no longer needed
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
Diffstat (limited to 'arch/arm/configs/bcmring_defconfig')
| -rw-r--r-- | arch/arm/configs/bcmring_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/bcmring_defconfig b/arch/arm/configs/bcmring_defconfig index 75984cd1e233..795374d48f81 100644 --- a/arch/arm/configs/bcmring_defconfig +++ b/arch/arm/configs/bcmring_defconfig | |||
| @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y | |||
| 2 | # CONFIG_LOCALVERSION_AUTO is not set | 2 | # CONFIG_LOCALVERSION_AUTO is not set |
| 3 | # CONFIG_SWAP is not set | 3 | # CONFIG_SWAP is not set |
| 4 | CONFIG_SYSVIPC=y | 4 | CONFIG_SYSVIPC=y |
| 5 | CONFIG_EMBEDDED=y | 5 | CONFIG_EXPERT=y |
| 6 | CONFIG_KALLSYMS_EXTRA_PASS=y | 6 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 7 | # CONFIG_HOTPLUG is not set | 7 | # CONFIG_HOTPLUG is not set |
| 8 | # CONFIG_ELF_CORE is not set | 8 | # CONFIG_ELF_CORE is not set |