Merge commit 'kumar/merge' into merge

Browse source

...

This commit is contained in:

Benjamin Herrenschmidt 2010-03-19 16:23:55 +11:00

parent bca14dd14f 9d296cfa69

commit d6a8536a93

2 changed files with 3 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/powerpc/include/asm/ppc-opcode.h

View file

3

arch/powerpc/kernel/head_fsl_booke.S

View file