diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /arch/powerpc/platforms/85xx | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'arch/powerpc/platforms/85xx')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc8540_ads.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc8540_ads.h b/arch/powerpc/platforms/85xx/mpc8540_ads.h index c0d56d2bb5a..da82f4c0fda 100644 --- a/arch/powerpc/platforms/85xx/mpc8540_ads.h +++ b/arch/powerpc/platforms/85xx/mpc8540_ads.h @@ -1,5 +1,5 @@ /* - * arch/ppc/platforms/85xx/mpc8540_ads.h + * arch/powerpc/platforms/85xx/mpc8540_ads.h * * MPC8540ADS board definitions * diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h index b44db6268f3..83415db3337 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx.h +++ b/arch/powerpc/platforms/85xx/mpc85xx.h @@ -1,5 +1,5 @@ /* - * arch/ppc/platforms/85xx/mpc85xx.h + * arch/powerpc/platforms/85xx/mpc85xx.h * * MPC85xx soc definitions/function decls * diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.h b/arch/powerpc/platforms/85xx/mpc85xx_cds.h index 671f54ff185..b251c9feb3d 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.h +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.h @@ -1,5 +1,5 @@ /* - * arch/ppc/platforms/85xx/mpc85xx_cds_common.h + * arch/powerpc/platforms/85xx/mpc85xx_cds.h * * MPC85xx CDS board definitions * |