diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-28 11:30:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-28 11:30:57 -0500 |
| commit | f81d3af99016dd5e9b3b72be17b9b52ed0481ddf (patch) | |
| tree | f2cf2c42b99a4a7842183c9fc3922aa8cc3887ca /security/commoncap.c | |
| parent | 4e591b93d5edb3c126a7257c6e29d978a82656d9 (diff) | |
| parent | fc8f40b10e58f37ec07e7b0cf85d19e899bdf23f (diff) | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this is pull request is for net-next. Contains a patch by Andreas
Larsson, which enables the sja1000 of driver to work under sparc.
AnilKumar Ch contributed a patch to improve the c_can support under
omap, Olivier Sobrie's patch brings support for the CAN/USB dongles
from Kvaser. In a bunch of patches by me missing MODULE_ALIAS and/or
MODULE_DEVICE_TABLE entries were added to the CAN drivers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/commoncap.c')
0 files changed, 0 insertions, 0 deletions