Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

Browse source

...

This commit is contained in:

Paul Mackerras 2008-05-02 14:45:50 +10:00

parent fbe543b412 b17b8181c9

commit 5be661a28b

6 changed files with 37 additions and 9 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

23

arch/powerpc/boot/dts/mpc8610_hpcd.dts

View file

9

arch/powerpc/sysdev/fsl_rio.c

View file

4

arch/powerpc/sysdev/fsl_soc.c

View file

2

arch/powerpc/sysdev/xilinx_intc.c

View file

6

drivers/char/xilinx_hwicap/xilinx_hwicap.c

View file

2

include/linux/rio.h

View file