summaryrefslogtreecommitdiffstats
path: root/drivers/ipack
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2017-11-14 10:36:09 +0530
committerVinod Koul <vinod.koul@intel.com>2017-11-14 10:36:09 +0530
commit135ab7f53cfb77bd0b215b68eed006c7825ea01e (patch)
tree64ecce9f31a7b88f16851d9deaf04af0d8611205 /drivers/ipack
parent9c6027133626efd773fa84478c5d8c9209df41f6 (diff)
parent9b3b8171f7f4ecbbc28f3c1ae60462826a5d9072 (diff)
downloadlinux-stable-135ab7f53cfb77bd0b215b68eed006c7825ea01e.tar.gz
linux-stable-135ab7f53cfb77bd0b215b68eed006c7825ea01e.tar.bz2
linux-stable-135ab7f53cfb77bd0b215b68eed006c7825ea01e.zip
Merge branch 'topic/sprd' into for-linus
Kconfig and Makefile conflicts so put them in right order (sprd ones after stm ones) Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/ipack')
0 files changed, 0 insertions, 0 deletions