aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/assembler.h
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2012-02-14 23:26:42 +0000
committerLinus Torvalds <[email protected]>2012-02-14 23:26:42 +0000
commit7ada1dd62804ca9ce1cb8666c6e563cd92fa50c1 (patch)
tree210489b69f5db64fb0450a310ce9f8762121a66f /arch/arm/include/asm/assembler.h
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
parentregulator: Fix getting voltage in max8649_enable_time() (diff)
downloadkernel-7ada1dd62804ca9ce1cb8666c6e563cd92fa50c1.tar.gz
kernel-7ada1dd62804ca9ce1cb8666c6e563cd92fa50c1.zip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
One small bug fix from Axel plus a fix for a build failure in unrealistic but commonly built configs which for some reason manage to survive for an awfully long time in -next without any reports. * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: Fix getting voltage in max8649_enable_time() regulator: Fix mc13xxx regulator modular build (again)
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
0 files changed, 0 insertions, 0 deletions