diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 11:15:35 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 11:15:35 +0300 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /arch/powerpc/configs/pmac32_defconfig | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
| download | linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'arch/powerpc/configs/pmac32_defconfig')
0 files changed, 0 insertions, 0 deletions