Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl...
commit9232d5876e83921414de65d82edd1098258f6680
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 00:16:35 +0000 (6 16:16 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 00:16:35 +0000 (6 16:16 -0800)
treee174b2a4fe535f5e5386ad0c8e435c24c6c99c04
parent2fdb611d3102509e31ef21c79fc91f97f300b9c3
parentc7f570a5eca59575572ee231390df727df207bda
Merge branch 'release' of /home/ftp/linux/kernel/git/aegl/linux-2.6

* 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix pci.c kernel compilation breakage.