diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 14:13:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 14:13:27 +1000 |
| commit | bf6503799e53b5fa21236524dceea6af6b302e44 (patch) | |
| tree | 00e9227120b2ac6896996758f01f2f4791a01174 /arch/powerpc/boot/dts/mpc8272ads.dts | |
| parent | 47edf0fef99551b213bd1dd49890dd00779e2cbb (diff) | |
| parent | 878e7a6e498bec55f10a163197c41554fb078416 (diff) | |
Merge commit 'sparc/master'
Conflicts:
include/asm-m68k/sbus.h
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8272ads.dts')
0 files changed, 0 insertions, 0 deletions