From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Feb 2009 23:54:50 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1385a7ae654264fb2d9d3c6c3c7a3df28d29ab53;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] AACI: timeout will reach -1
  [ARM] Storage class should be before const qualifier
  [ARM] pxa: stop and disable IRQ for each DMA channels at startup
  [ARM] pxa: make more SSCR0 bit definitions visible on multiple processors
  [ARM] pxa: fix missing of __REG() definition for ac97 registers access
  [ARM] pxa: fix NAND and MMC clock initialization for pxa3xx
---

1385a7ae654264fb2d9d3c6c3c7a3df28d29ab53