summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/compat.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-20 02:39:55 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-20 02:39:55 +0100
commitce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc (patch)
tree5ab56a65bd6b52ae690b16d395c4d15599f43c7c /arch/s390/include/asm/compat.h
parentregulator: remove use of __devinit (diff)
parentmfd: tps6586x: move regulator dt parsing to regulator driver (diff)
downloadlinux-ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc.tar.xz
linux-ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc.zip
Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-hotplug
Conflicts: drivers/regulator/tps6586x-regulator.c
Diffstat (limited to 'arch/s390/include/asm/compat.h')
0 files changed, 0 insertions, 0 deletions