Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...
authorPaul Mackerras <paulus@samba.org>
Wed, 27 Sep 2006 21:18:28 +0000 (07:18 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 27 Sep 2006 21:18:28 +0000 (07:18 +1000)
commit4e6d816e51728d5006c53e78e079ac62b902f8aa
treed388c87dabc063c08c52d17610738d2f49b3855c
parentd86d9b8cab45adf64e2ea8fe975bec3282b5de81
parent611a15afcdaacec6efba984c7eb089b853564bdf
Merge branch 'upstream' of git://git./linux/kernel/git/vitb/linux-2.6-PQ
arch/powerpc/sysdev/fsl_soc.h
drivers/net/fs_enet/fs_enet-main.c