Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[sfrench/cifs-2.6.git] / arch / mips / pnx8550 / stb810 / prom_init.c
2010-08-05 Linus TorvaldsMerge branch 'upstream' of git://git.linux-mips.org...
2010-08-05 Ralf BaechleMIPS: PNX8550: Move code one directory level up.