From: Arnd Bergmann Date: Wed, 15 Aug 2012 12:33:02 +0000 (+0200) Subject: Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into... X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~14168^2~5 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0a224c514f3e9620e167f9f6497ae526a41df22c;p=mirror_ubuntu-artful-kernel.git Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into fixes From Jason Cooper : Small fixes for the orion platforms including kirkwood. * 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux: ARM: Kirkwood: fix Makefile.boot ARM: Kirkwood: Fix iconnect leds ARM: Orion: Set eth packet size csum offload limit Signed-off-by: Arnd Bergmann --- 0a224c514f3e9620e167f9f6497ae526a41df22c diff --cc arch/arm/mach-kirkwood/Makefile.boot index a5717558ee89,e2ad35803d27..a13299d758e1 --- a/arch/arm/mach-kirkwood/Makefile.boot +++ b/arch/arm/mach-kirkwood/Makefile.boot @@@ -7,7 -7,8 +7,8 @@@ dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) + dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb - dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-qnap-ts219.dtb + dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-ts219-6281.dtb + dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-ts219-6282.dtb dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb -dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb -dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb +dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb +dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb