From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Dec 2009 18:01:15 +0000 (-0800)
Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~9833^2~3866
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af853e631db12a97363c8c3b727d153bd2cb346b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'devel' of /home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: fix lh7a40x build
  ARM: fix sa1100 build
  ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug
  ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions
  ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq
  [ARM] pxa/zeus: default configuration for Arcom Zeus SBC.
  [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus
  [ARM] pxa/zeus: basic support for Arcom Zeus SBC
  [ARM] pxa/em-x270: fix usb hub power up/reset sequence
  PCMCIA: fix pxa2xx_lubbock modular build error
  ARM: RealView: Fix typo in the RealView/PBX Kconfig entry
  ARM: Do not allow the probing of the local timer
  ARM: Add an earlyprintk debug console
---

af853e631db12a97363c8c3b727d153bd2cb346b