summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/mmzone_32.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-12-13 07:35:10 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-12-13 07:35:10 +0100
commitc43328e890b9e3a4ab8e8cb1020a8b1e9fda9ed1 (patch)
tree65568ea349767c2b74decefaad3f930b17e8afb7 /arch/x86/include/asm/mmzone_32.h
parentMerge branch 'sh/urgent' into sh-latest (diff)
parentsh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers. (diff)
parentsh: mach-rsk: Add polled GPIO buttons support for RSK+7203. (diff)
downloadlinux-c43328e890b9e3a4ab8e8cb1020a8b1e9fda9ed1.tar.xz
linux-c43328e890b9e3a4ab8e8cb1020a8b1e9fda9ed1.zip
Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latest