tree ae3687f027abf0d670ba533459fa48f61c62cf7a
parent d7ce8a5f63838d99726ec81f666075d65361325b
parent d6e640f9766e2fb9aa3853b4ff19e4d7d5d7e373
author David S. Miller <davem@davemloft.net> 1339006406 -0700
committer David S. Miller <davem@davemloft.net> 1339006406 -0700

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next