| commit | d07d4c239bbf428db5581ccd5ca3770bbd15bfbd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Feb 04 16:42:19 2012 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sat Feb 04 16:42:19 2012 -0500 |
| tree | 969df78fbbc76b9ff1289e154b641a06f983569b | |
| parent | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb [diff] | |
| parent | aabdfd6adb804d0aaba0188ade0f1afe42a52e31 [diff] |
Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next Conflicts: drivers/net/can/usb/ems_usb.c Minor dev_warn --> netdev_warn conversion conflicts.