summaryrefslogtreecommitdiff
path: root/drivers/mfd/stmpe.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-04-01 16:30:47 (GMT)
committerTony Lindgren <tony@atomide.com>2013-04-01 16:30:47 (GMT)
commit105612489bf59386b46b3f9f034e03f70e57aee6 (patch)
treed6a5d2ba3702a69649ea59c6cb31caadb9941459 /drivers/mfd/stmpe.c
parentd29778a01d5fc4b69ca1e7bc21121536e5c1c31d (diff)
parentecf51648c192377ea2830101b12fc3017bfd2b0c (diff)
downloadlinux-fsl-qoriq-105612489bf59386b46b3f9f034e03f70e57aee6.tar.xz
Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/fixes-non-critical
Diffstat (limited to 'drivers/mfd/stmpe.c')
0 files changed, 0 insertions, 0 deletions