summaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon/setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-08 20:50:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-08 20:50:17 +0200
commit17d8dfcda6ce570ddc4844f490104fed4af215aa (patch)
treefb56667cfc94545a6907d0ba5bf0df4adadd20e7 /arch/mips/cavium-octeon/setup.c
parentMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff)
parentm68k: only use local gpio_request_one if not using GPIOLIB (diff)
downloadlinux-17d8dfcda6ce570ddc4844f490104fed4af215aa.tar.xz
linux-17d8dfcda6ce570ddc4844f490104fed4af215aa.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer: "A single fix for compilation breakage to many of the ColdFire CPU targets" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: only use local gpio_request_one if not using GPIOLIB
Diffstat (limited to 'arch/mips/cavium-octeon/setup.c')
0 files changed, 0 insertions, 0 deletions