Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[safe/jmp/linux-2.6] / drivers / char / ps3flash.c
2007-07-22 Geert Uytterhoevenps3: FLASH ROM Storage Driver