summaryrefslogtreecommitdiff
path: root/die.h
diff options
context:
space:
mode:
Diffstat (limited to 'die.h')
0 files changed, 0 insertions, 0 deletions
id'>48bc03e5411eb0fd006e54ba62ca77a6dfe5c68d (diff)parent35bee33355db8347d5f84caef9d2ddde200b8ba6 (diff)
Merge tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/defconfig
Merge "Ux500 defconfig update for v4.7" from Linus Walleij: - Remove the unused MACH_UX500_DT option from the multi_v7 defconfig - Remove staging driver from u8500_defconfig - Update sensor support in u8500_defconfig * tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: u8500_defconfig: update sensor config ARM: u8500_defconfig: remove staging from defconfig ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
Diffstat