| commit | 065319c229c76ded943a8a7cf55e1e6e1e55ae69 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 16:09:17 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 16:09:21 2012 +0000 |
| tree | 6b16c74b13eb2d8147aa346aa0dec247a8cd0a28 | |
| parent | c77ef898625f558c89c6ca0b27e2032f0fad4196 [diff] | |
| parent | 63ecf0a9b55ada8c59ac10472c4468b46cf2e97a [diff] |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards * 'board-specific' of git://github.com/hzhuang1/linux: pxa/hx4700: Remove pcmcia platform_device structure ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35% ARM: pxa/hx4700: Remove unwanted request for GPIO105 (update to 3.3-rc7) Signed-off-by: Arnd Bergmann <arnd@arndb.de>