Merge branches 'local' and 'master' into local
commitb4963d27a9a11bcf16b8e21f4c89544a6a0ec0de
authorZhang Le <r0bertz@gentoo.org>
Mon, 2 Mar 2009 18:57:20 +0000 (3 02:57 +0800)
committerZhang Le <r0bertz@gentoo.org>
Mon, 2 Mar 2009 18:57:20 +0000 (3 02:57 +0800)
tree94287ad1674e409ccfa11db82d7005d068dc068f
parent7b0d3a9e489f8f3cd6daee51139a1eba41c897f5
parentde77a3a595ed8d8c8be699426919408845bbf8be
Merge branches 'local' and 'master' into local
drivers/video/Kconfig
include/linux/pci_ids.h