diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-31 23:06:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-31 23:06:39 +1100 |
| commit | 45ff2beda53a8a2edf43a29e8d4d9282b43b83a9 (patch) | |
| tree | 9cfc6ddd7e05a9bd0bf72006c7f0c5254f782e9d /arch/m68k/kernel/traps.c | |
| parent | fd70d10173487db8c68385fc83710e45cfe52af5 (diff) | |
| parent | 25bf48b74b9fb23b347d00656b604f9e55c72183 (diff) | |
Merge commit 'boot-params/master'
Conflicts:
arch/arm/kernel/setup.c
arch/parisc/kernel/setup.c
arch/sh/boards/mach-microdev/setup.c
arch/sh/boards/mach-migor/setup.c
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'arch/m68k/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions