diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-13 11:32:24 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-13 11:32:24 -0800 |
commit | 5279585ff2bedc8180da5bdf8aa3ff1736466de2 (patch) | |
tree | 4f1dadd2c53df8d38d779381ecb91dfc7eb8a3a8 /arch/x86/kernel/olpc.c | |
parent | 68b32d4499fd910b85b263c3afe92687d18abc3f (diff) | |
parent | 9f3eefc4f9b02404e89d624a6cd40e7b468b5fd5 (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia
Diffstat (limited to 'arch/x86/kernel/olpc.c')
0 files changed, 0 insertions, 0 deletions