summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-12-13 22:44:15 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-12-13 22:44:15 (GMT)
commite9ccb79927225d8cd8d022a7c09bfb2fad935b89 (patch)
tree94351b94f644619a58125d55f68f436f177e253a /drivers/net
parente1036502e5263851259d147771226161e5ccc85a (diff)
parent8df12925a04194e77081a855d688d6f5638acd9d (diff)
parent408966b85e47859a488f0f6e8c83f09beb563081 (diff)
downloadlinux-fsl-qoriq-e9ccb79927225d8cd8d022a7c09bfb2fad935b89.tar.xz
[ARM] Merge AT91 and devel branches
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>