From: Linus Torvalds Date: Thu, 16 Mar 2006 02:17:11 +0000 (-0800) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: v2.6.16~25 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5466eb5d0ad5e9d4238da71a2a9bd216985a4849;p=linux-2.6-omap-h63xx.git Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3362/1: [cleanup] - duplicate decleration of mem_fclk_21285 [ARM] 3365/1: [cleanup] header for compat.c exported functions [ARM] 3364/1: [cleanup] warning fix - definitions for enable_hlt and disable_hlt [ARM] 3363/1: [cleanup] process.c - fix warnings [ARM] 3358/1: [S3C2410] add missing SPI DMA resources [ARM] 3357/1: enable frontlight on collie [ARM] Fix "thead" typo --- 5466eb5d0ad5e9d4238da71a2a9bd216985a4849