From: David S. Miller Date: Wed, 27 Mar 2013 18:08:42 +0000 (-0400) Subject: Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=30de83a00d4e801741cd974fa6a75c77b3a579e6;p=~shefty%2Frdma-dev.git Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can Marc Kleine-Budde says: ==================== here's a patch series for net for the v3.9 release cycle. Fengguang Wu found two problems with the sja1000 drivers: A macro in the SH architecture collides with one in the sja1000 driver. I created a minimal patch suited for stable, only changing this particular define. (Once net is merged back to net-next, I'll post a patch to uniformly use a SJA1000_ prefix for the sja100 private defines.) If you prefer, I can squash both patches together. Fengguang further noticed that the peak pcmcia driver will not compile on archs without ioport support. I created a patch to limit the driver to archs which select HAS_IOPORT in Kconfig. ==================== Signed-off-by: David S. Miller --- 30de83a00d4e801741cd974fa6a75c77b3a579e6