From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 18 Sep 2006 23:15:16 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: Ubuntu-5.2.0-15.16~48948
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=77e2782f9b683893c9341e9cf05c88b0caac7382;p=mirror_ubuntu-eoan-kernel.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3815/1: headers_install support for ARM
  [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM
  [ARM] 3793/1: S3C2412: fix wrong serial info struct
  [ARM] 3780/1: Fix iop321 cpuid
  [ARM] 3786/1: pnx4008: update defconfig
  [ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks
  [ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413
---

77e2782f9b683893c9341e9cf05c88b0caac7382