summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/menelaus.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 15:30:55 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 15:30:55 +0200
commit29ea35969b92a4be122a58c4aceea8c5e2c388d9 (patch)
tree8285c0e98e7bb03868d390b58180e3cab876a8db /drivers/mfd/menelaus.c
parent112d17d6f75b93e1dcaec2e2232a411148b3bf71 (diff)
parentb4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff)
downloadtalos-obmc-linux-29ea35969b92a4be122a58c4aceea8c5e2c388d9.tar.gz
talos-obmc-linux-29ea35969b92a4be122a58c4aceea8c5e2c388d9.zip
Merge branch 'imx/devel' into next/devel
Diffstat (limited to 'drivers/mfd/menelaus.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud