From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 26 Oct 2006 03:19:23 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~31746^2~7^2~74
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc;p=firefly-linux-kernel-4.4.55.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3902/1: Enable GPIO81-84 on PXA255
  [ARM] Comment out missing configuration symbols
  [ARM] 3898/1: corgi_bl fix module loading
  [ARM] 3897/1: corgi_bl fix module compiling
  [ARM] Fix breakage in 7281c248f797723f66244b7ecef204620f664648
---

ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc