diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-24 04:11:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-24 04:11:23 -0400 |
| commit | 416dfdcdb894432547ead4fcb9fa6a36b396059e (patch) | |
| tree | 8033fdda07397a59c5fa98c88927040906ce6c1a /firmware/av7110/bootcode.bin.ihex | |
| parent | 56449f437add737a1e5e1cb7e00f63ac8ead1938 (diff) | |
| parent | 091069740304c979f957ceacec39c461d0192158 (diff) | |
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
arch/x86/kernel/ptrace.c
Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'firmware/av7110/bootcode.bin.ihex')
| -rw-r--r-- | firmware/av7110/bootcode.bin.ihex | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/firmware/av7110/bootcode.bin.ihex b/firmware/av7110/bootcode.bin.ihex new file mode 100644 index 000000000000..26a2993e0723 --- /dev/null +++ b/firmware/av7110/bootcode.bin.ihex | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | :10000000EA00000EE1B0F00EE25EF004E25EF00401 | ||
| 2 | :10001000E25EF008E25EF004E25EF004E25EF0040C | ||
| 3 | :100020002C0000240000000C000000002C00003414 | ||
| 4 | :1000300000000000A5A55A5A001F15550000000930 | ||
| 5 | :10004000E59FD07CE59F4074E3A00000E5840000BC | ||
| 6 | :10005000E5840004E59F1070E59F2070E59F306403 | ||
| 7 | :10006000E8B11FE0E8A31FE0E1510002DAFFFFFB67 | ||
| 8 | :10007000E59FF050E1D410B0E35100000AFFFFFC0F | ||
| 9 | :10008000E1A0100DE5943004E1D420B2E282203FDB | ||
| 10 | :10009000E1B0232203A00002E1C400B00AFFFFF494 | ||
| 11 | :1000A000E8B11FE0E8A31FE0E8B11FE0E8A31FE00C | ||
| 12 | :1000B000E25220011AFFFFF9E22DDB05EAFFFFEC17 | ||
| 13 | :1000C0002C0003F82C0004009E0008002C00007493 | ||
| 14 | :0400D0002C0000C040 | ||
| 15 | :00000001FF | ||