summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-13 09:15:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-13 09:15:55 -0700
commit85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6 (patch)
tree02b1115ecf8c8ca438e50e34458b8005b04d8b42 /arch/cris/arch-v32/kernel
parent66bbf58b55619061b110460ee1c5485137fdf0e0 (diff)
parent21a8d026e0721f90ae03084e96a215632c80fc13 (diff)
downloadlinux-85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6.tar.bz2
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: x86 platform drivers: Build fix for intel_pmic_gpio
Diffstat (limited to 'arch/cris/arch-v32/kernel')
0 files changed, 0 insertions, 0 deletions