From: Linus Torvalds Date: Mon, 13 Oct 2008 16:59:14 +0000 (-0700) Subject: Merge git://git.infradead.org/users/dwmw2/random-2.6 X-Git-Tag: v2.6.28-rc1~610 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=244dc4e54b73567fae7f8fd9ba56584be9375442;p=safe%2Fjmp%2Flinux-2.6 Merge git://git.infradead.org/users/dwmw2/random-2.6 * git://git.infradead.org/users/dwmw2/random-2.6: Fix autoloading of MacBook Pro backlight driver. Automatic MODULE_ALIAS() for DMI match tables. Remove asm/a.out.h files for all architectures without a.out support. Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUT Remove redundant CONFIG_ARCH_SUPPORTS_AOUT S390: Update comments about why we don't use SPARC: Use PowerPC: Use PARISC: Use x86_64: Use IA64: Use ARM: Use Make suitable for 64-bit platforms. Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver [MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉ Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE. EFS: Don't set f_fsid in statfs(). --- 244dc4e54b73567fae7f8fd9ba56584be9375442