| commit | e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Jun 30 15:21:00 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sat Jun 30 15:21:00 2012 -0700 |
| tree | c8460317d779232a169546d2b8278b89e406fc29 | |
| parent | acf6a7ecbddfc84c66408ac549509d97c2ab4f8a [diff] | |
| parent | e90b833ee1aae64b6fca2455001323ffe29e1698 [diff] |
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