From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 21 Feb 2012 17:23:34 +0000 (+0000)
Subject: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
X-Git-Tag: firefly_0821_release~3680^2~3416^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3e343d7a387924b93c43aa0bd8d380a408a0eafe;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

* 'fixes' of git://github.com/hzhuang1/linux:
  pxa/hx4700: add platform device and I2C info for AK4641 codec
  arch/arm/mach-pxa/: included linux/gpio.h twice
  arch/arm/mach-mmp/: some files include some headers twice
  ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
  ARM: pxa: fix including linux/gpio.h twice
  ARM: pxa: fix mixed declarations and code in sharpsl_pm
  ARM: pxa: fix wrong parsing gpio event on spitz
---

3e343d7a387924b93c43aa0bd8d380a408a0eafe