summaryrefslogtreecommitdiffstats
path: root/drivers/net/pppox.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-02 18:06:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-02 18:06:10 -0700
commit6823cfe5531f7507cca5699cda4abd0f65a78bcf (patch)
treeba1913690fbb7e93052b9c96d3d09a8d63972207 /drivers/net/pppox.c
parent05ad709d04799125ed85dd816fdb558258102172 (diff)
parent60e59f68824102c87e64c5f51c4e57c0b8a61e46 (diff)
downloadlinux-6823cfe5531f7507cca5699cda4abd0f65a78bcf.tar.bz2
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/pmac: Update PowerMac 32-bit defconfig
Diffstat (limited to 'drivers/net/pppox.c')
0 files changed, 0 insertions, 0 deletions