summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-10 12:00:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-10 12:00:53 -0700
commit54b333529df25b21da462c7dcc16c7dc779d9f26 (patch)
treeb77d01cef2e259e30a7ce7570d5afb595dada172 /init/Kconfig
parent675badfc48079e94adc55d6bb3557ea6e67bd831 (diff)
parent780914c3cf691a75a0b7fe89f4466eeff8058165 (diff)
downloadop-kernel-dev-54b333529df25b21da462c7dcc16c7dc779d9f26.zip
op-kernel-dev-54b333529df25b21da462c7dcc16c7dc779d9f26.tar.gz
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (28 commits) MIPS: Alchemy: fix xxs1500 build error MIPS: Invalidate old TLB mappings when updating huge page PTEs. MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb MIPS: JZ4740: Set one-shot feature flag for the clockevent MIPS: JZ4740: Export symbols to the watchdog driver module MIPS: JZ4740: Fix GCC 4.6.0 build error. MIPS: Audit: Fix success success argument pass to audit_syscall_exit MIPS: Fix calc_vmlinuz_load_addr build warnings. MIPS: Alchemy: Fix GCC 4.6.0 build error. MIPS: Document former use of timerfd(2) syscall number. MIPS: IP27: Fix GCC 4.6.0 build error. MIPS: IP27: Fix GCC 4.6.0 build error. MIPS: bcm63xx: Fix header_crc comment in bcm963xx_tag.h MIPS: Octeon: Guard the Kconfig body with CPU_CAVIUM_OCTEON MIPS: Octeon: Cleanup Kconfig IRQ_CPU* symbols. MIPS: Rename .data..mostly and properly handle it in linker script MIPS: MSP: Fix build error MIPS: MSP71xx: Fix typo in msp_per_irq_controller MIPS: Loongson: Fix GCC 2.6.0 build error. MIPS: Jazz: Fix GCC 4.6.0 build error ...
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud