tree e241424fa58178ed6c2a95a4eb931ea83dbea33c
parent c69cccc95fe4b90dde5fe33e6a3b77880b534fa4
parent 93ded9b8fd42abe2c3607097963d8de6ad9117eb
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216710757 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216710757 +1000

Merge commit 'origin/master'

Manually fixed up:

	drivers/net/fs_enet/fs_enet-main.c