projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b01543d d87f614)
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Tue, 21 Feb 2012 17:23:34 +0000 (17:23 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 21 Feb 2012 17:23:34 +0000 (17:23 +0000)
* '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


Trivial merge