summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/am35xx-emac.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 09:19:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 09:19:51 -0700
commit32b908eea9e5ecd1049008e134eadbfcd0da5e38 (patch)
treefb25ad42ecf8ad25e9ef533b799d5906d203c59b /arch/arm/mach-omap2/am35xx-emac.c
parent25f3cdf87c6b6dd55605b5b4332008de10cfaaff (diff)
parent47ac3e44cfd253a227734ed375435566ffddc173 (diff)
Merge tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc updates for MAINTAINERS file from Olof Johansson: "This is a collection of updates to the MAINTAINERS file, separated out mostly to give an overview of what has changed regarding who does what. In particular, at91, orion and prima2 platforms and drivers are updated in this batch." * tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINER: add some drivers upstreamed in CSR SIRFPRIMA2 maintainership update for the Marvell Orion family of SOCs MAINTAINERS: remove non-responding web link for atmel_usba driver MAINTAINERS: add entry for Atmel timer counter (TC) MAINTAINERS: add entry for Atmel DMA driver MAINTAINERS: add entry for Atmel touch screen ADC controller driver MAINTAINERS: add entry for Atmel isi driver
Diffstat (limited to 'arch/arm/mach-omap2/am35xx-emac.c')
0 files changed, 0 insertions, 0 deletions