Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into...

From Jason Cooper <[email protected]>:

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 <[email protected]>

diff --cc arch/arm/mach-kirkwood/Makefile.boot
index a5717558ee892fd61aac83997bb3ccff5411a0df,e2ad35803d27eeb488304c7912b50dffcda7d478..a13299d758e15540cfd6fef81b399efbe53d1691
--- 1/arch/arm/mach-kirkwood/Makefile.boot
--- 2/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