diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 16:58:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 16:58:33 -0800 |
| commit | ec773e99ab4abce07b1ae23117179c2861831964 (patch) | |
| tree | 630de8df04406f7de326349169d9a61e51864c99 /drivers/net/ethernet/toshiba/ps3_gelic_net.c | |
| parent | Merge branch 'next/move' of git://git.linaro.org/people/arnd/arm-soc (diff) | |
| parent | ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver (diff) | |
| download | linux-dev-ec773e99ab4abce07b1ae23117179c2861831964.tar.xz linux-dev-ec773e99ab4abce07b1ae23117179c2861831964.zip | |
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
ARM: PXA: fix gpio-pxa.h build errors
ARM: 7142/1: davinci: mark GPIO implementation complex
ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
ARM: PXA: fix lubbock PCMCIA driver build error
Diffstat (limited to 'drivers/net/ethernet/toshiba/ps3_gelic_net.c')
0 files changed, 0 insertions, 0 deletions