summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-20 18:41:21 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-20 18:41:21 +0200
commit61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5 (patch)
tree498e16a152f033641a653f7969a0083399c6dca7 /arch/arm/include/asm
parentMerge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/... (diff)
parentpinctrl/nomadik: document Alt-C glitch (diff)
downloadlinux-61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5.tar.xz
linux-61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5.zip
Merge tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull two pinctrl fixes from Linus Walleij: - Fixed a 2-line compile error for MXS - A pure documentation fix for Nomadik * tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl/nomadik: document Alt-C glitch pinctrl: mxs: Use kfree to fix build error
Diffstat (limited to 'arch/arm/include/asm')
0 files changed, 0 insertions, 0 deletions