summaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-14 23:24:42 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-14 23:24:42 +0200
commitb6825d2df55aa7d7341c715b577b73a6a03dc944 (patch)
treeae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /arch/mips/Kconfig
parentMerge branch 'for-rmk' of git://git.marvell.com/orion (diff)
parent[ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict (diff)
downloadlinux-b6825d2df55aa7d7341c715b577b73a6a03dc944.tar.xz
linux-b6825d2df55aa7d7341c715b577b73a6a03dc944.zip
Merge branch 'omap-all' into devel
Conflicts: arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/irq.c
Diffstat (limited to 'arch/mips/Kconfig')
0 files changed, 0 insertions, 0 deletions