diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 20:15:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 20:15:48 +0100 |
| commit | ab2f75ce55ef6f903348026271e30796f016851f (patch) | |
| tree | 8e019d460e92ee6ac2b2ea54aa0b93770bf933ef /arch/arm/mach-ux500/Kconfig | |
| parent | Merge branch 'ux500/soc' into ux500/dt (diff) | |
| parent | Documentation: add information for new sysfs soc bus functionality (diff) | |
| download | linux-ab2f75ce55ef6f903348026271e30796f016851f.tar.xz linux-ab2f75ce55ef6f903348026271e30796f016851f.zip | |
Merge branch 'depends/driver-core' into ux500/dt
Conflicts:
drivers/base/cpu.c
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
0 files changed, 0 insertions, 0 deletions