diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 17:05:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 17:05:40 +0100 |
| commit | d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8 (patch) | |
| tree | 3176a15279e2521d2391c7b2cec6f7b923faa64b /drivers/net/s2io-regs.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| parent | powerpc/ps3: ps3_defconfig updates (diff) | |
| download | linux-d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8.tar.xz linux-d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/ps3: ps3_defconfig updates
powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW
powerpc/5200: Enable CPU_FTR_NEED_COHERENT for MPC52xx
ps3/block: Replace mtd/ps3vram by block/ps3vram
Diffstat (limited to 'drivers/net/s2io-regs.h')
0 files changed, 0 insertions, 0 deletions