Merge remote-tracking branch 'kumar/next' into next

Browse source

A few more fsl updates from Kumar

...

This commit is contained in:

Benjamin Herrenschmidt 2012-09-27 12:48:58 +10:00

parent 9aae341287 4d56dec5dc

commit e8294de53b

4 changed files with 17 additions and 13 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/configs/85xx/p1023rds_defconfig

View file

2

arch/powerpc/kernel/smp.c

View file

20

arch/powerpc/sysdev/fsl_ifc.c

View file

2

arch/powerpc/sysdev/fsl_pci.c

View file