diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-27 11:15:11 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-27 11:15:11 +0400 |
| commit | 5e9638643132795e6168bb483e883b6a9678e7b5 (patch) | |
| tree | b167a5233d24ba35330d97717c95d77019646805 /drivers/net/ethernet/3com/typhoon.h | |
| parent | d8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77 (diff) | |
| parent | 945f82f25f9c49b93c315e0acc6d965cb37e137f (diff) | |
| download | linux-5e9638643132795e6168bb483e883b6a9678e7b5.tar.xz | |
Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
ARM: imx: iomux-v1.h: Fix build error due to __init annotation
Diffstat (limited to 'drivers/net/ethernet/3com/typhoon.h')
0 files changed, 0 insertions, 0 deletions