diff options
| author | Olof Johansson <olof@lixom.net> | 2012-07-01 00:21:00 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-07-01 00:21:00 +0200 |
| commit | e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea (patch) | |
| tree | c8460317d779232a169546d2b8278b89e406fc29 /arch/arm/mach-imx/clk-imx6q.c | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/... (diff) | |
| parent | ARM: OMAP4470: Fix OMAP4470 boot failure (diff) | |
| download | linux-e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea.tar.xz linux-e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea.zip | |
Merge tag 'omap-fixes-for-v3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
"Here's one more regression fix that I missed earlier, and a
trivial fix to get omap4470 booting."
* tag 'omap-fixes-for-v3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4470: Fix OMAP4470 boot failure
ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions