From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 7 Dec 2006 00:16:35 +0000 (-0800)
Subject: Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl... 
X-Git-Tag: v2.6.20-rc1~34^2~20^2~24
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9232d5876e83921414de65d82edd1098258f6680;p=pandora-kernel.git

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.
---

9232d5876e83921414de65d82edd1098258f6680