summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/katmai.dts
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-16 05:03:50 +0100
committerDavid S. Miller <davem@davemloft.net>2008-12-16 05:03:50 +0100
commiteb14f019597cd86c21a6c601d7e900f40030c2e7 (patch)
tree36fb2f36a1747f98988f87215db1eef3a71d45eb /arch/powerpc/boot/dts/katmai.dts
parent8390/8390p: Fix compat netdev ops handling. (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-eb14f019597cd86c21a6c601d7e900f40030c2e7.tar.xz
linux-eb14f019597cd86c21a6c601d7e900f40030c2e7.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000e/ich8lan.c
Diffstat (limited to 'arch/powerpc/boot/dts/katmai.dts')
0 files changed, 0 insertions, 0 deletions