diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
| commit | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (patch) | |
| tree | 7d729e347d8860c9ef5631cb8cdfa96e892f86d5 /drivers/mfd/Kconfig | |
| parent | a990cbd887585a1056b927b3b20de325f14fdf96 (diff) | |
| parent | 3d64b4496f5fd90618106555344205a522178c0c (diff) | |
Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/mfd/Kconfig')
0 files changed, 0 insertions, 0 deletions