Merge branch 'late/kirkwood' into late/soc (54d69df5) · Commits · Clea OS / bsp / nxp / linux-seco-imx

Commit 54d69df5 authored 12 years ago by Olof Johansson

Merge branch 'late/kirkwood' into late/soc


Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>

parents ad932bb6 46f2007c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 1040 additions and 62 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment