diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 22:09:09 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 22:09:09 +0100 |
| commit | 6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (patch) | |
| tree | 4653cae49b03dda61c04369d44153d7dbfebe1cc /arch/arm/include/asm/device.h | |
| parent | 56e2d8a68803be438211130f58ff02c277a2daaf (diff) | |
| parent | 9daaf31a8cc9c98751b7b71198307e47d5bf6a4d (diff) | |
| parent | fea3158c5508f3a96b0cfec6d37a239aa7f3ed4b (diff) | |
Merge branches 'msm/dt', 'imx/dt' and 'at91/dt' into next/dt