Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Wed, 7 Feb 2007 03:05:13 +0000 (14:05 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 7 Feb 2007 03:05:13 +0000 (14:05 +1100)
commit8423200553113cc031caa9b147f6150a8e26545c
tree752c93a200c9ba056c7469c96f7e27d02c99291d
parentf03e64f2ca6ee3d0b7824536b1940497701fe766
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd
Merge branch 'linux-2.6'
arch/powerpc/Kconfig
arch/powerpc/kernel/pci_64.c