aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-17 21:27:28 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-17 21:27:28 +0200
commitbcacff291c96c163da9341b764f0ccdeb97b38ad (patch)
tree04001a760f8567c015ce6dd56ab8aea6fd7dbceb /kernel
parentARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed (diff)
parentMerge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes (diff)
parentARM: pxa168: correct nand pmu setting (diff)
downloadlinux-dev-bcacff291c96c163da9341b764f0ccdeb97b38ad.tar.xz
linux-dev-bcacff291c96c163da9341b764f0ccdeb97b38ad.zip
Merge branches 'at91/fixes', 'imx/fixes' and 'pxa/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/fixes