diff options
| author | Olof Johansson <[email protected]> | 2012-02-07 23:04:15 +0000 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2012-02-07 23:05:20 +0000 |
| commit | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /fs/jbd2/commit.c | |
| parent | Merge branch 'amba' into for-armsoc (diff) | |
| parent | Linux 3.3-rc2 (diff) | |
| download | kernel-a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13.tar.gz kernel-a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13.zip | |
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
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions