Merge branch 'master'
[linux-2.6] / arch / ppc / platforms / 4xx / bamboo.c
2005-08-03  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-08-02  Matt Porter[PATCH] ppc32: add bamboo platform