Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 16 Mar 2006 02:17:11 +0000 (18:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 16 Mar 2006 02:17:11 +0000 (18:17 -0800)
commit5466eb5d0ad5e9d4238da71a2a9bd216985a4849
treeade97b6e34e53ad5611fb1d1ac51a850a81bcec7
parent2d7f2ea9c989853310c7f6e8be52cc090cc8e66b
parent4333298965cd62585bec891a6a5c9f4c806fc6bd
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