| commit | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Feb 07 15:04:15 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Feb 07 15:05:20 2012 -0800 |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 [diff] | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab [diff] |
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc 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