diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-26 20:32:27 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-26 20:32:27 +0400 |
| commit | 98a20b735bb4ba5d97d35cf69eb0d8a2ee505de2 (patch) | |
| tree | 10e37c1008d30a1494c0aa7282de33d0ed4d24df /drivers/ide/buddha.c | |
| parent | 16b463061c9f27d00f6bb4cb0b7b29e06c4437f1 (diff) | |
| parent | 0f8dced5ef49159698a98f744e809a3fff32b827 (diff) | |
| download | linux-98a20b735bb4ba5d97d35cf69eb0d8a2ee505de2.tar.xz | |
Merge tag 'linux-can-next-for-3.16-20140425' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this is a pull request of 10 patches for net-next/master.
It consists of three patches by Alexander Shiyan, which improve the
mcp251x driver. Stefano Babic's patch move the SPI driver into a sub
folder. The three patches by Olivier Sobrie add support for the Kvaser
Leaf v2 and usb mini PCIe hardware to the existing driver. Alexander
Stein contributes eg20t support to the c_can pci driver. Together with
the patches on the net-tree, we'll be able to remove the pch_can driver
soon. Kurt Van Dijck's two patches clean up the sysfs attributes of the
softing driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide/buddha.c')
0 files changed, 0 insertions, 0 deletions