summaryrefslogtreecommitdiffstats
path: root/drivers/net/mipsnet.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-01 01:01:50 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-01 01:01:50 +0200
commitc07978b3f80cc5b2aceba72eff7daefa4a57cd48 (patch)
tree7848383dbbb4961ca9a689b483355e4be9086d75 /drivers/net/mipsnet.h
parentprintk.c: fix kernel-doc warnings (diff)
parentMerge branch 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-c07978b3f80cc5b2aceba72eff7daefa4a57cd48.tar.xz
linux-c07978b3f80cc5b2aceba72eff7daefa4a57cd48.zip
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "Another week, another batch of fixes. All are small, contained, targeted fixes for explicit problems -- mostly build and boot failures across i.MX, OMAP, Renesas/Shmobile and Samsung." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: imx6q: fix suspend regression caused by common clk migration ARM: OMAP4470: Fix OMAP4470 boot failure ARM: EXYNOS: Fix EXYNOS_DEV_DMA Kconfig entry ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n ARM: shmobile: r8a7779: Route all interrupts to ARM ARM: shmobile: kzm9d: use late init machine hook ARM: shmobile: kzm9g: use late init machine hook ARM: mach-shmobile: armadillo800eva: Use late init machine hook ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping ARM: mach-shmobile: add missing GPIO IRQ configuration on mackerel ARM: mach-shmobile: Fix build when SMP is enabled and EMEV2 is not enabled ARM: shmobile: sh7372: bugfix: chclr_offset base ARM: shmobile: sh73a0: bugfix: SY-DMAC number ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL
Diffstat (limited to 'drivers/net/mipsnet.h')
0 files changed, 0 insertions, 0 deletions