David S. Miller 30de83a00d 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 <davem@davemloft.net>
2013-03-27 14:08:42 -04:00
..
2013-03-12 20:25:53 -07:00
2013-03-23 12:33:36 -07:00
2013-03-12 20:28:45 -07:00
2013-02-21 15:27:22 -08:00
2013-02-27 19:10:15 -08:00
2013-02-27 19:10:15 -08:00
2013-03-01 13:39:00 -08:00
2013-03-18 08:17:14 -07:00
2013-03-27 09:25:11 -07:00
2013-03-23 15:49:49 -07:00
2013-02-28 20:00:40 -08:00
2013-03-18 08:27:41 -07:00
2013-02-27 19:10:18 -08:00
2013-02-26 09:34:29 -08:00
2013-02-27 19:10:18 -08:00
2013-02-21 15:27:22 -08:00
2013-02-27 19:10:19 -08:00
2013-03-25 09:26:10 -07:00
2013-03-12 20:25:53 -07:00
2013-02-22 23:31:31 -05:00
2013-02-21 13:57:13 -08:00