arch/arm/mach-at91/at91sam9263.c · 56c10bf82c10588b743e75a13a7949e11b9fc942 · KED Software Projects / Miscellaneous / KED Linux Kernel Fork

Something went wrong on our end

13 years ago

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc · a5f17d1f

Olof Johansson authored 13 years ago

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c

a5f17d1f

History

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc

Olof Johansson authored 13 years ago

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c

at91sam9263.c 9.49 KiB