diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 22:43:45 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 22:43:45 +0100 |
commit | 604a16b74c8ca2fd29861723a62ad57f0c692333 (patch) | |
tree | 4f90ac336c6811aa5a3088a626012b707b824746 /kernel/configs.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
parent | Merge branch 'fixes-hwmod-regression' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
download | linux-604a16b74c8ca2fd29861723a62ad57f0c692333.tar.xz linux-604a16b74c8ca2fd29861723a62ad57f0c692333.zip |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: plat-orion: make gpiochip label unique
enable uncompress log on cpuimx35sd
cpuimx35: fix touchscreen support
cpuimx35sd: fix Kconfig
clock-imx35: fix reboot in internal boot mode
dma: MX3_IPU fix depends
imx_v4_v5_defconfig: update default configuration
cpuimx25sd: fix Kconfig
arm/imx: fix cpufreq section mismatch
ARM:imx:fix pwm period value
ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3
Diffstat (limited to 'kernel/configs.c')
0 files changed, 0 insertions, 0 deletions