]> err.no Git - linux-2.6/commit
Merge commit 'origin/master'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 22 Jul 2008 07:12:37 +0000 (17:12 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 22 Jul 2008 07:12:37 +0000 (17:12 +1000)
commit8725f25acc656c1522d48a6746055099efdaca4c
treee241424fa58178ed6c2a95a4eb931ea83dbea33c
parentc69cccc95fe4b90dde5fe33e6a3b77880b534fa4
parent93ded9b8fd42abe2c3607097963d8de6ad9117eb
Merge commit 'origin/master'

Manually fixed up:

drivers/net/fs_enet/fs_enet-main.c
Documentation/powerpc/booting-without-of.txt
drivers/net/fs_enet/fs_enet-main.c
drivers/net/gianfar.c
drivers/net/gianfar.h