diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-21 17:23:34 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-21 17:23:34 +0000 |
| commit | 3e343d7a387924b93c43aa0bd8d380a408a0eafe (patch) | |
| tree | f62c38a37ac2a8baa80aad7455979d3f858ecc9c /COPYING | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
| parent | d87f614326a2cb4c3ead0a45e5468c7c3ca6b72f (diff) | |
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
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions