summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-26 23:19:31 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-26 23:19:31 +0400
commit0877aa3908aaeeae8fc2850691668c4315d3db56 (patch)
treebdb4ee1c1939dfb7a3d2ca10db4b1bbd6eac26e9 /drivers/input
parent786f02b719f2285e2c0350b6a04dab4a1a0871a1 (diff)
parent4a230408e83698a3d7ff0a9988a58675c2c92cb9 (diff)
downloadlinux-0877aa3908aaeeae8fc2850691668c4315d3db56.tar.xz
Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc defconfig updates from Olof Johansson: "For the first time, we have one branch that collects just updates to defconfig files, mostly for adapting to changes in other subsystems." * tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: PRIMA2: add prima2_defconfig for CSR SiRFprimaII ARM: tegra: update defconfig ARM: tegra: update defconfig ARM: imx_v6_v7_defconfig: Add SPI NOR support ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions