summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd/stmpe.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 15:09:49 +0800
committerMark Brown <broonie@kernel.org>2015-02-09 15:09:49 +0800
commit0cee4db21e856d20aaa6624d0ff6a5f7d8aeea65 (patch)
tree09c57714caf0d7628430d96cd1f269d83f45c556 /include/linux/mfd/stmpe.h
parentb34510b70d2a703fcc7fc018380af73e5f448f7f (diff)
parentf8d71be5553a3fbc20363243ecfc11dcdd1e18fe (diff)
parent20cf2603b122bf71fb54def1de6a2ad73d5ddb0b (diff)
parent279e17ae81c17b40ae7a6c9e10f386a7aac7aa55 (diff)
parent28d1ad09c50c758d3e295fa7ff90a4712e1254ea (diff)
parent3463667aa171ed5359d63a6195e65d457aa6eb2f (diff)
parentfddcd300732dad5b822d27de7aa78998dca43162 (diff)
parent58cc9c9a175885bbf6bae3acf18233d0a8229a84 (diff)
parentb0402717c987c7e1150ae7ad800a9eb75664012f (diff)
parent0b65ba9981d8fe80fd099f26dd96c60e07729aeb (diff)
parent8a6cf30bf93df2c0f2637156e4a5070594bddebf (diff)
downloadblackbird-op-linux-0cee4db21e856d20aaa6624d0ff6a5f7d8aeea65.tar.gz
blackbird-op-linux-0cee4db21e856d20aaa6624d0ff6a5f7d8aeea65.zip
Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel', 'asoc/fix/rt286', 'asoc/fix/rt5640', 'asoc/fix/samsung', 'asoc/fix/sgtl5000', 'asoc/fix/sta32x', 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8731' into asoc-linus
OpenPOWER on IntegriCloud